diff options
| -rw-r--r-- | mesonbuild/interpreterbase/decorators.py | 4 | ||||
| -rw-r--r-- | test cases/common/44 pkgconfig-gen/test.json | 4 | ||||
| -rw-r--r-- | test cases/common/62 string arithmetic/test.json | 2 | ||||
| -rw-r--r-- | test cases/warning/1 version for string div/test.json | 2 | ||||
| -rw-r--r-- | test cases/warning/6 list add/test.json | 2 | ||||
| -rw-r--r-- | unittests/allplatformstests.py | 8 | ||||
| -rw-r--r-- | unittests/failuretests.py | 6 | ||||
| -rw-r--r-- | unittests/internaltests.py | 18 |
8 files changed, 23 insertions, 23 deletions
diff --git a/mesonbuild/interpreterbase/decorators.py b/mesonbuild/interpreterbase/decorators.py index 120c579..a98e999 100644 --- a/mesonbuild/interpreterbase/decorators.py +++ b/mesonbuild/interpreterbase/decorators.py @@ -695,7 +695,7 @@ class FeatureNew(FeatureCheckBase): def log_usage_warning(self, tv: str, location: T.Optional['mparser.BaseNode']) -> None: args = [ - 'Project targeting', f"'{tv}'", + 'Project targets', f"'{tv}'", 'but uses feature introduced in', f"'{self.feature_version}':", f'{self.feature_name}.', @@ -728,7 +728,7 @@ class FeatureDeprecated(FeatureCheckBase): def log_usage_warning(self, tv: str, location: T.Optional['mparser.BaseNode']) -> None: args = [ - 'Project targeting', f"'{tv}'", + 'Project targets', f"'{tv}'", 'but uses feature deprecated since', f"'{self.feature_version}':", f'{self.feature_name}.', diff --git a/test cases/common/44 pkgconfig-gen/test.json b/test cases/common/44 pkgconfig-gen/test.json index 9e611b1..20a2005 100644 --- a/test cases/common/44 pkgconfig-gen/test.json +++ b/test cases/common/44 pkgconfig-gen/test.json @@ -18,10 +18,10 @@ ], "stdout": [ { - "line": "test cases/common/44 pkgconfig-gen/meson.build:164: WARNING: Project targeting '>=0.60.0' but uses feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories." + "line": "test cases/common/44 pkgconfig-gen/meson.build:164: WARNING: Project targets '>=0.60.0' but uses feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories." }, { - "line": "test cases/common/44 pkgconfig-gen/meson.build:170: WARNING: Project targeting '>=0.60.0' but uses feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories.", + "line": "test cases/common/44 pkgconfig-gen/meson.build:170: WARNING: Project targets '>=0.60.0' but uses feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories.", "count": 0 }, { diff --git a/test cases/common/62 string arithmetic/test.json b/test cases/common/62 string arithmetic/test.json index 62eed02..5a11650 100644 --- a/test cases/common/62 string arithmetic/test.json +++ b/test cases/common/62 string arithmetic/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/common/62 string arithmetic/meson.build:25: WARNING: Project targeting '>=0.62.0' but uses feature introduced in '0.63.0': multiline format strings." + "line": "test cases/common/62 string arithmetic/meson.build:25: WARNING: Project targets '>=0.62.0' but uses feature introduced in '0.63.0': multiline format strings." } ] } diff --git a/test cases/warning/1 version for string div/test.json b/test cases/warning/1 version for string div/test.json index 2f09757..e8acb69 100644 --- a/test cases/warning/1 version for string div/test.json +++ b/test cases/warning/1 version for string div/test.json @@ -2,7 +2,7 @@ "stdout": [ { "comment": "literal '/' appears in output, irrespective of os.path.sep, as that's the operator", - "line": "test cases/warning/1 version for string div/meson.build:3: WARNING: Project targeting '>=0.48.0' but uses feature introduced in '0.49.0': / with string arguments." + "line": "test cases/warning/1 version for string div/meson.build:3: WARNING: Project targets '>=0.48.0' but uses feature introduced in '0.49.0': / with string arguments." } ] } diff --git a/test cases/warning/6 list add/test.json b/test cases/warning/6 list add/test.json index a4437ee..e3ce8d0 100644 --- a/test cases/warning/6 list add/test.json +++ b/test cases/warning/6 list add/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/warning/6 list add/meson.build:4: WARNING: Project targeting '>=0.59.0' but uses feature introduced in '0.60.0': list.<plus>. The right hand operand was not a list." + "line": "test cases/warning/6 list add/meson.build:4: WARNING: Project targets '>=0.59.0' but uses feature introduced in '0.60.0': list.<plus>. The right hand operand was not a list." } ] } diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py index f0e27e9..42bc60e 100644 --- a/unittests/allplatformstests.py +++ b/unittests/allplatformstests.py @@ -2340,12 +2340,12 @@ class AllPlatformTests(BasePlatformTests): testdir = os.path.join(self.unit_test_dir, '40 featurenew subprojects') out = self.init(testdir) # Parent project warns correctly - self.assertRegex(out, "WARNING: Project targeting '>=0.45'.*'0.47.0': dict") + self.assertRegex(out, "WARNING: Project targets '>=0.45'.*'0.47.0': dict") # Subprojects warn correctly - self.assertRegex(out, r"foo\| .*WARNING: Project targeting '>=0.40'.*'0.44.0': disabler") - self.assertRegex(out, r"baz\| .*WARNING: Project targeting '!=0.40'.*'0.44.0': disabler") + self.assertRegex(out, r"foo\| .*WARNING: Project targets '>=0.40'.*'0.44.0': disabler") + self.assertRegex(out, r"baz\| .*WARNING: Project targets '!=0.40'.*'0.44.0': disabler") # Subproject has a new-enough meson_version, no warning - self.assertNotRegex(out, "WARNING: Project targeting.*Python") + self.assertNotRegex(out, "WARNING: Project targets.*Python") # Ensure a summary is printed in the subproject and the outer project self.assertRegex(out, r"\| WARNING: Project specifies a minimum meson_version '>=0.40'") self.assertRegex(out, r"\| \* 0.44.0: {'disabler'}") diff --git a/unittests/failuretests.py b/unittests/failuretests.py index 498b448..54a6c58 100644 --- a/unittests/failuretests.py +++ b/unittests/failuretests.py @@ -314,18 +314,18 @@ class FailureTests(BasePlatformTests): def test_using_too_recent_feature(self): # Here we use a dict, which was introduced in 0.47.0 self.assertMesonOutputs("dict = {}", - ".*WARNING.*Project targeting.*but.*", + ".*WARNING.*Project targets.*but.*", meson_version='>= 0.46.0') def test_using_recent_feature(self): # Same as above, except the meson version is now appropriate self.assertMesonDoesNotOutput("dict = {}", - ".*WARNING.*Project targeting.*but.*", + ".*WARNING.*Project targets.*but.*", meson_version='>= 0.47') def test_using_too_recent_feature_dependency(self): self.assertMesonOutputs("dependency('pcap', required: false)", - ".*WARNING.*Project targeting.*but.*", + ".*WARNING.*Project targets.*but.*", meson_version='>= 0.41.0') def test_vcs_tag_featurenew_build_always_stale(self): diff --git a/unittests/internaltests.py b/unittests/internaltests.py index 3cdf3dc..8e52fa6 100644 --- a/unittests/internaltests.py +++ b/unittests/internaltests.py @@ -1393,39 +1393,39 @@ class InternalTests(unittest.TestCase): with self.subTest('deprecated array string value'), mock.patch('sys.stdout', io.StringIO()) as out: _(None, mock.Mock(subproject=''), [], {'input': ['foo']}) - self.assertRegex(out.getvalue(), r"""WARNING:.Project targeting '1.0'.*deprecated since '0.9': "testfunc" keyword argument "input" value "foo".*""") + self.assertRegex(out.getvalue(), r"""WARNING:.Project targets '1.0'.*deprecated since '0.9': "testfunc" keyword argument "input" value "foo".*""") with self.subTest('new array string value'), mock.patch('sys.stdout', io.StringIO()) as out: _(None, mock.Mock(subproject=''), [], {'input': ['bar']}) - self.assertRegex(out.getvalue(), r"""WARNING:.Project targeting '1.0'.*introduced in '1.1': "testfunc" keyword argument "input" value "bar".*""") + self.assertRegex(out.getvalue(), r"""WARNING:.Project targets '1.0'.*introduced in '1.1': "testfunc" keyword argument "input" value "bar".*""") with self.subTest('deprecated dict string value'), mock.patch('sys.stdout', io.StringIO()) as out: _(None, mock.Mock(subproject=''), [], {'output': {'foo': 'a'}}) - self.assertRegex(out.getvalue(), r"""WARNING:.Project targeting '1.0'.*deprecated since '0.9': "testfunc" keyword argument "output" value "foo".*""") + self.assertRegex(out.getvalue(), r"""WARNING:.Project targets '1.0'.*deprecated since '0.9': "testfunc" keyword argument "output" value "foo".*""") with self.subTest('deprecated dict string value with msg'), mock.patch('sys.stdout', io.StringIO()) as out: _(None, mock.Mock(subproject=''), [], {'output': {'foo2': 'a'}}) - self.assertRegex(out.getvalue(), r"""WARNING:.Project targeting '1.0'.*deprecated since '0.9': "testfunc" keyword argument "output" value "foo2". dont use it.*""") + self.assertRegex(out.getvalue(), r"""WARNING:.Project targets '1.0'.*deprecated since '0.9': "testfunc" keyword argument "output" value "foo2". dont use it.*""") with self.subTest('new dict string value'), mock.patch('sys.stdout', io.StringIO()) as out: _(None, mock.Mock(subproject=''), [], {'output': {'bar': 'b'}}) - self.assertRegex(out.getvalue(), r"""WARNING:.Project targeting '1.0'.*introduced in '1.1': "testfunc" keyword argument "output" value "bar".*""") + self.assertRegex(out.getvalue(), r"""WARNING:.Project targets '1.0'.*introduced in '1.1': "testfunc" keyword argument "output" value "bar".*""") with self.subTest('new dict string value with msg'), mock.patch('sys.stdout', io.StringIO()) as out: _(None, mock.Mock(subproject=''), [], {'output': {'bar2': 'a'}}) - self.assertRegex(out.getvalue(), r"""WARNING:.Project targeting '1.0'.*introduced in '1.1': "testfunc" keyword argument "output" value "bar2". use this.*""") + self.assertRegex(out.getvalue(), r"""WARNING:.Project targets '1.0'.*introduced in '1.1': "testfunc" keyword argument "output" value "bar2". use this.*""") with self.subTest('non string union'), mock.patch('sys.stdout', io.StringIO()) as out: _(None, mock.Mock(subproject=''), [], {'install_dir': False}) - self.assertRegex(out.getvalue(), r"""WARNING:.Project targeting '1.0'.*deprecated since '0.9': "testfunc" keyword argument "install_dir" value "False".*""") + self.assertRegex(out.getvalue(), r"""WARNING:.Project targets '1.0'.*deprecated since '0.9': "testfunc" keyword argument "install_dir" value "False".*""") with self.subTest('deprecated string union'), mock.patch('sys.stdout', io.StringIO()) as out: _(None, mock.Mock(subproject=''), [], {'mode': 'deprecated'}) - self.assertRegex(out.getvalue(), r"""WARNING:.Project targeting '1.0'.*deprecated since '1.0': "testfunc" keyword argument "mode" value "deprecated".*""") + self.assertRegex(out.getvalue(), r"""WARNING:.Project targets '1.0'.*deprecated since '1.0': "testfunc" keyword argument "mode" value "deprecated".*""") with self.subTest('new string union'), mock.patch('sys.stdout', io.StringIO()) as out: _(None, mock.Mock(subproject=''), [], {'mode': 'since'}) - self.assertRegex(out.getvalue(), r"""WARNING:.Project targeting '1.0'.*introduced in '1.1': "testfunc" keyword argument "mode" value "since".*""") + self.assertRegex(out.getvalue(), r"""WARNING:.Project targets '1.0'.*introduced in '1.1': "testfunc" keyword argument "mode" value "since".*""") def test_typed_kwarg_evolve(self) -> None: k = KwargInfo('foo', str, required=True, default='foo') |