WIP

serge-sans-paille · Oct 15, 2023 · 1d78daa · 1d78daa
1 parent f072fba
commit 1d78daa
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/pythran/tests/test_distutils.py b/pythran/tests/test_distutils.py
@@ -126,21 +126,26 @@ def test_setup_bdist_install2(self):
     def test_setup_build3(self):
         check_call([python, 'setup.py', 'build'],
                    cwd=os.path.join(cwd, 'test_distutils_numpy'))
-        check_call([python, 'setup.py', 'install', '--prefix=demo_install3'],
-                   cwd=os.path.join(cwd, 'test_distutils_numpy'))
 
         base = os.path.join(cwd, 'test_distutils_numpy', 'demo_install3',)
         libdir = os.path.join(base, 'lib')
-        if not os.path.isdir(libdir):
-            libdir = os.path.join(base, 'lib64')
+        lib64dir = os.path.join(base, 'lib64')
 
-        demo_dir_candidates = glob.glob(os.path.join(libdir, python_version,
-                                                     'site-packages',
-                                                     'demo3*'))
-        demo_dir = [d for d in demo_dir_candidates if os.path.isdir(d)][0]
+        local_env = os.environ.copy()
+        local_env['PYTHONPATH'] = os.pathsep.join((
+            os.path.join(lib64dir, python_version,
+                         'site-packages'),
+            os.path.join(libdir, python_version,
+                         'site-packages'),
+            local_env.get('PYTHONPATH', ''),
+            ))
+
+        check_call([python, 'setup.py', 'install', '--prefix=demo_install3'],
+                   cwd=os.path.join(cwd, 'test_distutils_numpy'),
+                   env=local_env)
 
-        check_call([python, '-c', 'import a'],
-                   cwd=demo_dir)
+        check_call([python, '-c', 'import demo3.a'],
+                   cwd=cwd, env=local_env)
         check_call([python, 'setup.py', 'clean'],
                    cwd=os.path.join(cwd, 'test_distutils_numpy'))
         shutil.rmtree(os.path.join(cwd, 'test_distutils_numpy', 'demo_install3'))