Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Romain Courteaud
slapos
Commits
3b3824e4
Commit
3b3824e4
authored
4 years ago
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
neo: extend runTestSuite to optionally run neomaster process with PyPy
parent
7732dc1e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
4 deletions
+27
-4
software/neoppod/buildout.hash.cfg
software/neoppod/buildout.hash.cfg
+3
-3
software/neoppod/instance-common.cfg.in
software/neoppod/instance-common.cfg.in
+3
-0
software/neoppod/instance-neo.cfg.in
software/neoppod/instance-neo.cfg.in
+3
-0
software/neoppod/runTestSuite.in
software/neoppod/runTestSuite.in
+10
-1
software/neoppod/software-pypy.cfg
software/neoppod/software-pypy.cfg
+8
-0
No files found.
software/neoppod/buildout.hash.cfg
View file @
3b3824e4
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# not need these here).
# not need these here).
[instance-common]
[instance-common]
filename = instance-common.cfg.in
filename = instance-common.cfg.in
md5sum =
80599fcc6e5d07270d7900aebfd62139
md5sum =
6da513940e5bf7d06b3fb0aeb39c8ad5
[root-common]
[root-common]
filename = root-common.cfg.in
filename = root-common.cfg.in
...
@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
...
@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
[instance-neo]
[instance-neo]
filename = instance-neo.cfg.in
filename = instance-neo.cfg.in
md5sum = 7
642c760a2c5af3e3e81c2c54486d1a8
md5sum = 7
4e0361f3ec3424c905acc4cd55fd8bf
[template-neo-my-cnf]
[template-neo-my-cnf]
filename = my.cnf.in
filename = my.cnf.in
...
@@ -46,4 +46,4 @@ md5sum = 5afd326de385563b5aeac81039f23341
...
@@ -46,4 +46,4 @@ md5sum = 5afd326de385563b5aeac81039f23341
[runTestSuite.in]
[runTestSuite.in]
_update_hash_filename_ = runTestSuite.in
_update_hash_filename_ = runTestSuite.in
md5sum =
7a0d5d259eb7f90fc0421d1264fbe7b5
md5sum =
4e7f5b5230800a65c71310a518225119
This diff is collapsed.
Click to expand it.
software/neoppod/instance-common.cfg.in
View file @
3b3824e4
...
@@ -47,3 +47,6 @@ extra-context =
...
@@ -47,3 +47,6 @@ extra-context =
raw template_mysqld_wrapper {{ template_mysqld_wrapper }}
raw template_mysqld_wrapper {{ template_mysqld_wrapper }}
raw template_neo_my_cnf {{ template_neo_my_cnf }}
raw template_neo_my_cnf {{ template_neo_my_cnf }}
{%- endif %}
{%- endif %}
{%- if pypy_location is defined %}
raw pypy_location {{ pypy_location }}
{%- endif %}
This diff is collapsed.
Click to expand it.
software/neoppod/instance-neo.cfg.in
View file @
3b3824e4
...
@@ -184,6 +184,9 @@ context =
...
@@ -184,6 +184,9 @@ context =
section my_cnf_parameters my-cnf-parameters
section my_cnf_parameters my-cnf-parameters
raw bin_directory {{ bin_directory }}
raw bin_directory {{ bin_directory }}
raw prepend_path {{ mariadb_location }}/bin
raw prepend_path {{ mariadb_location }}/bin
{%- if pypy_location is defined %}
raw pypy_location {{ pypy_location }}/bin/pypy
{%- endif %}
{%- if private_tmpfs %}
{%- if private_tmpfs %}
key datadir my-cnf-parameters:data-directory
key datadir my-cnf-parameters:data-directory
key results_directory directory:results
key results_directory directory:results
...
...
This diff is collapsed.
Click to expand it.
software/neoppod/runTestSuite.in
View file @
3b3824e4
...
@@ -115,10 +115,19 @@ def main():
...
@@ -115,10 +115,19 @@ def main():
shutil.rmtree(temp)
shutil.rmtree(temp)
os.mkdir(temp)
os.mkdir(temp)
args = [RUN_NEO_TESTS_COMMAND, '-ufz']
args = [RUN_NEO_TESTS_COMMAND,
{%- if pypy_location is defined -%}
'-fz'
{%- else -%}
'-ufz'
{%- endif -%}
]
command = ' '.join(args)
command = ' '.join(args)
env = {'PATH': PATH,
env = {'PATH': PATH,
'TEMP': temp,
'TEMP': temp,
{%- if pypy_location is defined %}
'NEO_PYPY': {{ repr(pypy_location) }},
{%- endif %}
'NEO_TESTS_ADAPTER': adapter,
'NEO_TESTS_ADAPTER': adapter,
'NEO_TEST_ZODB_FUNCTIONAL': '1',
'NEO_TEST_ZODB_FUNCTIONAL': '1',
'NEO_DB_USER': 'root'}
'NEO_DB_USER': 'root'}
...
...
This diff is collapsed.
Click to expand it.
software/neoppod/software-pypy.cfg
0 → 100644
View file @
3b3824e4
[buildout]
extends =
../../component/pypy/buildout.cfg
software.cfg
[instance-common]
context +=
key pypy_location pypy2:location
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment