aboutsummaryrefslogtreecommitdiff
path: root/run_unittests.py
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2018-05-15 11:55:18 +0100
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-01 20:21:09 +0000
commitb7df392e9f0f5268960d36005aa0592e35751a49 (patch)
tree5b2b152e23d55ab73e8149ef75f980f569ba65e0 /run_unittests.py
parentaa27f7cec95fcd02cb5384b7bf1022bad2b4cab0 (diff)
downloadmeson-b7df392e9f0f5268960d36005aa0592e35751a49.zip
meson-b7df392e9f0f5268960d36005aa0592e35751a49.tar.gz
meson-b7df392e9f0f5268960d36005aa0592e35751a49.tar.bz2
Also run Windows unit tests on Cygwin
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-xrun_unittests.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/run_unittests.py b/run_unittests.py
index a359e3c..d5e0656 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -2341,6 +2341,7 @@ class WindowsTests(BasePlatformTests):
super().setUp()
self.platform_test_dir = os.path.join(self.src_root, 'test cases/windows')
+ @unittest.skipIf(is_cygwin(), 'Test only applicable to Windows')
def test_find_program(self):
'''
Test that Windows-specific edge-cases in find_program are functioning
@@ -3314,7 +3315,7 @@ if __name__ == '__main__':
cases += ['LinuxlikeTests']
if should_run_linux_cross_tests():
cases += ['LinuxArmCrossCompileTests']
- elif is_windows():
+ if is_windows() or is_cygwin():
cases += ['WindowsTests']
unittest.main(defaultTest=cases, buffer=True)