neo: extend runTestSuite to optionally run neomaster process with PyPy

software/neoppod/buildout.hash.cfg

@@ -14,7 +14,7 @@
 # not need these here).
 [instance-common]
 filename = instance-common.cfg.in
-md5sum = 80599fcc6e5d07270d7900aebfd62139
+md5sum = 6da513940e5bf7d06b3fb0aeb39c8ad5
 
 [root-common]
 filename = root-common.cfg.in
@@ -30,7 +30,7 @@ md5sum = 9f27195d770b2f57461c60a82c851ab9
 
 [instance-neo]
 filename = instance-neo.cfg.in
-md5sum = 7642c760a2c5af3e3e81c2c54486d1a8
+md5sum = 74e0361f3ec3424c905acc4cd55fd8bf
 
 [template-neo-my-cnf]
 filename = my.cnf.in
@@ -46,4 +46,4 @@ md5sum = 5afd326de385563b5aeac81039f23341
 
 [runTestSuite.in]
 _update_hash_filename_ = runTestSuite.in
-md5sum = 7a0d5d259eb7f90fc0421d1264fbe7b5
+md5sum = 4e7f5b5230800a65c71310a518225119

software/neoppod/instance-common.cfg.in

@@ -47,3 +47,6 @@ extra-context =
     raw template_mysqld_wrapper {{ template_mysqld_wrapper }}
     raw template_neo_my_cnf {{ template_neo_my_cnf }}
 {%- endif %}
+{%- if pypy_location is defined %}
+    raw pypy_location {{ pypy_location }}
+{%- endif %}

software/neoppod/instance-neo.cfg.in

@@ -184,6 +184,9 @@ context =
     section my_cnf_parameters my-cnf-parameters
     raw     bin_directory     {{ bin_directory }}
     raw     prepend_path      {{ mariadb_location }}/bin
+{%- if pypy_location is defined %}
+    raw     pypy_location     {{ pypy_location }}/bin/pypy
+{%- endif %}
 {%- if private_tmpfs %}
     key     datadir           my-cnf-parameters:data-directory
     key     results_directory directory:results

software/neoppod/runTestSuite.in

@@ -115,10 +115,19 @@ def main():
       shutil.rmtree(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)
     env = {'PATH': PATH,
            'TEMP': temp,
+{%- if pypy_location is defined %}
+           'NEO_PYPY': {{ repr(pypy_location) }},
+{%- endif %}
            'NEO_TESTS_ADAPTER': adapter,
            'NEO_TEST_ZODB_FUNCTIONAL': '1',
            'NEO_DB_USER': 'root'}

software/neoppod/software-pypy.cfg

+[buildout]
+extends =
+    ../../component/pypy/buildout.cfg
+    software.cfg
+
+[instance-common]
+context +=
+    key pypy_location pypy2:location