diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-01 21:11:38 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-01 23:06:58 +0300 |
| commit | a7e93012157ed1f49b35fd4a8cf2b4719083cb08 (patch) | |
| tree | 95a3ae6409bd65b4be3ceb9647b2a573899ca55b | |
| parent | 81e37e1220c601734d3a6f14df46d49cb44f02ea (diff) | |
| download | meson-a7e93012157ed1f49b35fd4a8cf2b4719083cb08.zip meson-a7e93012157ed1f49b35fd4a8cf2b4719083cb08.tar.gz meson-a7e93012157ed1f49b35fd4a8cf2b4719083cb08.tar.bz2 | |
Output is all pretty again.
| -rwxr-xr-x | run_tests.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/run_tests.py b/run_tests.py index e42e10d..978625a 100755 --- a/run_tests.py +++ b/run_tests.py @@ -209,7 +209,6 @@ def run_test(skipped, testdir, extra_args, should_succeed): def _run_test(testdir, test_build_dir, install_dir, extra_args, should_succeed): global compile_commands - print('Running test: ' + testdir) test_args = parse_test_args(testdir) gen_start = time.time() gen_command = [meson_command, '--prefix', '/usr', '--libdir', 'lib', testdir, test_build_dir]\ @@ -311,24 +310,26 @@ def run_tests(extra_args): (testnum, testbase) = os.path.split(t)[-1].split(' ', 1) testname = '%.3d %s' % (int(testnum), testbase) result = executor.submit(run_test, skipped, t, extra_args, name != 'failing') - for (testname, result) in futures: - futures.append((testname, result)) + futures.append((testname, t, result)) + for (testname, t, result) in futures: + result = result.result() if result is None: + print('Skipping:', t) current_test = ET.SubElement(current_suite, 'testcase', {'name' : testname, 'classname' : name}) ET.SubElement(current_test, 'skipped', {}) global skipped_tests skipped_tests += 1 else: - ts = time.time() - te = time.time() + print('Running test: ' + t) conf_time += result.conftime build_time += result.buildtime test_time += result.testtime + total_time = conf_time + build_time + test_time log_text_file(logfile, t, result.msg, result.stdo, result.stde) current_test = ET.SubElement(current_suite, 'testcase', {'name' : testname, 'classname' : name, - 'time' : '%.3f' % (te - ts)}) + 'time' : '%.3f' % total_time}) if result.msg != '': ET.SubElement(current_test, 'failure', {'message' : result.msg}) stdoel = ET.SubElement(current_test, 'system-out') |