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

pull/9939/head
Daniel Mensinger 3 years ago committed by Eli Schwartz
parent 63870da449
commit 2e2ca5a877
  1. 2
      run_project_tests.py
  2. 5
      test cases/failing build/4 cmake subproject isolation/test.json
  3. 5
      test cases/failing/114 cmake executable dependency/test.json
  4. 5
      test cases/warning/3 fallback consistency/test.json
  5. 5
      test cases/warning/4 fallback consistency/test.json
  6. 5
      test cases/warning/5 fallback consistency/test.json
  7. 2
      unittests/allplatformstests.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),

@ -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"
}
}

@ -3,5 +3,8 @@
{
"line": "WARNING: Inconsistency: Subproject has overridden the dependency with another variable than 'dep2'"
}
]
],
"tools": {
"cmake": ">=3.14"
}
}

@ -3,5 +3,8 @@
{
"line": "WARNING: Inconsistency: Subproject has overridden the dependency with another variable than 'dep2'"
}
]
],
"tools": {
"cmake": ">=3.14"
}
}

@ -3,5 +3,8 @@
{
"line": "WARNING: Inconsistency: Subproject has overridden the dependency with another variable than 'bar_dep'"
}
]
],
"tools": {
"cmake": ">=3.14"
}
}

@ -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)

Loading…
Cancel
Save