fix PYTHONPATH setting for end-to-end tests

33abc027 · Stefan Behnel · 4d676ccf · 33abc027
Commit 33abc027 authored Oct 04, 2010 by Stefan Behnel
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

runtests.py runtests.py +6 -5

No files found.
--- a/runtests.py
+++ b/runtests.py
@@ -662,11 +662,12 @@ class EndToEndTest(unittest.TestCase):
        commands = (self.commands
            .replace("CYTHON", "PYTHON %s" % os.path.join(self.cython_root, 'cython.py'))
            .replace("PYTHON", sys.executable))
-        commands = """
+        old_path = os.environ.get('PYTHONPATH')
-        PYTHONPATH="%s%s$PYTHONPATH"
+        try:
-        %s
+            os.environ['PYTHONPATH'] = self.cython_root + os.pathsep + (old_path or '')
-        """ % (self.cython_root, os.pathsep, commands)
            self.assertEqual(0, os.system(commands))
+        finally:
+            os.environ['PYTHONPATH'] = old_path
 # TODO: Support cython_freeze needed here as well.