aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2021-07-07 21:18:57 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2021-07-13 15:26:08 +0100
commit3c81ff8f0017ac56ed35b1c7f999c56a7e88bd89 (patch)
tree4633a112c5f09f17b351b11e8cd24b02d7523693 /run_project_tests.py
parent538b347218bbfdcd303ace7dc47f2d31665264b0 (diff)
downloadmeson-3c81ff8f0017ac56ed35b1c7f999c56a7e88bd89.zip
meson-3c81ff8f0017ac56ed35b1c7f999c56a7e88bd89.tar.gz
meson-3c81ff8f0017ac56ed35b1c7f999c56a7e88bd89.tar.bz2
Make it an error if MESON_CI_JOBNAME isn't set under CI
Also check skip is as expected for CI all runs, not just those that set MESON_CI_JOBNAME.
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-xrun_project_tests.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index 57a8188..648ec47 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -962,12 +962,6 @@ def skip_dont_care(t: TestDef) -> bool:
if not t.category.endswith('frameworks'):
return True
- # For the moment, all skips in jobs which don't set MESON_CI_JOBNAME are
- # treated as expected. In the future, we should make it mandatory to set
- # MESON_CI_JOBNAME for all CI jobs.
- if ci_jobname is None:
- return True
-
return False
def skip_csharp(backend: Backend) -> bool:
@@ -1490,6 +1484,9 @@ def clear_transitive_files() -> None:
mesonlib.windows_proof_rm(str(d))
if __name__ == '__main__':
+ if under_ci and not ci_jobname:
+ raise SystemExit('Running under CI but MESON_CI_JOBNAME is not set')
+
setup_vsenv()
try: