diff options
Diffstat (limited to 'src/etc/maketest.py')
| -rw-r--r-- | src/etc/maketest.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/etc/maketest.py b/src/etc/maketest.py index 8afe6cf987a..9e8bee3abb6 100644 --- a/src/etc/maketest.py +++ b/src/etc/maketest.py @@ -12,12 +12,18 @@ import subprocess import os import sys -os.putenv('RUSTC', os.path.abspath(sys.argv[2])) -os.putenv('TMPDIR', os.path.abspath(sys.argv[3])) -os.putenv('CC', sys.argv[4]) -os.putenv('RUSTDOC', os.path.abspath(sys.argv[5])) -filt = sys.argv[6] -ldpath = sys.argv[7] +# FIXME #12303 these tests are broken on windows +if os.name == 'nt': + print 'ignoring make tests on windows' + sys.exit(0) + +make = sys.argv[2] +os.putenv('RUSTC', os.path.abspath(sys.argv[3])) +os.putenv('TMPDIR', os.path.abspath(sys.argv[4])) +os.putenv('CC', sys.argv[5]) +os.putenv('RUSTDOC', os.path.abspath(sys.argv[6])) +filt = sys.argv[7] +ldpath = sys.argv[8] if ldpath != '': os.putenv(ldpath.split('=')[0], ldpath.split('=')[1]) @@ -25,7 +31,7 @@ if not filt in sys.argv[1]: sys.exit(0) print('maketest: ' + os.path.basename(os.path.dirname(sys.argv[1]))) -proc = subprocess.Popen(['make', '-C', sys.argv[1]], +proc = subprocess.Popen([make, '-C', sys.argv[1]], stdout = subprocess.PIPE, stderr = subprocess.PIPE) out, err = proc.communicate() |
