diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-03-29 20:07:37 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2017-04-06 22:48:02 +0100 |
| commit | 6c9260c47f62656e81a9af08121d3e1c592d9f7b (patch) | |
| tree | 2c126c024568e220b4ec4e68e53cb8713839ecd6 | |
| parent | 90a483fa74434b0ed25bd960eb0535e06f641d69 (diff) | |
| download | meson-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.
| -rwxr-xr-x | run_project_tests.py | 2 | ||||
| -rw-r--r-- | test cases/windows/5 resources/meson.build | 2 |
2 files changed, 2 insertions, 2 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)) diff --git a/test cases/windows/5 resources/meson.build b/test cases/windows/5 resources/meson.build index e92a43c..ddb7d6e 100644 --- a/test cases/windows/5 resources/meson.build +++ b/test cases/windows/5 resources/meson.build @@ -3,7 +3,7 @@ project('winmain', 'c') # MinGW windres has a bug due to which it doesn't parse args with space properly: # https://github.com/mesonbuild/meson/pull/1346 # https://sourceware.org/bugzilla/show_bug.cgi?id=4933 -if meson.get_compiler('c').get_id() == 'gcc' +if meson.get_compiler('c').get_id() == 'gcc' and host_machine.system() == 'windows' # Construct build_to_src and skip this test if it has spaces # because then the -I flag to windres will also have spaces # and we know the test will fail |