test cases: do not pass global option on command line

The test covers overriding an option from the dependency() function.
If the same option is passed on the command line, it overrides the
dependency()'s default_options as well.

Tweak the description of the unittests that uses the same sources.
The tests pass, but I am not sure they should.  For example in
the second test the default_library=both setting in the machine file
should have the same effect as the -D option (machine files have lower
priority than command line, but higher priority than anything in meson.build
files).

Signed-off-by: Paolo Bonzini <[email protected]>

Author: bonzini

test cases/common/223 persubproject options/meson.build

@@ -1,5 +1,5 @@
 project('persubproject options', 'c', 'cpp',
-  default_options : ['werror=true',
+  default_options : ['werror=true', 'default_library=both',
                      'warning_level=3',
                      'cpp_std=c++11'])
 

test cases/common/223 persubproject options/test.json

@@ -550,8 +550,8 @@ def test_builtin_options_subprojects(self):
         # into augments.
         self.assertEqual(found, 2, 'Did not find all two sections')
 
-    def test_builtin_options_subprojects_overrides_buildfiles(self):
-        # If the buildfile says subproject(... default_library: shared), ensure that's overwritten
+    def test_builtin_options_machinefile_overrides_subproject(self):
+        # The buildfile says subproject(... default_library: static), the machinefile overrides it
         testcase = os.path.join(self.common_test_dir, '223 persubproject options')
         config = self.helper_create_native_file({'sub2:built-in options': {'default_library': 'shared'}})
 
@@ -563,8 +563,9 @@ def test_builtin_options_subprojects_overrides_buildfiles(self):
                 check = cm.exception.stdout
             self.assertIn(check, 'Parent should override default_library')
 
-    def test_builtin_options_subprojects_dont_inherits_parent_override(self):
-        # If the buildfile says subproject(... default_library: shared), ensure that's overwritten
+    def test_builtin_options_machinefile_global_loses_over_subproject(self):
+        # The buildfile says subproject(... default_library: static), ensure that it overrides the machinefile
+        # FIXME: Should it??
         testcase = os.path.join(self.common_test_dir, '223 persubproject options')
         config = self.helper_create_native_file({'built-in options': {'default_library': 'both'}})
         self.init(testcase, extra_args=['--native-file', config])