diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-03-10 18:39:10 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-05-17 00:26:58 +0300 |
| commit | 13e92223bec7853ccdd17922625c06d4699e1454 (patch) | |
| tree | d8560d753de4d4381bd852fe21fdf2f0b85e6d5a | |
| parent | 0e898def935e81f282d79d3b4d5541b541fdd692 (diff) | |
| download | meson-13e92223bec7853ccdd17922625c06d4699e1454.zip meson-13e92223bec7853ccdd17922625c06d4699e1454.tar.gz meson-13e92223bec7853ccdd17922625c06d4699e1454.tar.bz2 | |
Generalize message about fallback failure
The fallback might be not used not only because it couldn't be found, but
also because something went wrong trying to use it.
Also, update a test which relies on the specific text
| -rw-r--r-- | mesonbuild/interpreter.py | 2 | ||||
| -rwxr-xr-x | run_unittests.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index ffff45d..49e9381 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2735,7 +2735,7 @@ root and issuing %s. # If the subproject execution failed in a non-fatal way, don't raise an # exception; let the caller handle things. except Exception as e: - mlog.log('Also couldn\'t find a fallback subproject in', + mlog.log('Couldn\'t use fallback subproject in', mlog.bold(os.path.join(self.subproject_dir, dirname)), 'for the dependency', mlog.bold(name), '\nReason:', str(e)) return None diff --git a/run_unittests.py b/run_unittests.py index 5997e35..3608d3e 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2308,13 +2308,13 @@ 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"Also couldn't find a fallback subproject " + self.assertRegex(out, r"Couldn't use fallback subproject " "in.*subprojects.*nosubproj.*for the dependency.*somedep") self.assertRegex(out, r'Dependency.*somenotfounddep.*from subproject.*' 'subprojects.*somesubproj.*found:.*NO') self.assertRegex(out, r'Dependency.*zlibproxy.*from subproject.*' 'subprojects.*somesubproj.*found:.*YES.*(cached)') - self.assertRegex(out, r'Also couldn\'t find a fallback subproject in ' + self.assertRegex(out, r'Couldn\'t use fallback subproject in ' '.*subprojects.*failingsubproj.*for the dependency.*somedep') def test_exception_exit_status(self): |