aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2022-02-17 01:25:17 -0500
committerEli Schwartz <eschwartz@archlinux.org>2022-02-17 14:48:27 -0500
commit58c124d48a278e0d428cc4ecb3883b7ba5f55565 (patch)
tree0214e20ad42d457d86c50efbaee2dfac851275bb /run_project_tests.py
parent1ac6fc0595f992621cbb79b7971ba07db1fa8e62 (diff)
downloadmeson-58c124d48a278e0d428cc4ecb3883b7ba5f55565.zip
meson-58c124d48a278e0d428cc4ecb3883b7ba5f55565.tar.gz
meson-58c124d48a278e0d428cc4ecb3883b7ba5f55565.tar.bz2
project tests: fine-tune the check for whether we are in CI
Follow-up on commit 4274e0f42a9673df981dd7a7a456f4d4fcfe5452. We want to allow tests to be skipped freely in third-party environments, so this should check the jobname, not whether $CI exists. We will anyways raise an error when trying to run the project tests, if $CI is set but no jobname is set.
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-xrun_project_tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index 55ab6d4..926f4ef 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -972,7 +972,7 @@ def have_java() -> bool:
def skip_dont_care(t: TestDef) -> bool:
# Everything is optional when not running on CI
- if not under_ci:
+ if ci_jobname is None:
return True
# Non-frameworks test are allowed to determine their own skipping under CI (currently)