Condense test directory names for 1.9.

23 files changed, 0 insertions, 186 deletions

diff --git a/test cases/unit/98 install all targets/bar-custom.txt b/test cases/unit/98 install all targets/bar-custom.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/test cases/unit/98 install all targets/bar-custom.txt
+++ /dev/null
diff --git a/test cases/unit/98 install all targets/bar-devel.h b/test cases/unit/98 install all targets/bar-devel.h
deleted file mode 100644
index e69de29bb..000000000
--- a/test cases/unit/98 install all targets/bar-devel.h
+++ /dev/null
diff --git a/test cases/unit/98 install all targets/bar-notag.txt b/test cases/unit/98 install all targets/bar-notag.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/test cases/unit/98 install all targets/bar-notag.txt
+++ /dev/null
diff --git a/test cases/unit/98 install all targets/custom_files/data.txt b/test cases/unit/98 install all targets/custom_files/data.txt
deleted file mode 100644
index 557db03de..000000000
--- a/test cases/unit/98 install all targets/custom_files/data.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello World
diff --git a/test cases/unit/98 install all targets/excludes/excluded.txt b/test cases/unit/98 install all targets/excludes/excluded.txt
deleted file mode 100644
index 59b064403..000000000
--- a/test cases/unit/98 install all targets/excludes/excluded.txt
+++ /dev/null
@@ -1 +0,0 @@
-Excluded
diff --git a/test cases/unit/98 install all targets/excludes/excluded/placeholder.txt b/test cases/unit/98 install all targets/excludes/excluded/placeholder.txt
deleted file mode 100644
index 3b94f9157..000000000
--- a/test cases/unit/98 install all targets/excludes/excluded/placeholder.txt
+++ /dev/null
@@ -1 +0,0 @@
-Placeholder
diff --git a/test cases/unit/98 install all targets/excludes/installed.txt b/test cases/unit/98 install all targets/excludes/installed.txt
deleted file mode 100644
index 84376928c..000000000
--- a/test cases/unit/98 install all targets/excludes/installed.txt
+++ /dev/null
@@ -1 +0,0 @@
-Installed
diff --git a/test cases/unit/98 install all targets/foo.in b/test cases/unit/98 install all targets/foo.in
deleted file mode 100644
index e69de29bb..000000000
--- a/test cases/unit/98 install all targets/foo.in
+++ /dev/null
diff --git a/test cases/unit/98 install all targets/foo1-devel.h b/test cases/unit/98 install all targets/foo1-devel.h
deleted file mode 100644
index e69de29bb..000000000
--- a/test cases/unit/98 install all targets/foo1-devel.h
+++ /dev/null
diff --git a/test cases/unit/98 install all targets/lib.c b/test cases/unit/98 install all targets/lib.c
deleted file mode 100644
index 2ea9c7dd1..000000000
--- a/test cases/unit/98 install all targets/lib.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#if defined _WIN32 || defined __CYGWIN__
-#define DLL_PUBLIC __declspec(dllexport)
-#else
-#define DLL_PUBLIC
-#endif
-
-int DLL_PUBLIC foo(void) {
-  return 0;
-}
diff --git a/test cases/unit/98 install all targets/main.c b/test cases/unit/98 install all targets/main.c
deleted file mode 100644
index 0fb4389f7..000000000
--- a/test cases/unit/98 install all targets/main.c
+++ /dev/null
@@ -1,3 +0,0 @@
-int main(int argc, char *argv[]) {
-  return 0;
-}
diff --git a/test cases/unit/98 install all targets/meson.build b/test cases/unit/98 install all targets/meson.build
deleted file mode 100644
index c5f33a054..000000000
--- a/test cases/unit/98 install all targets/meson.build
+++ /dev/null
@@ -1,116 +0,0 @@
-project('install tag', 'c')
-
-subproject('subproject')
-
-subdir('subdir')
-
-# Those files should not be tagged
-configure_file(input: 'foo.in', output: 'foo-notag.h',
-  configuration: {'foo': 'bar'},
-  install_dir: get_option('datadir'),
-  install: true,
-)
-install_data('bar-notag.txt',
-  install_dir: get_option('datadir')
-)
-custom_target('ct1',
-  output: ['out1-notag.txt', 'out2-notag.txt'],
-  command: ['script.py', '@OUTPUT@'],
-  install_dir: get_option('datadir'),
-  install: true,
-)
-
-# Those files should be tagged as devel
-install_headers('foo1-devel.h')
-install_data('bar-devel.h',
-  install_dir: get_option('includedir'),
-)
-configure_file(input: 'foo.in', output: 'foo2-devel.h',
-  configuration: {'foo': 'bar'},
-  install_dir: get_option('includedir'),
-  install: true,
-)
-static_library('static', 'lib.c',
-  install: true,
-)
-custom_target('ct-header1',
-  output: ['ct-header1.h'],
-  command: ['script.py', '@OUTPUT@'],
-  install_dir: get_option('includedir'),
-  install: true,
-)
-custom_target('ct-header2',
-  output: ['ct-header2.h', 'ct-header3.h'],
-  command: ['script.py', '@OUTPUT@'],
-  install_dir: [false, get_option('includedir')],
-  install: true,
-)
-install_emptydir(get_option('includedir') / 'subdir-devel')
-install_subdir('custom_files',
-  install_dir: get_option('includedir'),
-)
-
-# Those files should have 'runtime' tag
-executable('app', 'main.c',
-  install: true,
-)
-executable('app-otherdir', 'main.c',
-  install: true,
-  install_dir: 'otherbin',
-)
-shared_library('shared', 'lib.c',
-  install: true,
-)
-both_libraries('both', 'lib.c',
-  install: true,
-)
-
-# Unversioned .so file should have 'devel' tag, others should have 'runtime' tag
-shared_library('versioned_shared', 'lib.c',
-  install: true,
-  version: '1.2.3',
-)
-
-# Those files should have custom tag
-install_data('bar-custom.txt',
-  install_dir: get_option('datadir'),
-  install_tag: 'custom')
-configure_file(input: 'foo.in', output: 'foo-custom.h',
-  configuration: {'foo': 'bar'},
-  install_dir: get_option('datadir'),
-  install_tag: 'custom',
-  install: true,
-)
-both_libraries('bothcustom', 'lib.c',
-  install_tag: 'custom',
-  install: true,
-)
-custom_target('ct2',
-  output: ['out1-custom.txt', 'out2-custom.txt'],
-  command: ['script.py', '@OUTPUT@'],
-  install_dir: get_option('datadir'),
-  install_tag: 'custom',
-  install: true,
-)
-install_subdir('custom_files',
-  install_dir: get_option('datadir'),
-  install_tag: 'custom',
-)
-install_subdir('excludes',
-  install_dir: get_option('datadir'),
-  install_tag: 'custom',
-  exclude_directories: 'excluded',
-  exclude_files: 'excluded.txt',
-)
-
-# First is custom, 2nd is devel, 3rd has no tag
-custom_target('ct3',
-  output: ['out3-custom.txt', 'out-devel.h', 'out3-notag.txt'],
-  command: ['script.py', '@OUTPUT@'],
-  install_dir: [get_option('datadir'), get_option('includedir'), get_option('datadir')],
-  install_tag: ['custom', 'devel', false],
-  install: true,
-)
-
-meson.add_install_script('script.py', install_tag: 'custom')
-meson.add_install_script('script.py')
diff --git a/test cases/unit/98 install all targets/script.py b/test cases/unit/98 install all targets/script.py
deleted file mode 100644
index c5f3be9ed..000000000
--- a/test cases/unit/98 install all targets/script.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-
-for f in sys.argv[1:]:
-  with open(f, 'w') as f:
-      pass
diff --git a/test cases/unit/98 install all targets/subdir/bar2-devel.h b/test cases/unit/98 install all targets/subdir/bar2-devel.h
deleted file mode 100644
index e69de29bb..000000000
--- a/test cases/unit/98 install all targets/subdir/bar2-devel.h
+++ /dev/null
diff --git a/test cases/unit/98 install all targets/subdir/foo2.in b/test cases/unit/98 install all targets/subdir/foo2.in
deleted file mode 100644
index e69de29bb..000000000
--- a/test cases/unit/98 install all targets/subdir/foo2.in
+++ /dev/null
diff --git a/test cases/unit/98 install all targets/subdir/foo3-devel.h b/test cases/unit/98 install all targets/subdir/foo3-devel.h
deleted file mode 100644
index e69de29bb..000000000
--- a/test cases/unit/98 install all targets/subdir/foo3-devel.h
+++ /dev/null
diff --git a/test cases/unit/98 install all targets/subdir/lib.c b/test cases/unit/98 install all targets/subdir/lib.c
deleted file mode 100644
index 2ea9c7dd1..000000000
--- a/test cases/unit/98 install all targets/subdir/lib.c
+++ /dev/null
@@ -1,9 +0,0 @@
-#if defined _WIN32 || defined __CYGWIN__
-#define DLL_PUBLIC __declspec(dllexport)
-#else
-#define DLL_PUBLIC
-#endif
-
-int DLL_PUBLIC foo(void) {
-  return 0;
-}
diff --git a/test cases/unit/98 install all targets/subdir/main.c b/test cases/unit/98 install all targets/subdir/main.c
deleted file mode 100644
index 0fb4389f7..000000000
--- a/test cases/unit/98 install all targets/subdir/main.c
+++ /dev/null
@@ -1,3 +0,0 @@
-int main(int argc, char *argv[]) {
-  return 0;
-}
diff --git a/test cases/unit/98 install all targets/subdir/meson.build b/test cases/unit/98 install all targets/subdir/meson.build
deleted file mode 100644
index 53c796abe..000000000
--- a/test cases/unit/98 install all targets/subdir/meson.build
+++ /dev/null
@@ -1,21 +0,0 @@
-configure_file(input: 'foo2.in', output: 'foo2.h',
-  configuration: {'foo': 'bar'},
-  install_dir: get_option('datadir'),
-  install: true,
-)
-custom_target('ct4',
-  output: ['out1.txt', 'out2.txt'],
-  command: ['script.py', '@OUTPUT@'],
-  install_dir: get_option('datadir'),
-  install: true,
-)
-install_headers('foo3-devel.h')
-install_data('bar2-devel.h',
-  install_dir: get_option('includedir'),
-)
-executable('app2', 'main.c',
-  install: true,
-)
-both_libraries('both2', 'lib.c',
-  install: true,
-)
diff --git a/test cases/unit/98 install all targets/subdir/script.py b/test cases/unit/98 install all targets/subdir/script.py
deleted file mode 100644
index c5f3be9ed..000000000
--- a/test cases/unit/98 install all targets/subdir/script.py
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-
-for f in sys.argv[1:]:
-  with open(f, 'w') as f:
-      pass
diff --git a/test cases/unit/98 install all targets/subprojects/subproject/aaa.txt b/test cases/unit/98 install all targets/subprojects/subproject/aaa.txt
deleted file mode 100644
index 43d5a8ed6..000000000
--- a/test cases/unit/98 install all targets/subprojects/subproject/aaa.txt
+++ /dev/null
@@ -1 +0,0 @@
-AAA
diff --git a/test cases/unit/98 install all targets/subprojects/subproject/bbb.txt b/test cases/unit/98 install all targets/subprojects/subproject/bbb.txt
deleted file mode 100644
index ba629238c..000000000
--- a/test cases/unit/98 install all targets/subprojects/subproject/bbb.txt
+++ /dev/null
@@ -1 +0,0 @@
-BBB
diff --git a/test cases/unit/98 install all targets/subprojects/subproject/meson.build b/test cases/unit/98 install all targets/subprojects/subproject/meson.build
deleted file mode 100644
index ff474ace1..000000000
--- a/test cases/unit/98 install all targets/subprojects/subproject/meson.build
+++ /dev/null
@@ -1,5 +0,0 @@
-project('subproject')
-
-install_data('aaa.txt')
-
-install_data('bbb.txt', install_tag: 'data')