aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorNicolas Schneider <nioncode+git@gmail.com>2016-04-05 22:03:57 +0200
committerNicolas Schneider <nioncode+git@gmail.com>2016-04-05 22:03:57 +0200
commiteb69b268d4af3dc749f8fcd2d72b5a6a9d796061 (patch)
tree93ce533f42a6a47fbcb41946b31cd2d25c64a5f8 /run_tests.py
parente44229b9c265a6cc1d56d5e16b51af527e32dfb3 (diff)
downloadmeson-eb69b268d4af3dc749f8fcd2d72b5a6a9d796061.zip
meson-eb69b268d4af3dc749f8fcd2d72b5a6a9d796061.tar.gz
meson-eb69b268d4af3dc749f8fcd2d72b5a6a9d796061.tar.bz2
Revert "Fix Windows. Again."
This reverts commit e522a9f2684e38955aefda3b4413a78997ccdbc9.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/run_tests.py b/run_tests.py
index 52111ac..978625a 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -309,20 +309,10 @@ def run_tests(extra_args):
# and getting it wrong by not doing logical number sorting.
(testnum, testbase) = os.path.split(t)[-1].split(' ', 1)
testname = '%.3d %s' % (int(testnum), testbase)
- # Windows errors out when calling result.result() below with
- # a bizarre error about appending None to an array that comes
- # from the standard library. This is probably either because I use
- # XP or the Python version is old. Anyhow, fall back to immediate
- # evaluation. This causes output not to be printed until the end,
- # which is unfortunate but least it works.
- if mesonlib.is_windows():
- result = run_test(skipped, t, extra_args, name != 'failing')
- else:
- result = executor.submit(run_test, skipped, t, extra_args, name != 'failing')
+ result = executor.submit(run_test, skipped, t, extra_args, name != 'failing')
futures.append((testname, t, result))
for (testname, t, result) in futures:
- if not mesonlib.is_windows(): # See above.
- result = result.result()
+ result = result.result()
if result is None:
print('Skipping:', t)
current_test = ET.SubElement(current_suite, 'testcase', {'name' : testname,