aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-10-14 23:16:46 +0300
committerGitHub <noreply@github.com>2018-10-14 23:16:46 +0300
commit252bf6c52e64a600d59218dfe3d4431487ad5cfd (patch)
tree8ddce90c79c150235224da8d89e3641f3dd5a79f /run_unittests.py
parent4efb361d475871064057fd698dcd1b7ef5146332 (diff)
parentefa55c9e1c19621290ddf226002feed9710185e8 (diff)
downloadmeson-252bf6c52e64a600d59218dfe3d4431487ad5cfd.zip
meson-252bf6c52e64a600d59218dfe3d4431487ad5cfd.tar.gz
meson-252bf6c52e64a600d59218dfe3d4431487ad5cfd.tar.bz2
Merge pull request #4340 from jon-turney/azure-pipelines
Add Azure pipelines CI
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 58b273d..dfa9bc9 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -83,7 +83,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
@@ -100,8 +100,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.
@@ -1673,7 +1673,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)