cmake: ci: Skip tests on Ubuntu Bionic where CMake is stuck on 3.10

7 files changed, 24 insertions, 5 deletions

diff --git a/run_project_tests.py b/run_project_tests.py
index 5fea660..f48dd0e 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -1059,7 +1059,7 @@ def detect_tests_to_run(only: T.Dict[str, T.List[str]], use_tmp: bool) -> T.List
             self.stdout_mandatory = stdout_mandatory  # expected stdout is mandatory for tests in this category
 
     all_tests = [
-        TestCategory('cmake', 'cmake', not shutil.which('cmake') or (os.environ.get('compiler') == 'msvc2015' and under_ci)),
+        TestCategory('cmake', 'cmake', not shutil.which('cmake') or (os.environ.get('compiler') == 'msvc2015' and under_ci) or (os.environ.get('MESON_CI_JOBNAME') == 'linux-bionic-gcc')),
         TestCategory('common', 'common'),
         TestCategory('native', 'native'),
         TestCategory('warning-meson', 'warning', stdout_mandatory=True),
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"
+  }
 }
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 0b86690..60ff123 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -3669,6 +3669,8 @@ class AllPlatformTests(BasePlatformTests):
         # This checks a bug where if a non-meson project is used as a third
         # level (or deeper) subproject it doesn't cause a rebuild if the build
         # files for that project are changed
+        if os.environ.get('MESON_CI_JOBNAME') == 'linux-bionic-gcc':
+            raise SkipTest('Unsupported CMake version')
         testdir = os.path.join(self.unit_test_dir, '85 nested subproject regenerate depends')
         cmakefile = Path(testdir) / 'subprojects' / 'sub2' / 'CMakeLists.txt'
         self.init(testdir)