diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-08-09 09:08:08 -0400 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2020-10-16 17:42:24 -0400 |
commit | ed70c6df52bcb28be72721ff0c2e1af9a491c967 (patch) | |
tree | 0cc2970d4e193270a60d28e03b413f332a3a8e5b | |
parent | 7271b1e9423a83c56bf6e011b4f06dc6831a6d71 (diff) | |
download | meson-ed70c6df52bcb28be72721ff0c2e1af9a491c967.zip meson-ed70c6df52bcb28be72721ff0c2e1af9a491c967.tar.gz meson-ed70c6df52bcb28be72721ff0c2e1af9a491c967.tar.bz2 |
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.
-rwxr-xr-x | run_unittests.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/run_unittests.py b/run_unittests.py index 18e0f36..8f1c52a 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -8416,14 +8416,11 @@ class NativeFileTests(BasePlatformTests): self.init(testcase, extra_args=['--native-file', config]) 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 testcase = os.path.join(self.common_test_dir, '230 persubproject options') config = self.helper_create_native_file({'built-in options': {'default_library': 'both'}}) - - 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') + self.init(testcase, extra_args=['--native-file', config]) def test_builtin_options_compiler_properties(self): # the properties section can have lang_args, and those need to be |