diff options
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 2 | ||||
| -rwxr-xr-x | run_unittests.py | 2 | ||||
| -rw-r--r-- | test cases/failing/33 non-root subproject/test.json | 2 | ||||
| -rw-r--r-- | test cases/failing/78 subproj dependency not-found and required/test.json | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index a4e0b25..bc35893 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -264,7 +264,7 @@ class Resolver: self.directory = packagename self.wrap = self.wraps.get(packagename) if not self.wrap: - m = 'Subproject directory not found and {}.wrap file not found' + m = 'Neither a subproject directory nor a {}.wrap file was found.' raise WrapNotFoundException(m.format(self.packagename)) self.directory = self.wrap.directory diff --git a/run_unittests.py b/run_unittests.py index 97bdad9..37b50c3 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -5459,7 +5459,7 @@ class FailureTests(BasePlatformTests): ''' tdir = os.path.join(self.unit_test_dir, '20 subproj dep variables') out = self.init(tdir, inprocess=True) - self.assertRegex(out, r"Subproject directory not found and .*nosubproj.wrap.* file not found") + self.assertRegex(out, r"Neither a subproject directory nor a .*nosubproj.wrap.* file was found") self.assertRegex(out, r'Function does not take positional arguments.') self.assertRegex(out, r'Dependency .*somenotfounddep.* from subproject .*subprojects/somesubproj.* found: .*NO.*') self.assertRegex(out, r'Dependency .*zlibproxy.* from subproject .*subprojects.*somesubproj.* found: .*YES.*') diff --git a/test cases/failing/33 non-root subproject/test.json b/test cases/failing/33 non-root subproject/test.json index a14cece..52baf6a 100644 --- a/test cases/failing/33 non-root subproject/test.json +++ b/test cases/failing/33 non-root subproject/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/33 non-root subproject/some/meson.build:1:0: ERROR: Subproject directory not found and someproj.wrap file not found" + "line": "test cases/failing/33 non-root subproject/some/meson.build:1:0: ERROR: Neither a subproject directory nor a someproj.wrap file was found." } ] } diff --git a/test cases/failing/78 subproj dependency not-found and required/test.json b/test cases/failing/78 subproj dependency not-found and required/test.json index 534b4f4..a89c0eb 100644 --- a/test cases/failing/78 subproj dependency not-found and required/test.json +++ b/test cases/failing/78 subproj dependency not-found and required/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/failing/78 subproj dependency not-found and required/meson.build:2:0: ERROR: Subproject directory not found and missing.wrap file not found" + "line": "test cases/failing/78 subproj dependency not-found and required/meson.build:2:0: ERROR: Neither a subproject directory nor a missing.wrap file was found." } ] } |