diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-12-29 10:40:24 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-01-04 00:40:54 +0530 |
| commit | e36183aab43ce92509a7f8d3a20c46c5e4c85714 (patch) | |
| tree | 767242f8349349c8093902d80d0170110d5913d8 /test cases/windows | |
| parent | 28e491c706cc1943d8ce2fde9ad4b43d54fce3a4 (diff) | |
| download | meson-e36183aab43ce92509a7f8d3a20c46c5e4c85714.tar.gz | |
tests: Use the new test skipping facility everywhere
Diffstat (limited to 'test cases/windows')
4 files changed, 20 insertions, 20 deletions
diff --git a/test cases/windows/7 mingw dll versioning/meson.build b/test cases/windows/7 mingw dll versioning/meson.build index 23a33435b..2f6035eca 100644 --- a/test cases/windows/7 mingw dll versioning/meson.build +++ b/test cases/windows/7 mingw dll versioning/meson.build @@ -2,16 +2,16 @@ project('mingw dll versioning', 'c') cc = meson.get_compiler('c') +if cc.get_id() == 'msvc' + error('MESON_SKIP_TEST: test is only for MinGW') +endif + # Test that MinGW/GCC creates correctly-named dll files and dll.a files, # and also installs them in the right place -if cc.get_id() != 'msvc' - shared_library('some', 'lib.c', - version : '1.2.3', - soversion : '0', - install : true) +shared_library('some', 'lib.c', + version : '1.2.3', + soversion : '0', + install : true) - shared_library('noversion', 'lib.c', - install : true) -else - install_data('no-installed-files', install_dir : '') -endif +shared_library('noversion', 'lib.c', + install : true) diff --git a/test cases/windows/7 mingw dll versioning/no-installed-files b/test cases/windows/7 mingw dll versioning/no-installed-files deleted file mode 100644 index e69de29bb..000000000 --- a/test cases/windows/7 mingw dll versioning/no-installed-files +++ /dev/null diff --git a/test cases/windows/8 msvc dll versioning/meson.build b/test cases/windows/8 msvc dll versioning/meson.build index 0c361735b..d6aecb60a 100644 --- a/test cases/windows/8 msvc dll versioning/meson.build +++ b/test cases/windows/8 msvc dll versioning/meson.build @@ -2,15 +2,15 @@ project('msvc dll versioning', 'c') cc = meson.get_compiler('c') +if cc.get_id() != 'msvc' + error('MESON_SKIP_TEST: test is only for msvc') +endif + # Test that MSVC creates foo-0.dll and bar.dll -if cc.get_id() == 'msvc' - shared_library('some', 'lib.c', - version : '1.2.3', - soversion : '0', - install : true) +shared_library('some', 'lib.c', + version : '1.2.3', + soversion : '0', + install : true) - shared_library('noversion', 'lib.c', - install : true) -else - install_data('no-installed-files', install_dir : '') -endif +shared_library('noversion', 'lib.c', + install : true) diff --git a/test cases/windows/8 msvc dll versioning/no-installed-files b/test cases/windows/8 msvc dll versioning/no-installed-files deleted file mode 100644 index e69de29bb..000000000 --- a/test cases/windows/8 msvc dll versioning/no-installed-files +++ /dev/null |