From 4d2a17041f0dd54001a7d32b36e75608330f41f5 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 30 Jul 2020 19:46:57 -0700 Subject: run dircondensor.py --- run_unittests.py | 14 +++++++------- test cases/cmake/19 cmake file/foolib.cmake.in | 1 - test cases/cmake/19 cmake file/meson.build | 14 -------------- test cases/cmake/19 cmake file/test.json | 5 ----- test cases/cmake/20 cmake file/foolib.cmake.in | 1 + test cases/cmake/20 cmake file/meson.build | 14 ++++++++++++++ test cases/cmake/20 cmake file/test.json | 5 +++++ test cases/failing/106 number in combo/meson.build | 1 - test cases/failing/106 number in combo/nativefile.ini | 2 -- test cases/failing/106 number in combo/test.json | 5 ----- test cases/failing/107 bool in combo/meson.build | 1 - test cases/failing/107 bool in combo/meson_options.txt | 5 ----- test cases/failing/107 bool in combo/nativefile.ini | 2 -- test cases/failing/107 bool in combo/test.json | 5 ----- test cases/failing/107 number in combo/meson.build | 1 + test cases/failing/107 number in combo/nativefile.ini | 2 ++ test cases/failing/107 number in combo/test.json | 5 +++++ test cases/failing/108 bool in combo/meson.build | 1 + test cases/failing/108 bool in combo/meson_options.txt | 5 +++++ test cases/failing/108 bool in combo/nativefile.ini | 2 ++ test cases/failing/108 bool in combo/test.json | 5 +++++ test cases/unit/75 user options for subproject/.gitignore | 1 - test cases/unit/75 user options for subproject/meson.build | 3 --- test cases/unit/76 pkgconfig prefixes/client/client.c | 8 -------- test cases/unit/76 pkgconfig prefixes/client/meson.build | 3 --- test cases/unit/76 pkgconfig prefixes/val1/meson.build | 5 ----- test cases/unit/76 pkgconfig prefixes/val1/val1.c | 3 --- test cases/unit/76 pkgconfig prefixes/val1/val1.h | 1 - test cases/unit/76 pkgconfig prefixes/val2/meson.build | 8 -------- test cases/unit/76 pkgconfig prefixes/val2/val2.c | 4 ---- test cases/unit/76 pkgconfig prefixes/val2/val2.h | 1 - test cases/unit/76 subdir libdir/meson.build | 2 -- .../unit/76 subdir libdir/subprojects/flub/meson.build | 1 - test cases/unit/77 global-rpath/meson.build | 3 --- test cases/unit/77 global-rpath/rpathified.cpp | 6 ------ test cases/unit/77 global-rpath/yonder/meson.build | 5 ----- test cases/unit/77 global-rpath/yonder/yonder.cpp | 3 --- test cases/unit/77 global-rpath/yonder/yonder.h | 1 - test cases/unit/77 pkgconfig prefixes/client/client.c | 8 ++++++++ test cases/unit/77 pkgconfig prefixes/client/meson.build | 3 +++ test cases/unit/77 pkgconfig prefixes/val1/meson.build | 5 +++++ test cases/unit/77 pkgconfig prefixes/val1/val1.c | 3 +++ test cases/unit/77 pkgconfig prefixes/val1/val1.h | 1 + test cases/unit/77 pkgconfig prefixes/val2/meson.build | 8 ++++++++ test cases/unit/77 pkgconfig prefixes/val2/val2.c | 4 ++++ test cases/unit/77 pkgconfig prefixes/val2/val2.h | 1 + test cases/unit/78 subdir libdir/meson.build | 2 ++ .../unit/78 subdir libdir/subprojects/flub/meson.build | 1 + test cases/unit/78 wrap-git/meson.build | 4 ---- .../subprojects/packagefiles/wrap_git_builddef/meson.build | 3 --- .../unit/78 wrap-git/subprojects/wrap_git_upstream/main.c | 4 ---- .../75 user options for subproject/.gitignore | 1 + .../75 user options for subproject/meson.build | 3 +++ test cases/unit/80 global-rpath/meson.build | 3 +++ test cases/unit/80 global-rpath/rpathified.cpp | 6 ++++++ test cases/unit/80 global-rpath/yonder/meson.build | 5 +++++ test cases/unit/80 global-rpath/yonder/yonder.cpp | 3 +++ test cases/unit/80 global-rpath/yonder/yonder.h | 1 + test cases/unit/81 wrap-git/meson.build | 4 ++++ .../subprojects/packagefiles/wrap_git_builddef/meson.build | 3 +++ .../unit/81 wrap-git/subprojects/wrap_git_upstream/main.c | 4 ++++ 61 files changed, 117 insertions(+), 117 deletions(-) delete mode 100644 test cases/cmake/19 cmake file/foolib.cmake.in delete mode 100644 test cases/cmake/19 cmake file/meson.build delete mode 100644 test cases/cmake/19 cmake file/test.json create mode 100644 test cases/cmake/20 cmake file/foolib.cmake.in create mode 100644 test cases/cmake/20 cmake file/meson.build create mode 100644 test cases/cmake/20 cmake file/test.json delete mode 100644 test cases/failing/106 number in combo/meson.build delete mode 100644 test cases/failing/106 number in combo/nativefile.ini delete mode 100644 test cases/failing/106 number in combo/test.json delete mode 100644 test cases/failing/107 bool in combo/meson.build delete mode 100644 test cases/failing/107 bool in combo/meson_options.txt delete mode 100644 test cases/failing/107 bool in combo/nativefile.ini delete mode 100644 test cases/failing/107 bool in combo/test.json create mode 100644 test cases/failing/107 number in combo/meson.build create mode 100644 test cases/failing/107 number in combo/nativefile.ini create mode 100644 test cases/failing/107 number in combo/test.json create mode 100644 test cases/failing/108 bool in combo/meson.build create mode 100644 test cases/failing/108 bool in combo/meson_options.txt create mode 100644 test cases/failing/108 bool in combo/nativefile.ini create mode 100644 test cases/failing/108 bool in combo/test.json delete mode 100644 test cases/unit/75 user options for subproject/.gitignore delete mode 100644 test cases/unit/75 user options for subproject/meson.build delete mode 100644 test cases/unit/76 pkgconfig prefixes/client/client.c delete mode 100644 test cases/unit/76 pkgconfig prefixes/client/meson.build delete mode 100644 test cases/unit/76 pkgconfig prefixes/val1/meson.build delete mode 100644 test cases/unit/76 pkgconfig prefixes/val1/val1.c delete mode 100644 test cases/unit/76 pkgconfig prefixes/val1/val1.h delete mode 100644 test cases/unit/76 pkgconfig prefixes/val2/meson.build delete mode 100644 test cases/unit/76 pkgconfig prefixes/val2/val2.c delete mode 100644 test cases/unit/76 pkgconfig prefixes/val2/val2.h delete mode 100644 test cases/unit/76 subdir libdir/meson.build delete mode 100644 test cases/unit/76 subdir libdir/subprojects/flub/meson.build delete mode 100644 test cases/unit/77 global-rpath/meson.build delete mode 100644 test cases/unit/77 global-rpath/rpathified.cpp delete mode 100644 test cases/unit/77 global-rpath/yonder/meson.build delete mode 100644 test cases/unit/77 global-rpath/yonder/yonder.cpp delete mode 100644 test cases/unit/77 global-rpath/yonder/yonder.h create mode 100644 test cases/unit/77 pkgconfig prefixes/client/client.c create mode 100644 test cases/unit/77 pkgconfig prefixes/client/meson.build create mode 100644 test cases/unit/77 pkgconfig prefixes/val1/meson.build create mode 100644 test cases/unit/77 pkgconfig prefixes/val1/val1.c create mode 100644 test cases/unit/77 pkgconfig prefixes/val1/val1.h create mode 100644 test cases/unit/77 pkgconfig prefixes/val2/meson.build create mode 100644 test cases/unit/77 pkgconfig prefixes/val2/val2.c create mode 100644 test cases/unit/77 pkgconfig prefixes/val2/val2.h create mode 100644 test cases/unit/78 subdir libdir/meson.build create mode 100644 test cases/unit/78 subdir libdir/subprojects/flub/meson.build delete mode 100644 test cases/unit/78 wrap-git/meson.build delete mode 100644 test cases/unit/78 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build delete mode 100644 test cases/unit/78 wrap-git/subprojects/wrap_git_upstream/main.c create mode 100644 test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore create mode 100644 test cases/unit/79 user options for subproject/75 user options for subproject/meson.build create mode 100644 test cases/unit/80 global-rpath/meson.build create mode 100644 test cases/unit/80 global-rpath/rpathified.cpp create mode 100644 test cases/unit/80 global-rpath/yonder/meson.build create mode 100644 test cases/unit/80 global-rpath/yonder/yonder.cpp create mode 100644 test cases/unit/80 global-rpath/yonder/yonder.h create mode 100644 test cases/unit/81 wrap-git/meson.build create mode 100644 test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build create mode 100644 test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c diff --git a/run_unittests.py b/run_unittests.py index 21eabde..6d7eba2 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -5014,7 +5014,7 @@ recommended as it is not supported on some platforms''') def test_wrap_git(self): with tempfile.TemporaryDirectory() as tmpdir: srcdir = os.path.join(tmpdir, 'src') - shutil.copytree(os.path.join(self.unit_test_dir, '78 wrap-git'), srcdir) + shutil.copytree(os.path.join(self.unit_test_dir, '81 wrap-git'), srcdir) upstream = os.path.join(srcdir, 'subprojects', 'wrap_git_upstream') upstream_uri = Path(upstream).as_uri() _git_init(upstream) @@ -6473,7 +6473,7 @@ class LinuxlikeTests(BasePlatformTests): if is_osx(): raise unittest.SkipTest('Global RPATHs via LDFLAGS not yet supported on MacOS (does anybody need it?)') - testdir = os.path.join(self.unit_test_dir, '77 global-rpath') + testdir = os.path.join(self.unit_test_dir, '80 global-rpath') oldinstalldir = self.installdir # Build and install an external library without DESTDIR. @@ -6846,7 +6846,7 @@ class LinuxlikeTests(BasePlatformTests): oldinstalldir = self.installdir # Build and install both external libraries without DESTDIR - val1dir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'val1') + val1dir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'val1') val1prefix = os.path.join(oldinstalldir, 'val1') self.prefix = val1prefix self.installdir = val1prefix @@ -6857,7 +6857,7 @@ class LinuxlikeTests(BasePlatformTests): env1 = {} env1['PKG_CONFIG_PATH'] = os.path.join(val1prefix, self.libdir, 'pkgconfig') - val2dir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'val2') + val2dir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'val2') val2prefix = os.path.join(oldinstalldir, 'val2') self.prefix = val2prefix self.installdir = val2prefix @@ -6869,7 +6869,7 @@ class LinuxlikeTests(BasePlatformTests): # Build, install, and run the client program env2 = {} env2['PKG_CONFIG_PATH'] = os.path.join(val2prefix, self.libdir, 'pkgconfig') - testdir = os.path.join(self.unit_test_dir, '76 pkgconfig prefixes', 'client') + testdir = os.path.join(self.unit_test_dir, '77 pkgconfig prefixes', 'client') testprefix = os.path.join(oldinstalldir, 'client') self.prefix = testprefix self.installdir = testprefix @@ -7180,7 +7180,7 @@ class LinuxCrossArmTests(BaseLinuxCrossTests): def test_cross_libdir_subproject(self): # Guard against a regression where calling "subproject" # would reset the value of libdir to its default value. - testdir = os.path.join(self.unit_test_dir, '76 subdir libdir') + testdir = os.path.join(self.unit_test_dir, '78 subdir libdir') self.init(testdir, extra_args=['--libdir=fuf']) for i in self.introspect('--buildoptions'): if i['name'] == 'libdir': @@ -8017,7 +8017,7 @@ class NativeFileTests(BasePlatformTests): self.init(testcase, extra_args=['--native-file', config, '-Dother_one=false']) def test_user_options_subproject(self): - testcase = os.path.join(self.unit_test_dir, '75 user options for subproject') + testcase = os.path.join(self.unit_test_dir, '79 user options for subproject') s = os.path.join(testcase, 'subprojects') if not os.path.exists(s): diff --git a/test cases/cmake/19 cmake file/foolib.cmake.in b/test cases/cmake/19 cmake file/foolib.cmake.in deleted file mode 100644 index 16e992b..0000000 --- a/test cases/cmake/19 cmake file/foolib.cmake.in +++ /dev/null @@ -1 +0,0 @@ -@foo@ diff --git a/test cases/cmake/19 cmake file/meson.build b/test cases/cmake/19 cmake file/meson.build deleted file mode 100644 index 758bbee..0000000 --- a/test cases/cmake/19 cmake file/meson.build +++ /dev/null @@ -1,14 +0,0 @@ -project( - 'cmake config file', -) - -cmake = import('cmake') - -cmake_conf = configuration_data() -cmake_conf.set_quoted('foo', 'bar') -cmake.configure_package_config_file( - name : 'foolib', - input : 'foolib.cmake.in', - install_dir : get_option('libdir') / 'cmake', - configuration : cmake_conf, -) diff --git a/test cases/cmake/19 cmake file/test.json b/test cases/cmake/19 cmake file/test.json deleted file mode 100644 index a8c4ba3..0000000 --- a/test cases/cmake/19 cmake file/test.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "installed": [ - {"file": "usr/lib/cmake/foolibConfig.cmake", "type": "file"} - ] -} diff --git a/test cases/cmake/20 cmake file/foolib.cmake.in b/test cases/cmake/20 cmake file/foolib.cmake.in new file mode 100644 index 0000000..16e992b --- /dev/null +++ b/test cases/cmake/20 cmake file/foolib.cmake.in @@ -0,0 +1 @@ +@foo@ diff --git a/test cases/cmake/20 cmake file/meson.build b/test cases/cmake/20 cmake file/meson.build new file mode 100644 index 0000000..758bbee --- /dev/null +++ b/test cases/cmake/20 cmake file/meson.build @@ -0,0 +1,14 @@ +project( + 'cmake config file', +) + +cmake = import('cmake') + +cmake_conf = configuration_data() +cmake_conf.set_quoted('foo', 'bar') +cmake.configure_package_config_file( + name : 'foolib', + input : 'foolib.cmake.in', + install_dir : get_option('libdir') / 'cmake', + configuration : cmake_conf, +) diff --git a/test cases/cmake/20 cmake file/test.json b/test cases/cmake/20 cmake file/test.json new file mode 100644 index 0000000..a8c4ba3 --- /dev/null +++ b/test cases/cmake/20 cmake file/test.json @@ -0,0 +1,5 @@ +{ + "installed": [ + {"file": "usr/lib/cmake/foolibConfig.cmake", "type": "file"} + ] +} diff --git a/test cases/failing/106 number in combo/meson.build b/test cases/failing/106 number in combo/meson.build deleted file mode 100644 index 1a647df..0000000 --- a/test cases/failing/106 number in combo/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('number in combo') diff --git a/test cases/failing/106 number in combo/nativefile.ini b/test cases/failing/106 number in combo/nativefile.ini deleted file mode 100644 index 55f10fc..0000000 --- a/test cases/failing/106 number in combo/nativefile.ini +++ /dev/null @@ -1,2 +0,0 @@ -[built-in options] -optimization = 1 diff --git a/test cases/failing/106 number in combo/test.json b/test cases/failing/106 number in combo/test.json deleted file mode 100644 index a32c358..0000000 --- a/test cases/failing/106 number in combo/test.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "stdout": [ - { "line": "test cases/failing/106 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." } - ] -} diff --git a/test cases/failing/107 bool in combo/meson.build b/test cases/failing/107 bool in combo/meson.build deleted file mode 100644 index c5efd67..0000000 --- a/test cases/failing/107 bool in combo/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('bool in combo') diff --git a/test cases/failing/107 bool in combo/meson_options.txt b/test cases/failing/107 bool in combo/meson_options.txt deleted file mode 100644 index 0c8f5de..0000000 --- a/test cases/failing/107 bool in combo/meson_options.txt +++ /dev/null @@ -1,5 +0,0 @@ -option( - 'opt', - type : 'combo', - choices : ['true', 'false'] -) diff --git a/test cases/failing/107 bool in combo/nativefile.ini b/test cases/failing/107 bool in combo/nativefile.ini deleted file mode 100644 index b423957..0000000 --- a/test cases/failing/107 bool in combo/nativefile.ini +++ /dev/null @@ -1,2 +0,0 @@ -[project options] -opt = true diff --git a/test cases/failing/107 bool in combo/test.json b/test cases/failing/107 bool in combo/test.json deleted file mode 100644 index 37218e8..0000000 --- a/test cases/failing/107 bool in combo/test.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "stdout": [ - { "line": "test cases/failing/107 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." } - ] -} diff --git a/test cases/failing/107 number in combo/meson.build b/test cases/failing/107 number in combo/meson.build new file mode 100644 index 0000000..1a647df --- /dev/null +++ b/test cases/failing/107 number in combo/meson.build @@ -0,0 +1 @@ +project('number in combo') diff --git a/test cases/failing/107 number in combo/nativefile.ini b/test cases/failing/107 number in combo/nativefile.ini new file mode 100644 index 0000000..55f10fc --- /dev/null +++ b/test cases/failing/107 number in combo/nativefile.ini @@ -0,0 +1,2 @@ +[built-in options] +optimization = 1 diff --git a/test cases/failing/107 number in combo/test.json b/test cases/failing/107 number in combo/test.json new file mode 100644 index 0000000..f5aeb4e --- /dev/null +++ b/test cases/failing/107 number in combo/test.json @@ -0,0 +1,5 @@ +{ + "stdout": [ + { "line": "test cases/failing/107 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." } + ] +} diff --git a/test cases/failing/108 bool in combo/meson.build b/test cases/failing/108 bool in combo/meson.build new file mode 100644 index 0000000..c5efd67 --- /dev/null +++ b/test cases/failing/108 bool in combo/meson.build @@ -0,0 +1 @@ +project('bool in combo') diff --git a/test cases/failing/108 bool in combo/meson_options.txt b/test cases/failing/108 bool in combo/meson_options.txt new file mode 100644 index 0000000..0c8f5de --- /dev/null +++ b/test cases/failing/108 bool in combo/meson_options.txt @@ -0,0 +1,5 @@ +option( + 'opt', + type : 'combo', + choices : ['true', 'false'] +) diff --git a/test cases/failing/108 bool in combo/nativefile.ini b/test cases/failing/108 bool in combo/nativefile.ini new file mode 100644 index 0000000..b423957 --- /dev/null +++ b/test cases/failing/108 bool in combo/nativefile.ini @@ -0,0 +1,2 @@ +[project options] +opt = true diff --git a/test cases/failing/108 bool in combo/test.json b/test cases/failing/108 bool in combo/test.json new file mode 100644 index 0000000..729ad3d --- /dev/null +++ b/test cases/failing/108 bool in combo/test.json @@ -0,0 +1,5 @@ +{ + "stdout": [ + { "line": "test cases/failing/108 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." } + ] +} diff --git a/test cases/unit/75 user options for subproject/.gitignore b/test cases/unit/75 user options for subproject/.gitignore deleted file mode 100644 index 4976afc..0000000 --- a/test cases/unit/75 user options for subproject/.gitignore +++ /dev/null @@ -1 +0,0 @@ -subprojects/* diff --git a/test cases/unit/75 user options for subproject/meson.build b/test cases/unit/75 user options for subproject/meson.build deleted file mode 100644 index 0bc395b..0000000 --- a/test cases/unit/75 user options for subproject/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('user option for subproject') - -p = subproject('sub') diff --git a/test cases/unit/76 pkgconfig prefixes/client/client.c b/test cases/unit/76 pkgconfig prefixes/client/client.c deleted file mode 100644 index be9bead..0000000 --- a/test cases/unit/76 pkgconfig prefixes/client/client.c +++ /dev/null @@ -1,8 +0,0 @@ -#include -#include - -int main(int argc, char **argv) -{ - printf("%d\n", val2()); - return 0; -} diff --git a/test cases/unit/76 pkgconfig prefixes/client/meson.build b/test cases/unit/76 pkgconfig prefixes/client/meson.build deleted file mode 100644 index 491937b..0000000 --- a/test cases/unit/76 pkgconfig prefixes/client/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('client', 'c') -val2_dep = dependency('val2') -executable('client', 'client.c', dependencies : [val2_dep], install: true) diff --git a/test cases/unit/76 pkgconfig prefixes/val1/meson.build b/test cases/unit/76 pkgconfig prefixes/val1/meson.build deleted file mode 100644 index cc63e31..0000000 --- a/test cases/unit/76 pkgconfig prefixes/val1/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('val1', 'c') -val1 = shared_library('val1', 'val1.c', install: true) -install_headers('val1.h') -pkgconfig = import('pkgconfig') -pkgconfig.generate(val1, libraries : ['-Wl,-rpath,${libdir}']) diff --git a/test cases/unit/76 pkgconfig prefixes/val1/val1.c b/test cases/unit/76 pkgconfig prefixes/val1/val1.c deleted file mode 100644 index 591e521..0000000 --- a/test cases/unit/76 pkgconfig prefixes/val1/val1.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "val1.h" - -int val1(void) { return 1; } diff --git a/test cases/unit/76 pkgconfig prefixes/val1/val1.h b/test cases/unit/76 pkgconfig prefixes/val1/val1.h deleted file mode 100644 index 6bd435e..0000000 --- a/test cases/unit/76 pkgconfig prefixes/val1/val1.h +++ /dev/null @@ -1 +0,0 @@ -int val1(void); diff --git a/test cases/unit/76 pkgconfig prefixes/val2/meson.build b/test cases/unit/76 pkgconfig prefixes/val2/meson.build deleted file mode 100644 index ce69481..0000000 --- a/test cases/unit/76 pkgconfig prefixes/val2/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('val2', 'c') -val1_dep = dependency('val1') -val2 = shared_library('val2', 'val2.c', - dependencies : [val1_dep], - install: true) -install_headers('val2.h') -pkgconfig = import('pkgconfig') -pkgconfig.generate(val2, libraries : ['-Wl,-rpath,${libdir}']) diff --git a/test cases/unit/76 pkgconfig prefixes/val2/val2.c b/test cases/unit/76 pkgconfig prefixes/val2/val2.c deleted file mode 100644 index d7d4857..0000000 --- a/test cases/unit/76 pkgconfig prefixes/val2/val2.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "val1.h" -#include "val2.h" - -int val2(void) { return val1() + 2; } diff --git a/test cases/unit/76 pkgconfig prefixes/val2/val2.h b/test cases/unit/76 pkgconfig prefixes/val2/val2.h deleted file mode 100644 index 995023d..0000000 --- a/test cases/unit/76 pkgconfig prefixes/val2/val2.h +++ /dev/null @@ -1 +0,0 @@ -int val2(void); diff --git a/test cases/unit/76 subdir libdir/meson.build b/test cases/unit/76 subdir libdir/meson.build deleted file mode 100644 index 5099c91..0000000 --- a/test cases/unit/76 subdir libdir/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -project('toplevel', 'c') -subproject('flub') diff --git a/test cases/unit/76 subdir libdir/subprojects/flub/meson.build b/test cases/unit/76 subdir libdir/subprojects/flub/meson.build deleted file mode 100644 index 7bfd2c5..0000000 --- a/test cases/unit/76 subdir libdir/subprojects/flub/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('subflub', 'c') diff --git a/test cases/unit/77 global-rpath/meson.build b/test cases/unit/77 global-rpath/meson.build deleted file mode 100644 index c67d9e0..0000000 --- a/test cases/unit/77 global-rpath/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('global-rpath', 'cpp') -yonder_dep = dependency('yonder') -executable('rpathified', 'rpathified.cpp', dependencies: [yonder_dep], install: true) diff --git a/test cases/unit/77 global-rpath/rpathified.cpp b/test cases/unit/77 global-rpath/rpathified.cpp deleted file mode 100644 index 3788906..0000000 --- a/test cases/unit/77 global-rpath/rpathified.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -int main(int argc, char **argv) -{ - return strcmp(yonder(), "AB54 6BR"); -} diff --git a/test cases/unit/77 global-rpath/yonder/meson.build b/test cases/unit/77 global-rpath/yonder/meson.build deleted file mode 100644 index e32f383..0000000 --- a/test cases/unit/77 global-rpath/yonder/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('yonder', 'cpp') -yonder = shared_library('yonder', 'yonder.cpp', install: true) -install_headers('yonder.h') -pkgconfig = import('pkgconfig') -pkgconfig.generate(yonder) diff --git a/test cases/unit/77 global-rpath/yonder/yonder.cpp b/test cases/unit/77 global-rpath/yonder/yonder.cpp deleted file mode 100644 index b182d34..0000000 --- a/test cases/unit/77 global-rpath/yonder/yonder.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "yonder.h" - -char *yonder(void) { return "AB54 6BR"; } diff --git a/test cases/unit/77 global-rpath/yonder/yonder.h b/test cases/unit/77 global-rpath/yonder/yonder.h deleted file mode 100644 index 9d9ad16..0000000 --- a/test cases/unit/77 global-rpath/yonder/yonder.h +++ /dev/null @@ -1 +0,0 @@ -char *yonder(void); diff --git a/test cases/unit/77 pkgconfig prefixes/client/client.c b/test cases/unit/77 pkgconfig prefixes/client/client.c new file mode 100644 index 0000000..be9bead --- /dev/null +++ b/test cases/unit/77 pkgconfig prefixes/client/client.c @@ -0,0 +1,8 @@ +#include +#include + +int main(int argc, char **argv) +{ + printf("%d\n", val2()); + return 0; +} diff --git a/test cases/unit/77 pkgconfig prefixes/client/meson.build b/test cases/unit/77 pkgconfig prefixes/client/meson.build new file mode 100644 index 0000000..491937b --- /dev/null +++ b/test cases/unit/77 pkgconfig prefixes/client/meson.build @@ -0,0 +1,3 @@ +project('client', 'c') +val2_dep = dependency('val2') +executable('client', 'client.c', dependencies : [val2_dep], install: true) diff --git a/test cases/unit/77 pkgconfig prefixes/val1/meson.build b/test cases/unit/77 pkgconfig prefixes/val1/meson.build new file mode 100644 index 0000000..cc63e31 --- /dev/null +++ b/test cases/unit/77 pkgconfig prefixes/val1/meson.build @@ -0,0 +1,5 @@ +project('val1', 'c') +val1 = shared_library('val1', 'val1.c', install: true) +install_headers('val1.h') +pkgconfig = import('pkgconfig') +pkgconfig.generate(val1, libraries : ['-Wl,-rpath,${libdir}']) diff --git a/test cases/unit/77 pkgconfig prefixes/val1/val1.c b/test cases/unit/77 pkgconfig prefixes/val1/val1.c new file mode 100644 index 0000000..591e521 --- /dev/null +++ b/test cases/unit/77 pkgconfig prefixes/val1/val1.c @@ -0,0 +1,3 @@ +#include "val1.h" + +int val1(void) { return 1; } diff --git a/test cases/unit/77 pkgconfig prefixes/val1/val1.h b/test cases/unit/77 pkgconfig prefixes/val1/val1.h new file mode 100644 index 0000000..6bd435e --- /dev/null +++ b/test cases/unit/77 pkgconfig prefixes/val1/val1.h @@ -0,0 +1 @@ +int val1(void); diff --git a/test cases/unit/77 pkgconfig prefixes/val2/meson.build b/test cases/unit/77 pkgconfig prefixes/val2/meson.build new file mode 100644 index 0000000..ce69481 --- /dev/null +++ b/test cases/unit/77 pkgconfig prefixes/val2/meson.build @@ -0,0 +1,8 @@ +project('val2', 'c') +val1_dep = dependency('val1') +val2 = shared_library('val2', 'val2.c', + dependencies : [val1_dep], + install: true) +install_headers('val2.h') +pkgconfig = import('pkgconfig') +pkgconfig.generate(val2, libraries : ['-Wl,-rpath,${libdir}']) diff --git a/test cases/unit/77 pkgconfig prefixes/val2/val2.c b/test cases/unit/77 pkgconfig prefixes/val2/val2.c new file mode 100644 index 0000000..d7d4857 --- /dev/null +++ b/test cases/unit/77 pkgconfig prefixes/val2/val2.c @@ -0,0 +1,4 @@ +#include "val1.h" +#include "val2.h" + +int val2(void) { return val1() + 2; } diff --git a/test cases/unit/77 pkgconfig prefixes/val2/val2.h b/test cases/unit/77 pkgconfig prefixes/val2/val2.h new file mode 100644 index 0000000..995023d --- /dev/null +++ b/test cases/unit/77 pkgconfig prefixes/val2/val2.h @@ -0,0 +1 @@ +int val2(void); diff --git a/test cases/unit/78 subdir libdir/meson.build b/test cases/unit/78 subdir libdir/meson.build new file mode 100644 index 0000000..5099c91 --- /dev/null +++ b/test cases/unit/78 subdir libdir/meson.build @@ -0,0 +1,2 @@ +project('toplevel', 'c') +subproject('flub') diff --git a/test cases/unit/78 subdir libdir/subprojects/flub/meson.build b/test cases/unit/78 subdir libdir/subprojects/flub/meson.build new file mode 100644 index 0000000..7bfd2c5 --- /dev/null +++ b/test cases/unit/78 subdir libdir/subprojects/flub/meson.build @@ -0,0 +1 @@ +project('subflub', 'c') diff --git a/test cases/unit/78 wrap-git/meson.build b/test cases/unit/78 wrap-git/meson.build deleted file mode 100644 index b0af30a..0000000 --- a/test cases/unit/78 wrap-git/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('test-wrap-git') - -exe = subproject('wrap_git').get_variable('exe') -test('test1', exe) diff --git a/test cases/unit/78 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build b/test cases/unit/78 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build deleted file mode 100644 index 2570f77..0000000 --- a/test cases/unit/78 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('foo', 'c') - -exe = executable('app', 'main.c') diff --git a/test cases/unit/78 wrap-git/subprojects/wrap_git_upstream/main.c b/test cases/unit/78 wrap-git/subprojects/wrap_git_upstream/main.c deleted file mode 100644 index 8488f4e..0000000 --- a/test cases/unit/78 wrap-git/subprojects/wrap_git_upstream/main.c +++ /dev/null @@ -1,4 +0,0 @@ -int main(void) -{ - return 0; -} diff --git a/test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore b/test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore new file mode 100644 index 0000000..4976afc --- /dev/null +++ b/test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore @@ -0,0 +1 @@ +subprojects/* diff --git a/test cases/unit/79 user options for subproject/75 user options for subproject/meson.build b/test cases/unit/79 user options for subproject/75 user options for subproject/meson.build new file mode 100644 index 0000000..0bc395b --- /dev/null +++ b/test cases/unit/79 user options for subproject/75 user options for subproject/meson.build @@ -0,0 +1,3 @@ +project('user option for subproject') + +p = subproject('sub') diff --git a/test cases/unit/80 global-rpath/meson.build b/test cases/unit/80 global-rpath/meson.build new file mode 100644 index 0000000..c67d9e0 --- /dev/null +++ b/test cases/unit/80 global-rpath/meson.build @@ -0,0 +1,3 @@ +project('global-rpath', 'cpp') +yonder_dep = dependency('yonder') +executable('rpathified', 'rpathified.cpp', dependencies: [yonder_dep], install: true) diff --git a/test cases/unit/80 global-rpath/rpathified.cpp b/test cases/unit/80 global-rpath/rpathified.cpp new file mode 100644 index 0000000..3788906 --- /dev/null +++ b/test cases/unit/80 global-rpath/rpathified.cpp @@ -0,0 +1,6 @@ +#include +#include +int main(int argc, char **argv) +{ + return strcmp(yonder(), "AB54 6BR"); +} diff --git a/test cases/unit/80 global-rpath/yonder/meson.build b/test cases/unit/80 global-rpath/yonder/meson.build new file mode 100644 index 0000000..e32f383 --- /dev/null +++ b/test cases/unit/80 global-rpath/yonder/meson.build @@ -0,0 +1,5 @@ +project('yonder', 'cpp') +yonder = shared_library('yonder', 'yonder.cpp', install: true) +install_headers('yonder.h') +pkgconfig = import('pkgconfig') +pkgconfig.generate(yonder) diff --git a/test cases/unit/80 global-rpath/yonder/yonder.cpp b/test cases/unit/80 global-rpath/yonder/yonder.cpp new file mode 100644 index 0000000..b182d34 --- /dev/null +++ b/test cases/unit/80 global-rpath/yonder/yonder.cpp @@ -0,0 +1,3 @@ +#include "yonder.h" + +char *yonder(void) { return "AB54 6BR"; } diff --git a/test cases/unit/80 global-rpath/yonder/yonder.h b/test cases/unit/80 global-rpath/yonder/yonder.h new file mode 100644 index 0000000..9d9ad16 --- /dev/null +++ b/test cases/unit/80 global-rpath/yonder/yonder.h @@ -0,0 +1 @@ +char *yonder(void); diff --git a/test cases/unit/81 wrap-git/meson.build b/test cases/unit/81 wrap-git/meson.build new file mode 100644 index 0000000..b0af30a --- /dev/null +++ b/test cases/unit/81 wrap-git/meson.build @@ -0,0 +1,4 @@ +project('test-wrap-git') + +exe = subproject('wrap_git').get_variable('exe') +test('test1', exe) diff --git a/test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build b/test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build new file mode 100644 index 0000000..2570f77 --- /dev/null +++ b/test cases/unit/81 wrap-git/subprojects/packagefiles/wrap_git_builddef/meson.build @@ -0,0 +1,3 @@ +project('foo', 'c') + +exe = executable('app', 'main.c') diff --git a/test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c b/test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c new file mode 100644 index 0000000..8488f4e --- /dev/null +++ b/test cases/unit/81 wrap-git/subprojects/wrap_git_upstream/main.c @@ -0,0 +1,4 @@ +int main(void) +{ + return 0; +} -- cgit v1.1