diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-10-07 13:12:49 +0100 |
---|---|---|
committer | Jon Turney <jon.turney@dronecode.org.uk> | 2018-10-14 16:01:36 +0100 |
commit | 459b81de4644106fabd410870f577848bef99fe6 (patch) | |
tree | 9227651e8d39c92b9330a6493e938f0334de5eb3 /run_unittests.py | |
parent | 7bdb39668bd2efd579d94e7d69a0b429e026499b (diff) | |
download | meson-459b81de4644106fabd410870f577848bef99fe6.zip meson-459b81de4644106fabd410870f577848bef99fe6.tar.gz meson-459b81de4644106fabd410870f577848bef99fe6.tar.bz2 |
Use 'CI' environment variable to detect CI environment
Use the 'CI' environment variable to detect CI environment, rather than a
collection of CI-specific ones.
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-x | run_unittests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/run_unittests.py b/run_unittests.py index 9ffce52..e02bc6c 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -81,7 +81,7 @@ def is_tarball(): return False def is_ci(): - if 'TRAVIS' in os.environ or 'APPVEYOR' in os.environ: + if 'CI' in os.environ: return True return False @@ -98,8 +98,8 @@ def _git_init(project_dir): def skipIfNoPkgconfig(f): ''' - Skip this test if no pkg-config is found, unless we're on Travis or - Appveyor CI. This allows users to run our test suite without having + Skip this test if no pkg-config is found, unless we're on CI. + This allows users to run our test suite without having pkg-config installed on, f.ex., macOS, while ensuring that our CI does not silently skip the test because of misconfiguration. @@ -1671,7 +1671,7 @@ class AllPlatformTests(BasePlatformTests): self.assertIsInstance(linker, lib) self.assertEqual(cc.id, 'msvc') self.assertTrue(hasattr(cc, 'is_64')) - # If we're in the appveyor CI, we know what the compiler will be + # If we're on Windows CI, we know what the compiler will be if 'arch' in os.environ: if os.environ['arch'] == 'x64': self.assertTrue(cc.is_64) |