Subprojects should not inherit parent override

This was the behaviour in 0.55.0, so this test was assuming a behaviour
change. Revert it to the behaviour we had in 0.55.0.
pull/5071/merge
Xavier Claessens 4 years ago committed by Xavier Claessens
parent 7271b1e942
commit ed70c6df52
  1. 7
      run_unittests.py

@ -8416,14 +8416,11 @@ class NativeFileTests(BasePlatformTests):
self.init(testcase, extra_args=['--native-file', config]) self.init(testcase, extra_args=['--native-file', config])
self.assertIn(cm.exception.stdout, 'Parent should override default_library') self.assertIn(cm.exception.stdout, 'Parent should override default_library')
def test_builtin_options_subprojects_inherits_parent_override(self): def test_builtin_options_subprojects_dont_inherits_parent_override(self):
# If the buildfile says subproject(... default_library: shared), ensure that's overwritten # If the buildfile says subproject(... default_library: shared), ensure that's overwritten
testcase = os.path.join(self.common_test_dir, '230 persubproject options') testcase = os.path.join(self.common_test_dir, '230 persubproject options')
config = self.helper_create_native_file({'built-in options': {'default_library': 'both'}}) config = self.helper_create_native_file({'built-in options': {'default_library': 'both'}})
self.init(testcase, extra_args=['--native-file', config])
with self.assertRaises(subprocess.CalledProcessError) as cm:
self.init(testcase, extra_args=['--native-file', config])
self.assertIn(cm.exception.stdout, 'Parent should override default_library')
def test_builtin_options_compiler_properties(self): def test_builtin_options_compiler_properties(self):
# the properties section can have lang_args, and those need to be # the properties section can have lang_args, and those need to be

Loading…
Cancel
Save