aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorJon Turney <jon.turney@dronecode.org.uk>2017-03-29 20:07:37 +0100
committerJon Turney <jon.turney@dronecode.org.uk>2017-04-06 22:48:02 +0100
commit6c9260c47f62656e81a9af08121d3e1c592d9f7b (patch)
tree2c126c024568e220b4ec4e68e53cb8713839ecd6 /run_project_tests.py
parent90a483fa74434b0ed25bd960eb0535e06f641d69 (diff)
downloadmeson-6c9260c47f62656e81a9af08121d3e1c592d9f7b.zip
meson-6c9260c47f62656e81a9af08121d3e1c592d9f7b.tar.gz
meson-6c9260c47f62656e81a9af08121d3e1c592d9f7b.tar.bz2
Run test cases/windows/ tests on Cygwin
Also, always run 'test cases/windows/5 resources' on Cygwin since it can handle args containing spaces correctly.
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-xrun_project_tests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py
index 302ca36..4a4101a 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -444,7 +444,7 @@ def detect_tests_to_run():
all_tests.append(('prebuilt', gather_tests('test cases/prebuilt'), False))
all_tests.append(('platform-osx', gather_tests('test cases/osx'), False if mesonlib.is_osx() else True))
- all_tests.append(('platform-windows', gather_tests('test cases/windows'), False if mesonlib.is_windows() else True))
+ all_tests.append(('platform-windows', gather_tests('test cases/windows'), False if mesonlib.is_windows() or mesonlib.is_cygwin() else True))
all_tests.append(('platform-linux', gather_tests('test cases/linuxlike'), False if not (mesonlib.is_osx() or mesonlib.is_windows()) else True))
all_tests.append(('framework', gather_tests('test cases/frameworks'), False if not mesonlib.is_osx() and not mesonlib.is_windows() else True))
all_tests.append(('java', gather_tests('test cases/java'), False if using_backend('ninja') and not mesonlib.is_osx() and have_java() else True))