From a580fac83abd56a7576ea81f7cbb4693dffdcfe0 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 15 Feb 2022 23:26:44 -0500 Subject: tests: allow setting MESON_CI_JOBNAME=thirdparty This is treated by the test harness as though unset, i.e. we do normal skipping and don't assume we are running in Meson's own project CI. However, it has one distinction which is that it isn't an error to set $CI without setting $MESON_CI_JOBNAME, if it is in fact set but to the ignored value. This lets automated workflows such as Linux distro testing, particularly alpine linux, set $CI or have it set for them by default, without messing things up. Also it has the advantage of $CI actually enabling useful benefits! We will still assume that this thirdparty environment wants to force verbose logging (printing testlogs, running ninja/samu with -v) and colorize the console. --- unittests/helpers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'unittests/helpers.py') diff --git a/unittests/helpers.py b/unittests/helpers.py index 0945384..182dfa3 100644 --- a/unittests/helpers.py +++ b/unittests/helpers.py @@ -17,7 +17,7 @@ from run_tests import get_fake_env def is_ci(): - if 'MESON_CI_JOBNAME' in os.environ: + if os.environ.get('MESON_CI_JOBNAME') not in {None, 'thirdparty'}: return True return False -- cgit v1.1