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.
pull/3768/head
Xavier Claessens 7 years ago committed by Nirbheek Chauhan
parent 737f61792c
commit 99dd5f34de
  1. 2
      mesonbuild/coredata.py
  2. 8
      run_unittests.py

@ -407,7 +407,7 @@ class CoreData:
if unknown_options: if unknown_options:
unknown_options = ', '.join(sorted(unknown_options)) unknown_options = ', '.join(sorted(unknown_options))
sub = 'In subproject {}: '.format(subproject) if subproject else '' 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): def load(build_dir):
filename = os.path.join(build_dir, 'meson-private', 'coredata.dat') filename = os.path.join(build_dir, 'meson-private', 'coredata.dat')

@ -2142,11 +2142,9 @@ recommended as it is not supported on some platforms''')
self.assertEqual(obj.builtins['default_library'].value, 'shared') self.assertEqual(obj.builtins['default_library'].value, 'shared')
self.wipe() self.wipe()
# Should fail on unknown options # Should warn on unknown options
with self.assertRaises(subprocess.CalledProcessError) as cm: out = self.init(testdir, extra_args=['-Dbad=1', '-Dfoo=2', '-Dwrong_link_args=foo'])
self.init(testdir, extra_args=['-Dbad=1', '-Dfoo=2', '-Dwrong_link_args=foo']) self.assertIn('Unknown options: "bad, foo, wrong_link_args"', out)
self.assertNotEqual(0, cm.exception.returncode)
self.assertIn('Unknown options: "bad, foo, wrong_link_args"', cm.exception.output)
self.wipe() self.wipe()
# Should fail on malformed option # Should fail on malformed option

Loading…
Cancel
Save