[pypy-commit] pypy py3.5: Merge heads

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3.5
Changeset: r92527:2bf99e3d5873
Date: 2017-10-01 13:32 +0200
http://bitbucket.org/pypy/pypy/changeset/2bf99e3d5873/

Log:	Merge heads

diff --git a/pypy/interpreter/test/test_app_main.py b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test_app_main.py
+++ b/pypy/interpreter/test/test_app_main.py
@@ -1162,9 +1162,13 @@
         import os
         old_sys_path = sys.path[:]
         sys.path.append(self.goal_dir)
+        if sys.platform == 'win32':
+            exename = 'pypy3-cw.exe'
+        else:
+            exename = 'pypy3-c'
         try:
             import app_main
-            pypy_c = os.path.join(self.trunkdir, 'pypy', 'goal', 'pypy3-c')
+            pypy_c = os.path.join(self.trunkdir, 'pypy', 'goal', exename)
             app_main.setup_bootstrap_path(pypy_c)
             newpath = sys.path[:]
             # we get at least lib_pypy
@@ -1180,9 +1184,13 @@
         import os
         old_sys_path = sys.path[:]
         sys.path.append(self.goal_dir)
+        if sys.platform == 'win32':
+            exename = 'pypy3-cw.exe'
+        else:
+            exename = 'pypy3-c'
         try:
             import app_main
-            pypy_c = os.path.join(self.trunkdir, 'pypy', 'goal', 'pypy3-c')
+            pypy_c = os.path.join(self.trunkdir, 'pypy', 'goal', exename)
             app_main.entry_point(pypy_c, [self.foo_py])
             # assert it did not crash
         finally:
diff --git a/testrunner/lib_python_tests.py b/testrunner/lib_python_tests.py
--- a/testrunner/lib_python_tests.py
+++ b/testrunner/lib_python_tests.py
@@ -11,9 +11,14 @@
 os.environ['PYTHONPATH'] = rootdir
 os.environ['PYTEST_PLUGINS'] = ''
 
+if sys.platform == 'win32':
+    pypyopt = "--pypy=pypy/goal/pypy3-cw.exe"
+else:
+    pypyopt = "--pypy=pypy/goal/pypy3-c"
+
 popen = subprocess.Popen(
     [sys.executable, "pypy/test_all.py",
-     "--pypy=pypy/goal/pypy3-c",
+     pypyopt,
      "--timeout=3600",
      "-rs",
      "--resultlog=cpython.log", "lib-python",
diff --git a/testrunner/pypyjit_tests.py b/testrunner/pypyjit_tests.py
--- a/testrunner/pypyjit_tests.py
+++ b/testrunner/pypyjit_tests.py
@@ -11,9 +11,14 @@
 os.environ['PYTHONPATH'] = rootdir
 os.environ['PYTEST_PLUGINS'] = ''
 
+if sys.platform == 'win32':
+    pypyopt = "--pypy=pypy/goal/pypy3-cw.exe"
+else:
+    pypyopt = "--pypy=pypy/goal/pypy3-c"
+
 popen = subprocess.Popen(
     [sys.executable, "pypy/test_all.py",
-     "--pypy=pypy/goal/pypy3-c",
+     pypyopt,
      "--resultlog=pypyjit_new.log",
      "pypy/module/pypyjit/test_pypy_c",
      ] + sys.argv[1:],