From e36183aab43ce92509a7f8d3a20c46c5e4c85714 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Thu, 29 Dec 2016 10:40:24 +0530
Subject: [PATCH] tests: Use the new test skipping facility everywhere

---
 test cases/d/4 library versions/meson.build   | 39 +++++++++----------
 .../d/4 library versions/no-installed-files   |  0
 .../7 mingw dll versioning/meson.build        | 20 +++++-----
 .../7 mingw dll versioning/no-installed-files |  0
 .../windows/8 msvc dll versioning/meson.build | 22 +++++------
 .../8 msvc dll versioning/no-installed-files  |  0
 6 files changed, 39 insertions(+), 42 deletions(-)
 delete mode 100644 test cases/d/4 library versions/no-installed-files
 delete mode 100644 test cases/windows/7 mingw dll versioning/no-installed-files
 delete mode 100644 test cases/windows/8 msvc dll versioning/no-installed-files

diff --git a/test cases/d/4 library versions/meson.build b/test cases/d/4 library versions/meson.build
index 26cc38a5a..f680651c9 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)
-
-    shared_library('noversion', 'lib.d',
-      install : true)
-
-    shared_library('onlyversion', 'lib.d',
-      version : '1.4.5',
-      install : true)
-
-    shared_library('onlysoversion', 'lib.d',
-      # Also test that int soversion is acceptable
-      soversion : 5,
-      install : true)
-
+  error('MESON_SKIP_TEST: GDC can not build shared libraries')
 endif
+
+shared_library('some', 'lib.d',
+  version : '1.2.3',
+  soversion : '0',
+  install : true)
+
+shared_library('noversion', 'lib.d',
+  install : true)
+
+shared_library('onlyversion', 'lib.d',
+  version : '1.4.5',
+  install : true)
+
+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 e69de29bb..000000000
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
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')
 
-# 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('noversion', 'lib.c',
-    install : true)
-else
-  install_data('no-installed-files', install_dir : '')
+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
+shared_library('some', 'lib.c',
+  version : '1.2.3',
+  soversion : '0',
+  install : true)
+
+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