aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2023-01-21 20:57:59 -0500
committerNirbheek Chauhan <nirbheek@centricular.com>2023-02-06 23:37:54 +0530
commit08bc0003f23dc0080d3ca198e486a5df5d99876d (patch)
tree714f8a36938fd2c4b990a422abace6c2f6901199
parentaa81a54df848e34381babb8469a2507d8b9065cf (diff)
downloadmeson-08bc0003f23dc0080d3ca198e486a5df5d99876d.zip
meson-08bc0003f23dc0080d3ca198e486a5df5d99876d.tar.gz
meson-08bc0003f23dc0080d3ca198e486a5df5d99876d.tar.bz2
tests: avoid unexpected failure when cmake is not installed
This test case checks stdout and demands a `dependency()` lookup fail. The resulting error message can be different depending on whether cmake is installed, or not. For cmake-specific tests we would simply skip the test if cmake is not installed, but here we can just fine-tune the pattern matching we use to determine if the test failed "correctly". Fixes #11320
-rw-r--r--test cases/failing/111 empty fallback/test.json3
1 files changed, 2 insertions, 1 deletions
diff --git a/test cases/failing/111 empty fallback/test.json b/test cases/failing/111 empty fallback/test.json
index 02db40b..022e747 100644
--- a/test cases/failing/111 empty fallback/test.json
+++ b/test cases/failing/111 empty fallback/test.json
@@ -1,7 +1,8 @@
{
"stdout": [
{
- "line": "test cases/failing/111 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found, tried pkgconfig and cmake"
+ "match": "re",
+ "line": "test cases/failing/111 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*"
}
]
}