diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-30 16:08:41 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-30 16:08:41 +0300 |
commit | b9c4fc728c6e34cedb387d6844f21456c38ad269 (patch) | |
tree | a90048b4030d592c63771330f344569c4ab72c16 /run_project_tests.py | |
parent | 68275b32e80147145cc78607f496255486fb9d92 (diff) | |
download | meson-b9c4fc728c6e34cedb387d6844f21456c38ad269.zip meson-b9c4fc728c6e34cedb387d6844f21456c38ad269.tar.gz meson-b9c4fc728c6e34cedb387d6844f21456c38ad269.tar.bz2 |
Moved prebuilt object test under unittests.
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-x | run_project_tests.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 426e2c7..03dc8be 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -642,9 +642,8 @@ def generate_prebuilt(): object_suffix = 'obj' else: object_suffix = 'o' - objectfile = generate_pb_object(compiler, object_suffix) stlibfile = generate_pb_static(compiler, object_suffix, static_suffix) - return objectfile, stlibfile + return stlibfile def check_meson_commands_work(): global backend, meson_command, compile_commands, test_commands, install_commands @@ -684,14 +683,13 @@ if __name__ == '__main__': os.chdir(script_dir) check_format() check_meson_commands_work() - pbfiles = generate_prebuilt() + pbfile = generate_prebuilt() try: all_tests = detect_tests_to_run() (passing_tests, failing_tests, skipped_tests) = run_tests(all_tests, 'meson-test-run', options.extra_args) except StopException: pass - for f in pbfiles: - os.unlink(f) + os.unlink(pbfile) print('\nTotal passed tests:', green(str(passing_tests))) print('Total failed tests:', red(str(failing_tests))) print('Total skipped tests:', yellow(str(skipped_tests))) |