diff options
| -rwxr-xr-x | run_project_tests.py | 7 | ||||
| -rw-r--r-- | unittests/helpers.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index f48dd0e..55ab6d4 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -282,7 +282,8 @@ class TestDef: failing_logs: T.List[str] = [] print_debug = 'MESON_PRINT_TEST_OUTPUT' in os.environ under_ci = 'CI' in os.environ -ci_jobname = os.environ.get('MESON_CI_JOBNAME', None) +raw_ci_jobname = os.environ.get('MESON_CI_JOBNAME', None) +ci_jobname = raw_ci_jobname if raw_ci_jobname != 'thirdparty' else None do_debug = under_ci or print_debug no_meson_log_msg = 'No meson-log.txt found.' @@ -1505,8 +1506,8 @@ 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') + if under_ci and not raw_ci_jobname: + raise SystemExit('Running under CI but $MESON_CI_JOBNAME is not set (set to "thirdparty" if you are running outside of the github org)') setup_vsenv() 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 |