[cfe-commits] r77071 - /cfe/trunk/utils/test/TestRunner.py

[Daniel Dunbar]

Author: ddunbar
Date: Sat Jul 25 07:57:15 2009
New Revision: 77071

URL: http://llvm.org/viewvc/llvm-project?rev=77071&view=rev
Log:
MultiTestRunner/Win32: Add SYSTEMROOT to environment, replace '&&' in .bat
files.

Modified:
    cfe/trunk/utils/test/TestRunner.py

Modified: cfe/trunk/utils/test/TestRunner.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/utils/test/TestRunner.py?rev=77071&r1=77070&r2=77071&view=diff

==============================================================================
--- cfe/trunk/utils/test/TestRunner.py (original)
+++ cfe/trunk/utils/test/TestRunner.py Sat Jul 25 07:57:15 2009
@@ -24,7 +24,9 @@
 import sys
 
 # Increase determinism by explicitly choosing the environment.
-kChildEnv = { 'PATH' : os.environ.get('PATH','') }
+kChildEnv = {}
+for var in ('PATH', 'SYSTEMROOT'):
+    kChildEnv[var] = os.environ.get(var, '')
 
 kSystemName = platform.system()
 
@@ -170,7 +172,11 @@
 
     # Write script file
     f = open(SCRIPT,'w')
-    f.write(' &&\n'.join(scriptLines))
+    if kSystemName == 'Windows':
+        f.write('\nif %ERRORLEVEL% NEQ 0 EXIT\n'.join(scriptLines))
+        f.write('\n')
+    else:
+        f.write(' &&\n'.join(scriptLines))
     f.close()
 
     outputFile = open(OUTPUT,'w')