Condense test directory names.

25 files changed, 0 insertions, 244 deletions

diff --git a/test cases/unit/67 static link/lib/func1.c b/test cases/unit/67 static link/lib/func1.c
deleted file mode 100644
index cc934ad04..000000000
--- a/test cases/unit/67 static link/lib/func1.c
+++ /dev/null
@@ -1,9 +0,0 @@
-int func1()
-{
-  return 1;
-}
-
-int func1b()
-{
-  return 1;
-}
diff --git a/test cases/unit/67 static link/lib/func10.c b/test cases/unit/67 static link/lib/func10.c
deleted file mode 100644
index 75a911fb7..000000000
--- a/test cases/unit/67 static link/lib/func10.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int func10()
-{
-  return 1;
-}
diff --git a/test cases/unit/67 static link/lib/func11.c b/test cases/unit/67 static link/lib/func11.c
deleted file mode 100644
index 1d5119b47..000000000
--- a/test cases/unit/67 static link/lib/func11.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func10();
-
-int func11()
-{
-  return func10() + 1;
-}
diff --git a/test cases/unit/67 static link/lib/func12.c b/test cases/unit/67 static link/lib/func12.c
deleted file mode 100644
index 73db5c073..000000000
--- a/test cases/unit/67 static link/lib/func12.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int func10();
-int func11();
-
-int func12()
-{
-  return func10() + func11();
-}
diff --git a/test cases/unit/67 static link/lib/func14.c b/test cases/unit/67 static link/lib/func14.c
deleted file mode 100644
index 0277319fc..000000000
--- a/test cases/unit/67 static link/lib/func14.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int func14()
-{
-  return 1;
-}
diff --git a/test cases/unit/67 static link/lib/func15.c b/test cases/unit/67 static link/lib/func15.c
deleted file mode 100644
index 78303cc2f..000000000
--- a/test cases/unit/67 static link/lib/func15.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func14();
-
-int func15()
-{
-  return func14() + 1;
-}
diff --git a/test cases/unit/67 static link/lib/func16.c b/test cases/unit/67 static link/lib/func16.c
deleted file mode 100644
index 379b6829f..000000000
--- a/test cases/unit/67 static link/lib/func16.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func15();
-
-int func16()
-{
-  return func15() + 1;
-}
diff --git a/test cases/unit/67 static link/lib/func17.c b/test cases/unit/67 static link/lib/func17.c
deleted file mode 100644
index d1d8ec498..000000000
--- a/test cases/unit/67 static link/lib/func17.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int func17()
-{
-  return 1;
-}
diff --git a/test cases/unit/67 static link/lib/func18.c b/test cases/unit/67 static link/lib/func18.c
deleted file mode 100644
index c149085ba..000000000
--- a/test cases/unit/67 static link/lib/func18.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func17();
-
-int func18()
-{
-  return func17() + 1;
-}
diff --git a/test cases/unit/67 static link/lib/func19.c b/test cases/unit/67 static link/lib/func19.c
deleted file mode 100644
index 69120e4bf..000000000
--- a/test cases/unit/67 static link/lib/func19.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int func17();
-int func18();
-
-int func19()
-{
-  return func17() + func18();
-}
diff --git a/test cases/unit/67 static link/lib/func2.c b/test cases/unit/67 static link/lib/func2.c
deleted file mode 100644
index 6b8f53935..000000000
--- a/test cases/unit/67 static link/lib/func2.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func1();
-
-int func2()
-{
-  return func1() + 1;
-}
diff --git a/test cases/unit/67 static link/lib/func3.c b/test cases/unit/67 static link/lib/func3.c
deleted file mode 100644
index 04f9f8939..000000000
--- a/test cases/unit/67 static link/lib/func3.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int func3()
-{
-  return 1;
-}
diff --git a/test cases/unit/67 static link/lib/func4.c b/test cases/unit/67 static link/lib/func4.c
deleted file mode 100644
index c44c99099..000000000
--- a/test cases/unit/67 static link/lib/func4.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func3();
-
-int func4()
-{
-  return func3() + 1;
-}
diff --git a/test cases/unit/67 static link/lib/func5.c b/test cases/unit/67 static link/lib/func5.c
deleted file mode 100644
index 8e078641c..000000000
--- a/test cases/unit/67 static link/lib/func5.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int func5()
-{
-  return 1;
-}
diff --git a/test cases/unit/67 static link/lib/func6.c b/test cases/unit/67 static link/lib/func6.c
deleted file mode 100644
index 276fe7d48..000000000
--- a/test cases/unit/67 static link/lib/func6.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func5();
-
-int func6()
-{
-  return func5() + 1;
-}
diff --git a/test cases/unit/67 static link/lib/func7.c b/test cases/unit/67 static link/lib/func7.c
deleted file mode 100644
index 8c1a5368d..000000000
--- a/test cases/unit/67 static link/lib/func7.c
+++ /dev/null
@@ -1,4 +0,0 @@
-int func7()
-{
-  return 1;
-}
diff --git a/test cases/unit/67 static link/lib/func8.c b/test cases/unit/67 static link/lib/func8.c
deleted file mode 100644
index b7b6cd545..000000000
--- a/test cases/unit/67 static link/lib/func8.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func7();
-
-int func8()
-{
-  return func7() + 1;
-}
diff --git a/test cases/unit/67 static link/lib/func9.c b/test cases/unit/67 static link/lib/func9.c
deleted file mode 100644
index 852252d1a..000000000
--- a/test cases/unit/67 static link/lib/func9.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func8();
-
-int func9()
-{
-  return func8() + 1;
-}
diff --git a/test cases/unit/67 static link/lib/meson.build b/test cases/unit/67 static link/lib/meson.build
deleted file mode 100644
index 8f95fc454..000000000
--- a/test cases/unit/67 static link/lib/meson.build
+++ /dev/null
@@ -1,80 +0,0 @@
-project('test static link libs', 'c')
-
-pkg = import('pkgconfig')
-
-# libfunc2 should contain both func1() and func2() symbols
-libfunc1 = static_library('func1', 'func1.c',
-  install : false)
-libfunc2 = static_library('func2', 'func2.c',
-  link_whole : libfunc1,
-  install : true)
-
-# Same as above, but with link_with instead of link_whole,
-# libfunc4 should contain both func3() and func4() symbols
-libfunc3 = static_library('func3', 'func3.c',
-  install : false)
-libfunc4 = static_library('func4', 'func4.c',
-  link_with : libfunc3,
-  install : true)
-
-# Same as above, but also generate an pkg-config file. Use both_libraries() to
-# make sure a complete .pc file gets generated. libfunc5 should not be mentioned
-# into the .pc file because it's not installed.
-libfunc5 = static_library('func5', 'func5.c',
-  install : false)
-libfunc6 = both_libraries('func6', 'func6.c',
-  link_with : libfunc5,
-  install : true)
-pkg.generate(libfunc6)
-
-# libfunc9 should contain both func8() and func9() but not func7() because that
-# one gets installed. Also test that link_with and link_whole works the same way
-# because libfunc8 is uninstalled.
-libfunc7 = static_library('func7', 'func7.c',
-  install : true)
-libfunc8 = static_library('func8', 'func8.c',
-  link_with : libfunc7,
-  install : false)
-libfunc9_linkwith = static_library('func9_linkwith', 'func9.c',
-  link_with : libfunc8,
-  install : true)
-libfunc9_linkwhole = static_library('func9_linkwhole', 'func9.c',
-  link_whole : libfunc8,
-  install : true)
-
-# Pattern found in mesa:
-# - libfunc11 uses func10()
-# - libfunc12 uses both func10() and func11()
-# When a shared library link_whole on libfunc12, we ensure we don't include
-# func10.c.o twice which would fail to link.
-libfunc10 = static_library('func10', 'func10.c',
-  install : false)
-libfunc11 = static_library('func11', 'func11.c',
-  link_with : libfunc10,
-  install : false)
-libfunc12 = static_library('func12', 'func12.c',
-  link_with : [libfunc10, libfunc11],
-  install : false)
-libfunc13 = shared_library('func13', link_whole : libfunc12)
-
-# libfunc16 should contain func14(), func15() and func16()
-libfunc14 = static_library('func14', 'func14.c',
-  install : false)
-libfunc15 = static_library('func15', 'func15.c',
-  link_with : libfunc14,
-  install : false)
-libfunc16 = static_library('func16', 'func16.c',
-  link_with : libfunc15,
-  install : true)
-
-# Verify func17.c.o gets included only once into libfunc19, otherwise
-# func19-shared would failed with duplicated symbol.
-libfunc17 = static_library('func17', 'func17.c',
-  install : false)
-libfunc18 = static_library('func18', 'func18.c',
-  link_with : libfunc17,
-  install : false)
-libfunc19 = static_library('func19', 'func19.c',
-  link_whole : [libfunc17, libfunc18],
-  install : false)
-shared_library('func19-shared', link_whole : [libfunc19])
diff --git a/test cases/unit/67 static link/meson.build b/test cases/unit/67 static link/meson.build
deleted file mode 100644
index dac17f810..000000000
--- a/test cases/unit/67 static link/meson.build
+++ /dev/null
@@ -1,32 +0,0 @@
-project('test static link', 'c')
-
-cc = meson.get_compiler('c')
-
-# Verify that installed libfunc2.a is usable
-func2_dep = cc.find_library('func2')
-test('test1', executable('test1', 'test1.c', dependencies : func2_dep))
-
-# Verify that installed libfunc4.a is usable
-func4_dep = cc.find_library('func4')
-test('test2', executable('test2', 'test2.c', dependencies : func4_dep))
-
-# Verify that installed pkg-config file is usable for both shared and static link
-func6_static_dep = dependency('func6', static : true)
-test('test3-static', executable('test3-static', 'test3.c',
-    dependencies : func6_static_dep))
-func6_shared_dep = dependency('func6', static : false)
-test('test3-shared', executable('test3-shared', 'test3.c',
-    dependencies : func6_shared_dep))
-
-# Verify that installed libfunc9.a contains func8() and func8() but not func7()
-func7_dep = cc.find_library('func7')
-func9_linkwhole_dep = cc.find_library('func9_linkwhole')
-test('test4-linkwhole', executable('test4-linkwhole', 'test4.c',
-  dependencies : [func7_dep, func9_linkwhole_dep]))
-func9_linkwith_dep = cc.find_library('func9_linkwith')
-test('test4-linkwith', executable('test4-linkwith', 'test4.c',
-  dependencies : [func7_dep, func9_linkwith_dep]))
-
-# Verify that installed libfunc16.a is usable
-libfunc16_dep = cc.find_library('func16')
-test('test5', executable('test5', 'test5.c', dependencies: libfunc16_dep))
diff --git a/test cases/unit/67 static link/test1.c b/test cases/unit/67 static link/test1.c
deleted file mode 100644
index ffc9b9eb9..000000000
--- a/test cases/unit/67 static link/test1.c
+++ /dev/null
@@ -1,7 +0,0 @@
-int func1b();
-int func2();
-
-int main(int argc, char *argv[])
-{
-  return func2() + func1b() == 3 ? 0 : 1;
-}
diff --git a/test cases/unit/67 static link/test2.c b/test cases/unit/67 static link/test2.c
deleted file mode 100644
index 561422af0..000000000
--- a/test cases/unit/67 static link/test2.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func4();
-
-int main(int argc, char *argv[])
-{
-  return func4() == 2 ? 0 : 1;
-}
diff --git a/test cases/unit/67 static link/test3.c b/test cases/unit/67 static link/test3.c
deleted file mode 100644
index 1216064dc..000000000
--- a/test cases/unit/67 static link/test3.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func6();
-
-int main(int argc, char *argv[])
-{
-  return func6() == 2 ? 0 : 1;
-}
diff --git a/test cases/unit/67 static link/test4.c b/test cases/unit/67 static link/test4.c
deleted file mode 100644
index 7c281e026..000000000
--- a/test cases/unit/67 static link/test4.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func9();
-
-int main(int argc, char *argv[])
-{
-  return func9() == 3 ? 0 : 1;
-}
diff --git a/test cases/unit/67 static link/test5.c b/test cases/unit/67 static link/test5.c
deleted file mode 100644
index 6020f0e7c..000000000
--- a/test cases/unit/67 static link/test5.c
+++ /dev/null
@@ -1,6 +0,0 @@
-int func16();
-
-int main(int argc, char *argv[])
-{
-  return func16() == 3 ? 0 : 1;
-}