aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2023-01-21 20:57:59 -0500
committerEli Schwartz <eschwartz@archlinux.org>2023-01-25 22:03:11 -0500
commita38ad3039d0680f3ac34a6dc487776c79c48acf3 (patch)
tree8e5d86df204cd04c66851174f37b22d0306205a8
parent8d39c9273b58a7a9ba3c4c34125d5f37e5684a99 (diff)
downloadmeson-a38ad3039d0680f3ac34a6dc487776c79c48acf3.zip
meson-a38ad3039d0680f3ac34a6dc487776c79c48acf3.tar.gz
meson-a38ad3039d0680f3ac34a6dc487776c79c48acf3.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.*"
}
]
}