aboutsummaryrefslogtreecommitdiff
path: root/test cases
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2022-01-30 16:29:34 +0100
committerEli Schwartz <eschwartz93@gmail.com>2022-02-03 11:25:59 -0500
commit2e2ca5a877ce8569e9daf78c3a5b32a423531d97 (patch)
tree058b897228fe73fa1f0786b0c514aafed3dbf410 /test cases
parent63870da44960e39d4e1c7d986f0e408bd1e14c74 (diff)
downloadmeson-2e2ca5a877ce8569e9daf78c3a5b32a423531d97.zip
meson-2e2ca5a877ce8569e9daf78c3a5b32a423531d97.tar.gz
meson-2e2ca5a877ce8569e9daf78c3a5b32a423531d97.tar.bz2
cmake: ci: Skip tests on Ubuntu Bionic where CMake is stuck on 3.10
Diffstat (limited to 'test cases')
-rw-r--r--test cases/failing build/4 cmake subproject isolation/test.json5
-rw-r--r--test cases/failing/114 cmake executable dependency/test.json5
-rw-r--r--test cases/warning/3 fallback consistency/test.json5
-rw-r--r--test cases/warning/4 fallback consistency/test.json5
-rw-r--r--test cases/warning/5 fallback consistency/test.json5
5 files changed, 21 insertions, 4 deletions
diff --git a/test cases/failing build/4 cmake subproject isolation/test.json b/test cases/failing build/4 cmake subproject isolation/test.json
new file mode 100644
index 0000000..b48d78a
--- /dev/null
+++ b/test cases/failing build/4 cmake subproject isolation/test.json
@@ -0,0 +1,5 @@
+{
+ "tools": {
+ "cmake": ">=3.14"
+ }
+}
diff --git a/test cases/failing/114 cmake executable dependency/test.json b/test cases/failing/114 cmake executable dependency/test.json
index 82306dd..951f2e7 100644
--- a/test cases/failing/114 cmake executable dependency/test.json
+++ b/test cases/failing/114 cmake executable dependency/test.json
@@ -3,5 +3,8 @@
{
"line": "test cases/failing/114 cmake executable dependency/meson.build:9:0: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
}
- ]
+ ],
+ "tools": {
+ "cmake": ">=3.14"
+ }
}
diff --git a/test cases/warning/3 fallback consistency/test.json b/test cases/warning/3 fallback consistency/test.json
index ee4f1f2..60e25b4 100644
--- a/test cases/warning/3 fallback consistency/test.json
+++ b/test cases/warning/3 fallback consistency/test.json
@@ -3,5 +3,8 @@
{
"line": "WARNING: Inconsistency: Subproject has overridden the dependency with another variable than 'dep2'"
}
- ]
+ ],
+ "tools": {
+ "cmake": ">=3.14"
+ }
}
diff --git a/test cases/warning/4 fallback consistency/test.json b/test cases/warning/4 fallback consistency/test.json
index ee4f1f2..60e25b4 100644
--- a/test cases/warning/4 fallback consistency/test.json
+++ b/test cases/warning/4 fallback consistency/test.json
@@ -3,5 +3,8 @@
{
"line": "WARNING: Inconsistency: Subproject has overridden the dependency with another variable than 'dep2'"
}
- ]
+ ],
+ "tools": {
+ "cmake": ">=3.14"
+ }
}
diff --git a/test cases/warning/5 fallback consistency/test.json b/test cases/warning/5 fallback consistency/test.json
index c254aaf..8ab28d1 100644
--- a/test cases/warning/5 fallback consistency/test.json
+++ b/test cases/warning/5 fallback consistency/test.json
@@ -3,5 +3,8 @@
{
"line": "WARNING: Inconsistency: Subproject has overridden the dependency with another variable than 'bar_dep'"
}
- ]
+ ],
+ "tools": {
+ "cmake": ">=3.14"
+ }
}