diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2020-01-07 11:36:39 +0300 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.com> | 2020-01-07 11:49:13 +0300 |
commit | 28e3e3199c0c25b6888df34cde0ebb7c2343f5b7 (patch) | |
tree | b11ca2980a3c67f452764e66253c9e0f83278542 /cargo_wrapper.py | |
parent | accd10dfea086104ae1119ba85c43d2b5ad4bd81 (diff) |
meson: add test wrapper
Allow us to run the tests using 'meson test'.
Needed for https://gitlab.freedesktop.org/gstreamer/gst-ci/issues/46
Diffstat (limited to 'cargo_wrapper.py')
-rw-r--r-- | cargo_wrapper.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cargo_wrapper.py b/cargo_wrapper.py index 1ffce1889..d72211025 100644 --- a/cargo_wrapper.py +++ b/cargo_wrapper.py @@ -7,8 +7,8 @@ import shutil import subprocess import sys -command, meson_build_dir, meson_current_source_dir, meson_build_root, target, ext, exclude = sys.argv[ - 1:] +command, meson_build_dir, meson_current_source_dir, meson_build_root, target, exclude = sys.argv[ + 1:7] cargo_target_dir = os.path.join(meson_build_dir, 'target') @@ -28,11 +28,17 @@ env['PKG_CONFIG_PATH'] = ':'.join(pkg_config_path) if command == 'build': # cargo build + ext = sys.argv[7] cargo_cmd = ['cargo', 'build', '--manifest-path', os.path.join(meson_current_source_dir, 'Cargo.toml'), '--workspace'] if target == 'release': cargo_cmd.append('--release') +elif command == 'test': + # cargo test + cargo_cmd = ['cargo', 'test', '--no-fail-fast', '--color=always', '--manifest-path', + os.path.join(meson_current_source_dir, 'Cargo.toml'), + '--workspace'] else: print("Unknown command:", command) sys.exit(1) |