tests: Use the new test skipping facility everywhere

6 files changed, 35 insertions, 38 deletions

diff --git a/test cases/d/4 library versions/meson.build b/test cases/d/4 library versions/meson.build
index 26cc38a..f680651 100644
--- a/test cases/d/4 library versions/meson.build
+++ b/test cases/d/4 library versions/meson.build
@@ -1,25 +1,22 @@
 project('D library versions', 'd')
 
 if meson.get_compiler('d').get_id() == 'gcc'
-    message('GDC can not build shared libraries. Test skipped.')
-    install_data('no-installed-files', install_dir : '')
-else
-
-    shared_library('some', 'lib.d',
-      version : '1.2.3',
-      soversion : '0',
-      install : true)
+  error('MESON_SKIP_TEST: GDC can not build shared libraries')
+endif
 
-    shared_library('noversion', 'lib.d',
-      install : true)
+shared_library('some', 'lib.d',
+  version : '1.2.3',
+  soversion : '0',
+  install : true)
 
-    shared_library('onlyversion', 'lib.d',
-      version : '1.4.5',
-      install : true)
+shared_library('noversion', 'lib.d',
+  install : true)
 
-    shared_library('onlysoversion', 'lib.d',
-      # Also test that int soversion is acceptable
-      soversion : 5,
-      install : true)
+shared_library('onlyversion', 'lib.d',
+  version : '1.4.5',
+  install : true)
 
-endif
+shared_library('onlysoversion', 'lib.d',
+  # Also test that int soversion is acceptable
+  soversion : 5,
+  install : true)
diff --git a/test cases/d/4 library versions/no-installed-files b/test cases/d/4 library versions/no-installed-files
deleted file mode 100644
index e69de29..0000000
--- a/test cases/d/4 library versions/no-installed-files
+++ /dev/null
diff --git a/test cases/windows/7 mingw dll versioning/meson.build b/test cases/windows/7 mingw dll versioning/meson.build
index 23a3343..2f6035e 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 e69de29..0000000
--- 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 0c36173..d6aecb6 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 e69de29..0000000
--- a/test cases/windows/8 msvc dll versioning/no-installed-files
+++ /dev/null