diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-02-09 18:31:56 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-02-09 18:51:05 +0100 |
| commit | 3506d8daf2e67ad44d71f04943a427a42e96031f (patch) | |
| tree | 5e76b9b5fcc36afaa8107e682e0e8a9dc7974807 /mesonbuild/mtest.py | |
| parent | b1a9578091ad869be2bddaa381ce9092f178840c (diff) | |
| download | meson-3506d8daf2e67ad44d71f04943a427a42e96031f.zip meson-3506d8daf2e67ad44d71f04943a427a42e96031f.tar.gz meson-3506d8daf2e67ad44d71f04943a427a42e96031f.tar.bz2 | |
mtest: TestSetup can have [] as an exe_wrapper
Fix "meson test --wrapper foo --setup bar", it should work just fine
if the setup does not define a wrapper.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild/mtest.py')
| -rw-r--r-- | mesonbuild/mtest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index 1d7c6cc..f60f5b0 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -1490,10 +1490,10 @@ class TestHarness: options.timeout_multiplier = current.timeout_multiplier # if options.env is None: # options.env = current.env # FIXME, should probably merge options here. - if options.wrapper is not None and current.exe_wrapper is not None: - sys.exit('Conflict: both test setup and command line specify an exe wrapper.') if options.wrapper is None: options.wrapper = current.exe_wrapper + elif current.exe_wrapper: + sys.exit('Conflict: both test setup and command line specify an exe wrapper.') return current.env.get_env(os.environ.copy()) def get_test_runner(self, test: TestSerialisation) -> SingleTestRunner: |