aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-04-01 22:51:36 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-04-01 22:51:36 +0300
commit95877155857f3ddd0789f81590e909e84061f9bf (patch)
tree714fae5414810e9662f5ff6d21208d623b7bcc9f /run_tests.py
parentea092fefc26f70066517edb06dec6bd251e59380 (diff)
downloadmeson-95877155857f3ddd0789f81590e909e84061f9bf.zip
meson-95877155857f3ddd0789f81590e909e84061f9bf.tar.gz
meson-95877155857f3ddd0789f81590e909e84061f9bf.tar.bz2
Fix Windows.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/run_tests.py b/run_tests.py
index 9149ea0..a3ec0dc 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -198,11 +198,13 @@ def parse_test_args(testdir):
def run_test(testdir, extra_args, should_succeed):
with tempfile.TemporaryDirectory(prefix='b ', dir='.') as build_dir:
with tempfile.TemporaryDirectory(prefix='i ', dir=os.getcwd()) as install_dir:
- return _run_test(testdir, build_dir, install_dir, extra_args, should_succeed)
+ try:
+ return _run_test(testdir, build_dir, install_dir, extra_args, should_succeed)
+ finally:
+ mlog.shutdown() # Close the log file because otherwise Windows wets itself.
def _run_test(testdir, test_build_dir, install_dir, extra_args, should_succeed):
global compile_commands
- mlog.shutdown() # Close the log file because otherwise Windows wets itself.
print('Running test: ' + testdir)
test_args = parse_test_args(testdir)
gen_start = time.time()