Fixup tests.

pex-tool · Aug 25, 2018 · 0455312 · 0455312
1 parent 35991d5
commit 0455312
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/pex/testing.py b/pex/testing.py
@@ -330,8 +330,9 @@ def ensure_python_distribution(version):
     bootstrap_python_installer(pyenv_root)
 
   if not os.path.exists(interpreter_location):
-    os.environ['PYENV_ROOT'] = pyenv_root
-    subprocess.check_call([pyenv, 'install', '--keep', version])
+    env = {'PYENV_ROOT': pyenv_root,
+           'CONFIGURE_OPTS': '--enable-shared'}
+    subprocess.check_call([pyenv, 'install', '--keep', version], env=env)
     subprocess.check_call([pip, 'install', '-U', 'pip'])
     subprocess.check_call([pip, 'install', SETUPTOOLS_REQUIREMENT])
 

diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -983,14 +983,15 @@ def test_invalid_entry_point_verification_3rdparty():
     res.assert_failure()
 
 
-@pytest.mark.skipif(NOT_CPYTHON36)
+@pytest.mark.skipif(IS_PYPY)
 def test_multiplatform_entrypoint():
   with temporary_dir() as td:
     pex_out_path = os.path.join(td, 'p537.pex')
-
-    res = run_pex_command(['p537==1.0.1',
+    interpreter = ensure_python_interpreter('3.6.3')
+    res = run_pex_command(['p537==1.0.2',
                            '--no-build',
-                           '--interpreter-constraint=CPython>=3.6,<3.7',
+                           '--python={}'.format(interpreter),
+                           '--python-shebang=#!{}'.format(interpreter),
                            '--platform=linux-x86_64',
                            '--platform=macosx-10.13-x86_64',
                            '-c', 'p537',