diff options
| -rw-r--r-- | mesonbuild/coredata.py | 2 | ||||
| -rwxr-xr-x | run_unittests.py | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 557aabc..f075e75 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -407,7 +407,7 @@ class CoreData: if unknown_options: unknown_options = ', '.join(sorted(unknown_options)) sub = 'In subproject {}: '.format(subproject) if subproject else '' - raise MesonException('{}Unknown options: "{}"'.format(sub, unknown_options)) + mlog.warning('{}Unknown options: "{}"'.format(sub, unknown_options)) def load(build_dir): filename = os.path.join(build_dir, 'meson-private', 'coredata.dat') 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 |