MultiTestRunner/Win32: Add SYSTEMROOT to environment, replace '&&' in .bat

files.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77071 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 8 insertions, 2 deletions

diff --git a/utils/test/TestRunner.py b/utils/test/TestRunner.py
index ba43330d9a..cfbfe6b3b7 100755
--- a/utils/test/TestRunner.py
+++ b/utils/test/TestRunner.py
@@ -24,7 +24,9 @@ import subprocess
 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 @@ def runOneTest(FILENAME, SUBST, OUTPUT, TESTNAME, CLANG, CLANGCC,
 
     # 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')