Condense test directory names.

31 files changed, 0 insertions, 334 deletions

diff --git a/test cases/common/146 recursive linking/3rdorderdeps/lib.c.in b/test cases/common/146 recursive linking/3rdorderdeps/lib.c.in
deleted file mode 100644
index 461f85995..000000000
--- a/test cases/common/146 recursive linking/3rdorderdeps/lib.c.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "../lib.h"
-
-int get_@DEPENDENCY@dep_value (void);
-
-SYMBOL_EXPORT
-int get_@LIBTYPE@@DEPENDENCY@dep_value (void) {
-  return get_@DEPENDENCY@dep_value ();
-}
diff --git a/test cases/common/146 recursive linking/3rdorderdeps/main.c.in b/test cases/common/146 recursive linking/3rdorderdeps/main.c.in
deleted file mode 100644
index 643c24694..000000000
--- a/test cases/common/146 recursive linking/3rdorderdeps/main.c.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-#include "../lib.h"
-
-SYMBOL_IMPORT int get_@LIBTYPE@@DEPENDENCY@dep_value (void);
-
-int main(void) {
-  int val;
-
-  val = get_@LIBTYPE@@DEPENDENCY@dep_value ();
-  if (val != @VALUE@) {
-    printf("@LIBTYPE@@DEPENDENCY@ was %i instead of @VALUE@\n", val);
-    return -1;
-  }
-  return 0;
-}
diff --git a/test cases/common/146 recursive linking/3rdorderdeps/meson.build b/test cases/common/146 recursive linking/3rdorderdeps/meson.build
deleted file mode 100644
index 4c5ac7307..000000000
--- a/test cases/common/146 recursive linking/3rdorderdeps/meson.build
+++ /dev/null
@@ -1,49 +0,0 @@
-dep3_libs = []
-
-# Permutate all combinations of shared and static libraries up to three levels
-# executable -> shared -> static -> shared (etc)
-foreach dep2 : ['sh', 'st']
-  foreach dep1 : ['sh', 'st']
-    foreach libtype : ['sh', 'st']
-      name = libtype + dep1 + dep2
-      if dep2 == 'sh'
-        libret = 1
-      elif dep2 == 'st'
-        libret = 2
-      else
-        error('Unknown dep2 "@0@"'.format(dep2))
-      endif
-
-      if libtype == 'sh'
-        target = 'shared_library'
-        build_args = []
-      elif libtype == 'st'
-        target = 'static_library'
-        build_args = ['-DMESON_STATIC_BUILD']
-      else
-        error('Unknown libtype "@0@"'.format(libtype))
-      endif
-
-      cdata = configuration_data()
-      cdata.set('DEPENDENCY', dep1 + dep2)
-      cdata.set('LIBTYPE', libtype)
-      cdata.set('VALUE', libret)
-
-      lib_c = configure_file(input : 'lib.c.in',
-                             output : name + '-lib.c',
-                             configuration : cdata)
-      dep = get_variable(dep1 + dep2 + 'dep')
-      dep3_lib = build_target(name, lib_c, link_with : dep,
-                              target_type : target,
-                              c_args : build_args)
-      dep3_libs += [dep3_lib]
-
-      main_c = configure_file(input : 'main.c.in',
-                              output : name + '-main.c',
-                              configuration : cdata)
-      dep3_bin = executable(name + '_test', main_c, link_with : dep3_lib,
-                            c_args : build_args)
-      test(name + 'test', dep3_bin)
-    endforeach
-  endforeach
-endforeach
diff --git a/test cases/common/146 recursive linking/circular/lib1.c b/test cases/common/146 recursive linking/circular/lib1.c
deleted file mode 100644
index 38889cfa0..000000000
--- a/test cases/common/146 recursive linking/circular/lib1.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int get_st2_prop (void);
-int get_st3_prop (void);
-
-int get_st1_value (void) {
-  return get_st2_prop () + get_st3_prop ();
-}
diff --git a/test cases/common/146 recursive linking/circular/lib2.c b/test cases/common/146 recursive linking/circular/lib2.c
deleted file mode 100644
index 31cd37cc1..000000000
--- a/test cases/common/146 recursive linking/circular/lib2.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int get_st1_prop (void);
-int get_st3_prop (void);
-
-int get_st2_value (void) {
-  return get_st1_prop () + get_st3_prop ();
-}
diff --git a/test cases/common/146 recursive linking/circular/lib3.c b/test cases/common/146 recursive linking/circular/lib3.c
deleted file mode 100644
index 67d473aac..000000000
--- a/test cases/common/146 recursive linking/circular/lib3.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int get_st1_prop (void);
-int get_st2_prop (void);
-
-int get_st3_value (void) {
-  return get_st1_prop () + get_st2_prop ();
-}
diff --git a/test cases/common/146 recursive linking/circular/main.c b/test cases/common/146 recursive linking/circular/main.c
deleted file mode 100644
index 164abdf85..000000000
--- a/test cases/common/146 recursive linking/circular/main.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include <stdio.h>
-
-#include "../lib.h"
-
-int get_st1_value (void);
-int get_st2_value (void);
-int get_st3_value (void);
-
-int main(void) {
-  int val;
-
-  val = get_st1_value ();
-  if (val != 5) {
-    printf("st1 value was %i instead of 5\n", val);
-    return -1;
-  }
-  val = get_st2_value ();
-  if (val != 4) {
-    printf("st2 value was %i instead of 4\n", val);
-    return -2;
-  }
-  val = get_st3_value ();
-  if (val != 3) {
-    printf("st3 value was %i instead of 3\n", val);
-    return -3;
-  }
-  return 0;
-}
diff --git a/test cases/common/146 recursive linking/circular/meson.build b/test cases/common/146 recursive linking/circular/meson.build
deleted file mode 100644
index b7a70a86b..000000000
--- a/test cases/common/146 recursive linking/circular/meson.build
+++ /dev/null
@@ -1,5 +0,0 @@
-st1 = static_library('st1', 'lib1.c', 'prop1.c')
-st2 = static_library('st2', 'lib2.c', 'prop2.c')
-st3 = static_library('st3', 'lib3.c', 'prop3.c')
-
-test('circular', executable('circular', 'main.c', link_with : [st1, st2, st3]))
diff --git a/test cases/common/146 recursive linking/circular/prop1.c b/test cases/common/146 recursive linking/circular/prop1.c
deleted file mode 100644
index 4e571f5ee..000000000
--- a/test cases/common/146 recursive linking/circular/prop1.c
+++ /dev/null
@@ -1,3 +0,0 @@
-int get_st1_prop (void) {
-  return 1;
-}
diff --git a/test cases/common/146 recursive linking/circular/prop2.c b/test cases/common/146 recursive linking/circular/prop2.c
deleted file mode 100644
index ceabba055..000000000
--- a/test cases/common/146 recursive linking/circular/prop2.c
+++ /dev/null
@@ -1,3 +0,0 @@
-int get_st2_prop (void) {
-  return 2;
-}
diff --git a/test cases/common/146 recursive linking/circular/prop3.c b/test cases/common/146 recursive linking/circular/prop3.c
deleted file mode 100644
index 246206c2c..000000000
--- a/test cases/common/146 recursive linking/circular/prop3.c
+++ /dev/null
@@ -1,3 +0,0 @@
-int get_st3_prop (void) {
-  return 3;
-}
diff --git a/test cases/common/146 recursive linking/edge-cases/libsto.c b/test cases/common/146 recursive linking/edge-cases/libsto.c
deleted file mode 100644
index 93f46a88c..000000000
--- a/test cases/common/146 recursive linking/edge-cases/libsto.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "../lib.h"
-
-int get_builto_value (void);
-
-SYMBOL_EXPORT
-int get_stodep_value (void) {
-  return get_builto_value ();
-}
diff --git a/test cases/common/146 recursive linking/edge-cases/meson.build b/test cases/common/146 recursive linking/edge-cases/meson.build
deleted file mode 100644
index 6a46266b4..000000000
--- a/test cases/common/146 recursive linking/edge-cases/meson.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# Test https://github.com/mesonbuild/meson/issues/2096
-# Note that removing 'shnodep' from link_with: makes the error go away because
-# then it is added after the static library is added to the link command.
-test('shared-static', executable('shstexe', 'shstmain.c', link_with : [shnodep, stshdep]))
-
-# Static library that needs a symbol defined in an object file. This already
-# works, but good to add a test case early.
-stodep = static_library('stodep', 'libsto.c')
-test('stodep', executable('stodep', 'stomain.c', 'stobuilt.c', link_with : stodep))
diff --git a/test cases/common/146 recursive linking/edge-cases/shstmain.c b/test cases/common/146 recursive linking/edge-cases/shstmain.c
deleted file mode 100644
index 334f86788..000000000
--- a/test cases/common/146 recursive linking/edge-cases/shstmain.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-#include "../lib.h"
-
-int get_stshdep_value (void);
-
-int main(void) {
-  int val;
-
-  val = get_stshdep_value ();
-  if (val != 1) {
-    printf("st1 value was %i instead of 1\n", val);
-    return -1;
-  }
-  return 0;
-}
diff --git a/test cases/common/146 recursive linking/edge-cases/stobuilt.c b/test cases/common/146 recursive linking/edge-cases/stobuilt.c
deleted file mode 100644
index 9cc15bcae..000000000
--- a/test cases/common/146 recursive linking/edge-cases/stobuilt.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "../lib.h"
-
-
-SYMBOL_EXPORT
-int get_builto_value (void) {
-  return 1;
-}
diff --git a/test cases/common/146 recursive linking/edge-cases/stomain.c b/test cases/common/146 recursive linking/edge-cases/stomain.c
deleted file mode 100644
index a16a89b31..000000000
--- a/test cases/common/146 recursive linking/edge-cases/stomain.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-#include "../lib.h"
-
-int get_stodep_value (void);
-
-int main(void) {
-  int val;
-
-  val = get_stodep_value ();
-  if (val != 1) {
-    printf("st1 value was %i instead of 1\n", val);
-    return -1;
-  }
-  return 0;
-}
diff --git a/test cases/common/146 recursive linking/lib.h b/test cases/common/146 recursive linking/lib.h
deleted file mode 100644
index b54bf3673..000000000
--- a/test cases/common/146 recursive linking/lib.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#if defined _WIN32
-  #ifdef MESON_STATIC_BUILD
-   #define SYMBOL_EXPORT
-   #define SYMBOL_IMPORT
-  #else
-   #define SYMBOL_IMPORT __declspec(dllimport)
-   #define SYMBOL_EXPORT __declspec(dllexport)
-  #endif
-#else
-  #define SYMBOL_IMPORT
-  #if defined __GNUC__
-    #define SYMBOL_EXPORT __attribute__ ((visibility("default")))
-  #else
-    #pragma message ("Compiler does not support symbol visibility.")
-    #define SYMBOL_EXPORT
-  #endif
-#endif
diff --git a/test cases/common/146 recursive linking/main.c b/test cases/common/146 recursive linking/main.c
deleted file mode 100644
index cf091d089..000000000
--- a/test cases/common/146 recursive linking/main.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <stdio.h>
-
-#include "lib.h"
-
-int get_stnodep_value (void);
-int get_stshdep_value (void);
-int get_ststdep_value (void);
-SYMBOL_IMPORT int get_shnodep_value (void);
-SYMBOL_IMPORT int get_shshdep_value (void);
-SYMBOL_IMPORT int get_shstdep_value (void);
-
-int main(void) {
-  int val;
-
-  val = get_shnodep_value ();
-  if (val != 1) {
-    printf("shnodep was %i instead of 1\n", val);
-    return -1;
-  }
-  val = get_stnodep_value ();
-  if (val != 2) {
-    printf("stnodep was %i instead of 2\n", val);
-    return -2;
-  }
-  val = get_shshdep_value ();
-  if (val != 1) {
-    printf("shshdep was %i instead of 1\n", val);
-    return -3;
-  }
-  val = get_shstdep_value ();
-  if (val != 2) {
-    printf("shstdep was %i instead of 2\n", val);
-    return -4;
-  }
-  val = get_stshdep_value ();
-  if (val != 1) {
-    printf("shstdep was %i instead of 1\n", val);
-    return -5;
-  }
-  val = get_ststdep_value ();
-  if (val != 2) {
-    printf("ststdep was %i instead of 2\n", val);
-    return -6;
-  }
-  return 0;
-}
diff --git a/test cases/common/146 recursive linking/meson.build b/test cases/common/146 recursive linking/meson.build
deleted file mode 100644
index 2ca715157..000000000
--- a/test cases/common/146 recursive linking/meson.build
+++ /dev/null
@@ -1,29 +0,0 @@
-project('recursive dependencies', 'c')
-
-# Test that you can link a shared executable to:
-# - A shared library with no other deps
-subdir('shnodep')
-# - A static library with no other deps
-subdir('stnodep')
-# - A shared library with a shared library dep
-subdir('shshdep')
-# - A shared library with a static library dep
-subdir('shstdep')
-# - A static library with a shared library dep
-subdir('stshdep')
-# - A static library with a static library dep
-subdir('ststdep')
-
-test('alldeps',
-     executable('alldeps', 'main.c',
-                link_with : [shshdep, shstdep, ststdep, stshdep]))
-
-# More combinations of static and shared libraries
-subdir('3rdorderdeps')
-
-# Circular dependencies between static libraries
-# This requires the use of --start/end-group with GNU ld
-subdir('circular')
-
-# Various edge cases that have been reported
-subdir('edge-cases')
diff --git a/test cases/common/146 recursive linking/shnodep/lib.c b/test cases/common/146 recursive linking/shnodep/lib.c
deleted file mode 100644
index a3b7993c2..000000000
--- a/test cases/common/146 recursive linking/shnodep/lib.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "../lib.h"
-
-SYMBOL_EXPORT
-int get_shnodep_value (void) {
-  return 1;
-}
diff --git a/test cases/common/146 recursive linking/shnodep/meson.build b/test cases/common/146 recursive linking/shnodep/meson.build
deleted file mode 100644
index 66cfd9bc6..000000000
--- a/test cases/common/146 recursive linking/shnodep/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-shnodep = shared_library('shnodep', 'lib.c', version: '0.0.0')
diff --git a/test cases/common/146 recursive linking/shshdep/lib.c b/test cases/common/146 recursive linking/shshdep/lib.c
deleted file mode 100644
index 715d12092..000000000
--- a/test cases/common/146 recursive linking/shshdep/lib.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "../lib.h"
-
-int get_shnodep_value (void);
-
-SYMBOL_EXPORT
-int get_shshdep_value (void) {
-  return get_shnodep_value ();
-}
diff --git a/test cases/common/146 recursive linking/shshdep/meson.build b/test cases/common/146 recursive linking/shshdep/meson.build
deleted file mode 100644
index 020b481cf..000000000
--- a/test cases/common/146 recursive linking/shshdep/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-shshdep = shared_library('shshdep', 'lib.c', link_with : shnodep)
diff --git a/test cases/common/146 recursive linking/shstdep/lib.c b/test cases/common/146 recursive linking/shstdep/lib.c
deleted file mode 100644
index 5da8d0b2e..000000000
--- a/test cases/common/146 recursive linking/shstdep/lib.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "../lib.h"
-
-int get_stnodep_value (void);
-
-SYMBOL_EXPORT
-int get_shstdep_value (void) {
-  return get_stnodep_value ();
-}
diff --git a/test cases/common/146 recursive linking/shstdep/meson.build b/test cases/common/146 recursive linking/shstdep/meson.build
deleted file mode 100644
index 008f9f893..000000000
--- a/test cases/common/146 recursive linking/shstdep/meson.build
+++ /dev/null
@@ -1 +0,0 @@
-shstdep = shared_library('shstdep', 'lib.c', link_with : stnodep)
diff --git a/test cases/common/146 recursive linking/stnodep/lib.c b/test cases/common/146 recursive linking/stnodep/lib.c
deleted file mode 100644
index 4bc50bea2..000000000
--- a/test cases/common/146 recursive linking/stnodep/lib.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "../lib.h"
-
-SYMBOL_EXPORT
-int get_stnodep_value (void) {
-  return 2;
-}
diff --git a/test cases/common/146 recursive linking/stnodep/meson.build b/test cases/common/146 recursive linking/stnodep/meson.build
deleted file mode 100644
index 77f7129b6..000000000
--- a/test cases/common/146 recursive linking/stnodep/meson.build
+++ /dev/null
@@ -1,2 +0,0 @@
-stnodep = static_library('stnodep', 'lib.c',
-                         c_args : '-DMESON_STATIC_BUILD')
diff --git a/test cases/common/146 recursive linking/stshdep/lib.c b/test cases/common/146 recursive linking/stshdep/lib.c
deleted file mode 100644
index 3cfa12bcb..000000000
--- a/test cases/common/146 recursive linking/stshdep/lib.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "../lib.h"
-
-int get_shnodep_value (void);
-
-SYMBOL_EXPORT
-int get_stshdep_value (void) {
-  return get_shnodep_value ();
-}
diff --git a/test cases/common/146 recursive linking/stshdep/meson.build b/test cases/common/146 recursive linking/stshdep/meson.build
deleted file mode 100644
index 0967c1ce4..000000000
--- a/test cases/common/146 recursive linking/stshdep/meson.build
+++ /dev/null
@@ -1,2 +0,0 @@
-stshdep = static_library('stshdep', 'lib.c', link_with : shnodep,
-                         c_args : '-DMESON_STATIC_BUILD')
diff --git a/test cases/common/146 recursive linking/ststdep/lib.c b/test cases/common/146 recursive linking/ststdep/lib.c
deleted file mode 100644
index fca870669..000000000
--- a/test cases/common/146 recursive linking/ststdep/lib.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "../lib.h"
-
-int get_stnodep_value (void);
-
-SYMBOL_EXPORT
-int get_ststdep_value (void) {
-  return get_stnodep_value ();
-}
diff --git a/test cases/common/146 recursive linking/ststdep/meson.build b/test cases/common/146 recursive linking/ststdep/meson.build
deleted file mode 100644
index 3602442aa..000000000
--- a/test cases/common/146 recursive linking/ststdep/meson.build
+++ /dev/null
@@ -1,2 +0,0 @@
-ststdep = static_library('ststdep', 'lib.c', link_with : stnodep,
-                         c_args : '-DMESON_STATIC_BUILD')