diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-06-19 10:50:13 -0400 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-06-19 20:29:57 +0000 |
| commit | 99dd5f34dece95e463a85c54034f685b9cb391e3 (patch) | |
| tree | e11f3c91dada47577b883fa072dcf25827034c84 /run_unittests.py | |
| parent | 737f61792cc33dd5f234c961bc2ab850be3f9959 (diff) | |
| download | meson-99dd5f34dece95e463a85c54034f685b9cb391e3.zip meson-99dd5f34dece95e463a85c54034f685b9cb391e3.tar.gz meson-99dd5f34dece95e463a85c54034f685b9cb391e3.tar.bz2 | |
Downgrade unknown option from exception to warning
It used to be non-fatal warnings but recent command line refactor made
it fatal. It looks like GNOME continuous would break with this change.
To avoid delaying upcoming 0.47.0 release adoption, let's downgrade this
back to warning for now and reconsider after the release.
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/run_unittests.py b/run_unittests.py index 11deb13..582d6f5 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2142,11 +2142,9 @@ recommended as it is not supported on some platforms''') self.assertEqual(obj.builtins['default_library'].value, 'shared') self.wipe() - # Should fail on unknown options - with self.assertRaises(subprocess.CalledProcessError) as cm: - self.init(testdir, extra_args=['-Dbad=1', '-Dfoo=2', '-Dwrong_link_args=foo']) - self.assertNotEqual(0, cm.exception.returncode) - self.assertIn('Unknown options: "bad, foo, wrong_link_args"', cm.exception.output) + # Should warn on unknown options + out = self.init(testdir, extra_args=['-Dbad=1', '-Dfoo=2', '-Dwrong_link_args=foo']) + self.assertIn('Unknown options: "bad, foo, wrong_link_args"', out) self.wipe() # Should fail on malformed option |