Author: Matti Picus <matti.pi...@gmail.com>
Branch: 
Changeset: r93200:d402ee2877e6
Date: 2017-11-28 19:11 +0200
http://bitbucket.org/pypy/pypy/changeset/d402ee2877e6/

Log:    win32 fixes, even msdb does not know if it should be vcvarsXX.bat or
        vsvarsXX.bat

diff --git a/rpython/translator/platform/test/test_platform.py 
b/rpython/translator/platform/test/test_platform.py
--- a/rpython/translator/platform/test/test_platform.py
+++ b/rpython/translator/platform/test/test_platform.py
@@ -113,8 +113,10 @@
     def test_environment_inheritance(self):
         # make sure that environment is inherited
         cmd = 'import os; print os.environ["_SOME_VARIABLE_%d"]'
+        env = {'_SOME_VARIABLE_1':'xyz'}
+        env['PATH'] = os.environ['PATH']
         res = self.platform.execute(sys.executable, ['-c', cmd % 1],
-                                    env={'_SOME_VARIABLE_1':'xyz'})
+                                    env=env)
         assert 'xyz' in res.out
         os.environ['_SOME_VARIABLE_2'] = 'zyz'
         try:
diff --git a/rpython/translator/platform/windows.py 
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -52,10 +52,6 @@
     vcvars = None
     try:
         toolsdir = os.environ['VS%sCOMNTOOLS' % vsver]
-        if x64flag:
-            vcvars = os.path.join(toolsdir, "vcvarsamd64.bat")
-        else:
-            vcvars = os.path.join(toolsdir, 'vsvars32.bat')
     except KeyError:
         # try to import from the registry, as done in setuptools
         # XXX works for 90 but is it generalizable?
@@ -69,7 +65,12 @@
             vcbindir = os.path.join(vcinstalldir, 'BIN')
             vcvars = os.path.join(vcbindir, 'amd64', 'vcvarsamd64.bat')
         else:
-            vcvars = os.path.join(toolsdir, 'vsvars32.bat')
+            vcvars = os.path.join(toolsdir, 'vcvars32.bat')
+            if not os.path.exists(vcvars):
+                # even msdn does not know which to run
+                # see 
https://msdn.microsoft.com/en-us/library/1700bbwd(v=vs.90).aspx
+                # wich names both
+                vcvars = os.path.join(toolsdir, 'vsvars32.bat') 
 
     import subprocess
     try:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to