aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-06-05 20:35:45 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2016-06-05 20:35:45 +0300
commitde73d85ad80a375cef12fb411c66a9654fa9899b (patch)
tree5aefb459aa11a24cfd5e51156ec14db4cef88afc
parentf17b76e8de045305f2e1bfd3b8e54b35346b70df (diff)
downloadmeson-de73d85ad80a375cef12fb411c66a9654fa9899b.zip
meson-de73d85ad80a375cef12fb411c66a9654fa9899b.tar.gz
meson-de73d85ad80a375cef12fb411c66a9654fa9899b.tar.bz2
Removed vs nomod test because it fails at compile time but the framework needs it to fail at configure time.
-rw-r--r--test cases/failing/28 no vs module defs/meson.build9
-rw-r--r--test cases/failing/28 no vs module defs/prog.c5
-rw-r--r--test cases/failing/28 no vs module defs/subdir/meson.build1
-rw-r--r--test cases/failing/28 no vs module defs/subdir/somedll.c7
4 files changed, 0 insertions, 22 deletions
diff --git a/test cases/failing/28 no vs module defs/meson.build b/test cases/failing/28 no vs module defs/meson.build
deleted file mode 100644
index 7864daa..0000000
--- a/test cases/failing/28 no vs module defs/meson.build
+++ /dev/null
@@ -1,9 +0,0 @@
-project('dll_no_module_def', 'c')
-
-if meson.get_compiler('c').get_id() != 'msvc'
- error('Need to use the Visual Studio compiler')
-endif
-
-subdir('subdir')
-exe = executable('prog', 'prog.c', link_with : shlib)
-test('runtest', exe)
diff --git a/test cases/failing/28 no vs module defs/prog.c b/test cases/failing/28 no vs module defs/prog.c
deleted file mode 100644
index f35f4a0..0000000
--- a/test cases/failing/28 no vs module defs/prog.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int somedllfunc();
-
-int main(int argc, char **argv) {
- return somedllfunc() == 42 ? 0 : 1;
-}
diff --git a/test cases/failing/28 no vs module defs/subdir/meson.build b/test cases/failing/28 no vs module defs/subdir/meson.build
deleted file mode 100644
index 8395d59..0000000
--- a/test cases/failing/28 no vs module defs/subdir/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-shlib = shared_library('somedll', 'somedll.c')
diff --git a/test cases/failing/28 no vs module defs/subdir/somedll.c b/test cases/failing/28 no vs module defs/subdir/somedll.c
deleted file mode 100644
index 5c469b1..0000000
--- a/test cases/failing/28 no vs module defs/subdir/somedll.c
+++ /dev/null
@@ -1,7 +0,0 @@
-/* With MSVC, the DLL created from this will not export any symbols
- * without a module definitions file specified while linking */
-#ifdef _MSC_VER
-int somedllfunc() {
- return 42;
-}
-#endif