Fixes for pypy testing

This commit is contained in:
rocky
2019-04-23 11:52:26 -04:00
parent 05db6194ec
commit 9186a3fc44

View File

@@ -37,8 +37,9 @@ python_versions = [v for v in magics.python_versions if
# These include Jython, and Python bytecode changes pre release.
TEST_VERSIONS = (
'pypy-2.4.0', 'pypy-2.6.1',
'pypy3-2.4.0', 'pypy-2.6.1',
'pypy-5.0.1', 'pypy-5.3.1', 'pypy3.5-5.7.1-beta',
'pypy3.5-5.9.0',
'native') + tuple(python_versions)
@@ -58,19 +59,19 @@ test_options = {
}
for vers in TEST_VERSIONS:
if vers.startswith('pypy-'):
if vers.startswith('pypy'):
short_vers = vers[0:-2]
test_options[vers] = (os.path.join(lib_prefix, vers, 'lib_pypy'),
PYC, 'python-lib'+short_vers)
if vers == 'native':
short_vers = os.path.basename(sys.path[-1])
test_options[vers] = (sys.path[-1],
PYC, short_vers)
else:
short_vers = vers[:3]
test_options[vers] = (os.path.join(lib_prefix, vers, 'lib', 'python'+short_vers),
PYC, 'python-lib'+short_vers)
if vers == 'native':
short_vers = os.path.basename(sys.path[-1])
test_options[vers] = (sys.path[-1],
PYC, short_vers)
else:
short_vers = vers[:3]
test_options[vers] = (os.path.join(lib_prefix, vers, 'lib', 'python'+short_vers),
PYC, 'python-lib'+short_vers)
def do_tests(src_dir, patterns, target_dir, start_with=None,
do_verify=False, max_files=200):