From d2c39e83ba20595a3b662bc16f8d249d324dbb67 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 7 Feb 2021 19:02:08 +0200 Subject: Condense test directory names in preparation for rc1. --- run_unittests.py | 6 +++--- .../common/235 get_file_contents/.gitattributes | 1 + test cases/common/235 get_file_contents/VERSION | 1 + .../common/235 get_file_contents/meson.build | 21 +++++++++++++++++++++ .../common/235 get_file_contents/other/meson.build | 3 +++ .../common/235 get_file_contents/utf-16-text | Bin 0 -> 150 bytes .../common/241 get_file_contents/.gitattributes | 1 - test cases/common/241 get_file_contents/VERSION | 1 - .../common/241 get_file_contents/meson.build | 21 --------------------- .../common/241 get_file_contents/other/meson.build | 3 --- .../common/241 get_file_contents/utf-16-text | Bin 150 -> 0 bytes test cases/unit/87 prelinking/file1.c | 14 -------------- test cases/unit/87 prelinking/file2.c | 9 --------- test cases/unit/87 prelinking/file3.c | 9 --------- test cases/unit/87 prelinking/file4.c | 9 --------- test cases/unit/87 prelinking/main.c | 10 ---------- test cases/unit/87 prelinking/meson.build | 8 -------- test cases/unit/87 prelinking/private_header.h | 11 ----------- test cases/unit/87 prelinking/public_header.h | 3 --- test cases/unit/88 prelinking/file1.c | 14 ++++++++++++++ test cases/unit/88 prelinking/file2.c | 9 +++++++++ test cases/unit/88 prelinking/file3.c | 9 +++++++++ test cases/unit/88 prelinking/file4.c | 9 +++++++++ test cases/unit/88 prelinking/main.c | 10 ++++++++++ test cases/unit/88 prelinking/meson.build | 8 ++++++++ test cases/unit/88 prelinking/private_header.h | 11 +++++++++++ test cases/unit/88 prelinking/public_header.h | 3 +++ test cases/unit/88 run native test/main.c | 17 ----------------- test cases/unit/88 run native test/meson.build | 6 ------ .../unit/89 pkgconfig build rpath order/dummy.pc | 7 ------- .../89 pkgconfig build rpath order/meson.build | 20 -------------------- .../unit/89 pkgconfig build rpath order/prog.c | 5 ----- .../unit/89 pkgconfig build rpath order/prog.cc | 8 -------- .../89 pkgconfig build rpath order/sub/meson.build | 1 - .../89 pkgconfig build rpath order/sub/stuff.c | 3 --- test cases/unit/89 run native test/main.c | 17 +++++++++++++++++ test cases/unit/89 run native test/meson.build | 6 ++++++ .../unit/90 pkgconfig build rpath order/dummy.pc | 7 +++++++ .../90 pkgconfig build rpath order/meson.build | 20 ++++++++++++++++++++ .../unit/90 pkgconfig build rpath order/prog.c | 5 +++++ .../unit/90 pkgconfig build rpath order/prog.cc | 8 ++++++++ .../90 pkgconfig build rpath order/sub/meson.build | 1 + .../90 pkgconfig build rpath order/sub/stuff.c | 3 +++ 43 files changed, 169 insertions(+), 169 deletions(-) create mode 100644 test cases/common/235 get_file_contents/.gitattributes create mode 100644 test cases/common/235 get_file_contents/VERSION create mode 100644 test cases/common/235 get_file_contents/meson.build create mode 100644 test cases/common/235 get_file_contents/other/meson.build create mode 100644 test cases/common/235 get_file_contents/utf-16-text delete mode 100644 test cases/common/241 get_file_contents/.gitattributes delete mode 100644 test cases/common/241 get_file_contents/VERSION delete mode 100644 test cases/common/241 get_file_contents/meson.build delete mode 100644 test cases/common/241 get_file_contents/other/meson.build delete mode 100644 test cases/common/241 get_file_contents/utf-16-text delete mode 100644 test cases/unit/87 prelinking/file1.c delete mode 100644 test cases/unit/87 prelinking/file2.c delete mode 100644 test cases/unit/87 prelinking/file3.c delete mode 100644 test cases/unit/87 prelinking/file4.c delete mode 100644 test cases/unit/87 prelinking/main.c delete mode 100644 test cases/unit/87 prelinking/meson.build delete mode 100644 test cases/unit/87 prelinking/private_header.h delete mode 100644 test cases/unit/87 prelinking/public_header.h create mode 100644 test cases/unit/88 prelinking/file1.c create mode 100644 test cases/unit/88 prelinking/file2.c create mode 100644 test cases/unit/88 prelinking/file3.c create mode 100644 test cases/unit/88 prelinking/file4.c create mode 100644 test cases/unit/88 prelinking/main.c create mode 100644 test cases/unit/88 prelinking/meson.build create mode 100644 test cases/unit/88 prelinking/private_header.h create mode 100644 test cases/unit/88 prelinking/public_header.h delete mode 100644 test cases/unit/88 run native test/main.c delete mode 100644 test cases/unit/88 run native test/meson.build delete mode 100644 test cases/unit/89 pkgconfig build rpath order/dummy.pc delete mode 100644 test cases/unit/89 pkgconfig build rpath order/meson.build delete mode 100644 test cases/unit/89 pkgconfig build rpath order/prog.c delete mode 100644 test cases/unit/89 pkgconfig build rpath order/prog.cc delete mode 100644 test cases/unit/89 pkgconfig build rpath order/sub/meson.build delete mode 100644 test cases/unit/89 pkgconfig build rpath order/sub/stuff.c create mode 100644 test cases/unit/89 run native test/main.c create mode 100644 test cases/unit/89 run native test/meson.build create mode 100644 test cases/unit/90 pkgconfig build rpath order/dummy.pc create mode 100644 test cases/unit/90 pkgconfig build rpath order/meson.build create mode 100644 test cases/unit/90 pkgconfig build rpath order/prog.c create mode 100644 test cases/unit/90 pkgconfig build rpath order/prog.cc create mode 100644 test cases/unit/90 pkgconfig build rpath order/sub/meson.build create mode 100644 test cases/unit/90 pkgconfig build rpath order/sub/stuff.c diff --git a/run_unittests.py b/run_unittests.py index e53f0c7..839f82b 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -7017,7 +7017,7 @@ class LinuxlikeTests(BasePlatformTests): ''' if is_cygwin(): raise unittest.SkipTest('Windows PE/COFF binaries do not use RPATH') - testdir = os.path.join(self.unit_test_dir, '89 pkgconfig build rpath order') + testdir = os.path.join(self.unit_test_dir, '90 pkgconfig build rpath order') self.init(testdir, override_envvars={'PKG_CONFIG_PATH': testdir}) self.build() build_rpath = get_rpath(os.path.join(self.builddir, 'prog')) @@ -7733,7 +7733,7 @@ class LinuxlikeTests(BasePlatformTests): gccver = subprocess.check_output(['cc', '--version']) if b'7.5.0' in gccver: raise unittest.SkipTest('GCC on Bionic is too old to be supported.') - testdir = os.path.join(self.unit_test_dir, '87 prelinking') + testdir = os.path.join(self.unit_test_dir, '88 prelinking') self.init(testdir) self.build() outlib = os.path.join(self.builddir, 'libprelinked.a') @@ -7839,7 +7839,7 @@ class LinuxCrossArmTests(BaseLinuxCrossTests): https://github.com/mesonbuild/meson/issues/7997 check run native test in crossbuild without exe wrapper ''' - testdir = os.path.join(self.unit_test_dir, '88 run native test') + testdir = os.path.join(self.unit_test_dir, '89 run native test') stamp_file = os.path.join(self.builddir, 'native_test_has_run.stamp') self.init(testdir) self.build() diff --git a/test cases/common/235 get_file_contents/.gitattributes b/test cases/common/235 get_file_contents/.gitattributes new file mode 100644 index 0000000..abec47d --- /dev/null +++ b/test cases/common/235 get_file_contents/.gitattributes @@ -0,0 +1 @@ +utf-16-text binary diff --git a/test cases/common/235 get_file_contents/VERSION b/test cases/common/235 get_file_contents/VERSION new file mode 100644 index 0000000..26aaba0 --- /dev/null +++ b/test cases/common/235 get_file_contents/VERSION @@ -0,0 +1 @@ +1.2.0 diff --git a/test cases/common/235 get_file_contents/meson.build b/test cases/common/235 get_file_contents/meson.build new file mode 100644 index 0000000..a8c68d6 --- /dev/null +++ b/test cases/common/235 get_file_contents/meson.build @@ -0,0 +1,21 @@ +project( + 'meson-fs-read-file', + [], + version: files('VERSION') +) +fs = import('fs') + +assert(fs.read('VERSION').strip() == meson.project_version(), 'file misread') + +expected = ( + '∮ E⋅da = Q, n → ∞, ∑ f(i) = ∏ g(i), ∀x∈ℝ: ⌈x⌉ = −⌊−x⌋, α ∧ ¬β = ¬(¬α ∨ β)' +) +assert( + fs.read('utf-16-text', encoding: 'utf-16').strip() == expected, + 'file was not decoded correctly' +) + +# Make sure we handle `files()` objects properly, too +version_file = files('VERSION') + +subdir('other') diff --git a/test cases/common/235 get_file_contents/other/meson.build b/test cases/common/235 get_file_contents/other/meson.build new file mode 100644 index 0000000..9a7e4be --- /dev/null +++ b/test cases/common/235 get_file_contents/other/meson.build @@ -0,0 +1,3 @@ +fs = import('fs') +assert(fs.read(version_file).strip() == '1.2.0') +assert(fs.read('../VERSION').strip() == '1.2.0') diff --git a/test cases/common/235 get_file_contents/utf-16-text b/test cases/common/235 get_file_contents/utf-16-text new file mode 100644 index 0000000..ed1fefe Binary files /dev/null and b/test cases/common/235 get_file_contents/utf-16-text differ diff --git a/test cases/common/241 get_file_contents/.gitattributes b/test cases/common/241 get_file_contents/.gitattributes deleted file mode 100644 index abec47d..0000000 --- a/test cases/common/241 get_file_contents/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -utf-16-text binary diff --git a/test cases/common/241 get_file_contents/VERSION b/test cases/common/241 get_file_contents/VERSION deleted file mode 100644 index 26aaba0..0000000 --- a/test cases/common/241 get_file_contents/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.2.0 diff --git a/test cases/common/241 get_file_contents/meson.build b/test cases/common/241 get_file_contents/meson.build deleted file mode 100644 index a8c68d6..0000000 --- a/test cases/common/241 get_file_contents/meson.build +++ /dev/null @@ -1,21 +0,0 @@ -project( - 'meson-fs-read-file', - [], - version: files('VERSION') -) -fs = import('fs') - -assert(fs.read('VERSION').strip() == meson.project_version(), 'file misread') - -expected = ( - '∮ E⋅da = Q, n → ∞, ∑ f(i) = ∏ g(i), ∀x∈ℝ: ⌈x⌉ = −⌊−x⌋, α ∧ ¬β = ¬(¬α ∨ β)' -) -assert( - fs.read('utf-16-text', encoding: 'utf-16').strip() == expected, - 'file was not decoded correctly' -) - -# Make sure we handle `files()` objects properly, too -version_file = files('VERSION') - -subdir('other') diff --git a/test cases/common/241 get_file_contents/other/meson.build b/test cases/common/241 get_file_contents/other/meson.build deleted file mode 100644 index 9a7e4be..0000000 --- a/test cases/common/241 get_file_contents/other/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -fs = import('fs') -assert(fs.read(version_file).strip() == '1.2.0') -assert(fs.read('../VERSION').strip() == '1.2.0') diff --git a/test cases/common/241 get_file_contents/utf-16-text b/test cases/common/241 get_file_contents/utf-16-text deleted file mode 100644 index ed1fefe..0000000 Binary files a/test cases/common/241 get_file_contents/utf-16-text and /dev/null differ diff --git a/test cases/unit/87 prelinking/file1.c b/test cases/unit/87 prelinking/file1.c deleted file mode 100644 index 9f0e265..0000000 --- a/test cases/unit/87 prelinking/file1.c +++ /dev/null @@ -1,14 +0,0 @@ -#include -#include - -int public_func() { - return round1_a(); -} - -int round1_a() { - return round1_b(); -} - -int round2_a() { - return round2_b(); -} diff --git a/test cases/unit/87 prelinking/file2.c b/test cases/unit/87 prelinking/file2.c deleted file mode 100644 index ce3b115..0000000 --- a/test cases/unit/87 prelinking/file2.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -int round1_b() { - return round1_c(); -} - -int round2_b() { - return round2_c(); -} diff --git a/test cases/unit/87 prelinking/file3.c b/test cases/unit/87 prelinking/file3.c deleted file mode 100644 index 85052be..0000000 --- a/test cases/unit/87 prelinking/file3.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -int round1_c() { - return round1_d(); -} - -int round2_c() { - return round2_d(); -} diff --git a/test cases/unit/87 prelinking/file4.c b/test cases/unit/87 prelinking/file4.c deleted file mode 100644 index 622364e..0000000 --- a/test cases/unit/87 prelinking/file4.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -int round1_d() { - return round2_a(); -} - -int round2_d() { - return 42; -} diff --git a/test cases/unit/87 prelinking/main.c b/test cases/unit/87 prelinking/main.c deleted file mode 100644 index 09a2e5c..0000000 --- a/test cases/unit/87 prelinking/main.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - -int main(int argc, char **argv) { - if(public_func() != 42) { - printf("Something failed.\n"); - return 1; - } - return 0; -} diff --git a/test cases/unit/87 prelinking/meson.build b/test cases/unit/87 prelinking/meson.build deleted file mode 100644 index 3dbf88e..0000000 --- a/test cases/unit/87 prelinking/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -project('prelinking', 'c') - -liba = static_library('prelinked', 'file1.c', 'file2.c', 'file3.c', 'file4.c', - prelink: true) -exe = executable('testprog', 'main.c', - link_with: liba) -test('prelinked', exe) - \ No newline at end of file diff --git a/test cases/unit/87 prelinking/private_header.h b/test cases/unit/87 prelinking/private_header.h deleted file mode 100644 index f24b621..0000000 --- a/test cases/unit/87 prelinking/private_header.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -int round1_a(); -int round1_b(); -int round1_c(); -int round1_d(); - -int round2_a(); -int round2_b(); -int round2_c(); -int round2_d(); diff --git a/test cases/unit/87 prelinking/public_header.h b/test cases/unit/87 prelinking/public_header.h deleted file mode 100644 index 0cd6786..0000000 --- a/test cases/unit/87 prelinking/public_header.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -int public_func(); diff --git a/test cases/unit/88 prelinking/file1.c b/test cases/unit/88 prelinking/file1.c new file mode 100644 index 0000000..9f0e265 --- /dev/null +++ b/test cases/unit/88 prelinking/file1.c @@ -0,0 +1,14 @@ +#include +#include + +int public_func() { + return round1_a(); +} + +int round1_a() { + return round1_b(); +} + +int round2_a() { + return round2_b(); +} diff --git a/test cases/unit/88 prelinking/file2.c b/test cases/unit/88 prelinking/file2.c new file mode 100644 index 0000000..ce3b115 --- /dev/null +++ b/test cases/unit/88 prelinking/file2.c @@ -0,0 +1,9 @@ +#include + +int round1_b() { + return round1_c(); +} + +int round2_b() { + return round2_c(); +} diff --git a/test cases/unit/88 prelinking/file3.c b/test cases/unit/88 prelinking/file3.c new file mode 100644 index 0000000..85052be --- /dev/null +++ b/test cases/unit/88 prelinking/file3.c @@ -0,0 +1,9 @@ +#include + +int round1_c() { + return round1_d(); +} + +int round2_c() { + return round2_d(); +} diff --git a/test cases/unit/88 prelinking/file4.c b/test cases/unit/88 prelinking/file4.c new file mode 100644 index 0000000..622364e --- /dev/null +++ b/test cases/unit/88 prelinking/file4.c @@ -0,0 +1,9 @@ +#include + +int round1_d() { + return round2_a(); +} + +int round2_d() { + return 42; +} diff --git a/test cases/unit/88 prelinking/main.c b/test cases/unit/88 prelinking/main.c new file mode 100644 index 0000000..09a2e5c --- /dev/null +++ b/test cases/unit/88 prelinking/main.c @@ -0,0 +1,10 @@ +#include +#include + +int main(int argc, char **argv) { + if(public_func() != 42) { + printf("Something failed.\n"); + return 1; + } + return 0; +} diff --git a/test cases/unit/88 prelinking/meson.build b/test cases/unit/88 prelinking/meson.build new file mode 100644 index 0000000..3dbf88e --- /dev/null +++ b/test cases/unit/88 prelinking/meson.build @@ -0,0 +1,8 @@ +project('prelinking', 'c') + +liba = static_library('prelinked', 'file1.c', 'file2.c', 'file3.c', 'file4.c', + prelink: true) +exe = executable('testprog', 'main.c', + link_with: liba) +test('prelinked', exe) + \ No newline at end of file diff --git a/test cases/unit/88 prelinking/private_header.h b/test cases/unit/88 prelinking/private_header.h new file mode 100644 index 0000000..f24b621 --- /dev/null +++ b/test cases/unit/88 prelinking/private_header.h @@ -0,0 +1,11 @@ +#pragma once + +int round1_a(); +int round1_b(); +int round1_c(); +int round1_d(); + +int round2_a(); +int round2_b(); +int round2_c(); +int round2_d(); diff --git a/test cases/unit/88 prelinking/public_header.h b/test cases/unit/88 prelinking/public_header.h new file mode 100644 index 0000000..0cd6786 --- /dev/null +++ b/test cases/unit/88 prelinking/public_header.h @@ -0,0 +1,3 @@ +#pragma once + +int public_func(); diff --git a/test cases/unit/88 run native test/main.c b/test cases/unit/88 run native test/main.c deleted file mode 100644 index 3213780..0000000 --- a/test cases/unit/88 run native test/main.c +++ /dev/null @@ -1,17 +0,0 @@ -#include - -int main (int argc, char * argv[]) -{ - const char *out = "SUCCESS!"; - - if (argc != 2) { - printf ("%s\n", out); - } else { - int ret; - FILE *f = fopen (argv[1], "w"); - ret = fwrite (out, sizeof (out), 1, f); - if (ret != 1) - return -1; - } - return 0; -} diff --git a/test cases/unit/88 run native test/meson.build b/test cases/unit/88 run native test/meson.build deleted file mode 100644 index 3bf419c..0000000 --- a/test cases/unit/88 run native test/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -project('run native test', ['c']) - -executable('terget_exe', 'main.c') - -native_exe = executable('native_exe', 'main.c', native: true) -test('native_exe', native_exe, args: ['native_test_has_run.stamp']) diff --git a/test cases/unit/89 pkgconfig build rpath order/dummy.pc b/test cases/unit/89 pkgconfig build rpath order/dummy.pc deleted file mode 100644 index 9e3048b..0000000 --- a/test cases/unit/89 pkgconfig build rpath order/dummy.pc +++ /dev/null @@ -1,7 +0,0 @@ -prefix=/foo -libdir=${prefix}/dummy - -Name: dummy -Description: Nonexisting lib but add an rpath -Version: 1.0.0 -Libs: -Wl,-rpath,${libdir} diff --git a/test cases/unit/89 pkgconfig build rpath order/meson.build b/test cases/unit/89 pkgconfig build rpath order/meson.build deleted file mode 100644 index 76ed8de..0000000 --- a/test cases/unit/89 pkgconfig build rpath order/meson.build +++ /dev/null @@ -1,20 +0,0 @@ -project('build rpath', 'c', 'cpp') - -subdir('sub') -pkgconf_dep = dependency('dummy') - -executable('prog', 'prog.c', - dependencies : pkgconf_dep, - link_with : l, - build_rpath : '/foo/bar', - install_rpath : '/baz', - install : true, - ) - -executable('progcxx', 'prog.cc', - dependencies : pkgconf_dep, - link_with : l, - build_rpath : '/foo/bar', - install_rpath : 'baz', - install : true, - ) diff --git a/test cases/unit/89 pkgconfig build rpath order/prog.c b/test cases/unit/89 pkgconfig build rpath order/prog.c deleted file mode 100644 index 45b2fa3..0000000 --- a/test cases/unit/89 pkgconfig build rpath order/prog.c +++ /dev/null @@ -1,5 +0,0 @@ -int get_stuff(); - -int main(int argc, char **argv) { - return get_stuff(); -} diff --git a/test cases/unit/89 pkgconfig build rpath order/prog.cc b/test cases/unit/89 pkgconfig build rpath order/prog.cc deleted file mode 100644 index c7c2123..0000000 --- a/test cases/unit/89 pkgconfig build rpath order/prog.cc +++ /dev/null @@ -1,8 +0,0 @@ -#include -#include - -int main(int argc, char **argv) { - std::string* s = new std::string("Hello"); - delete s; - return 0; -} diff --git a/test cases/unit/89 pkgconfig build rpath order/sub/meson.build b/test cases/unit/89 pkgconfig build rpath order/sub/meson.build deleted file mode 100644 index 6879ec6..0000000 --- a/test cases/unit/89 pkgconfig build rpath order/sub/meson.build +++ /dev/null @@ -1 +0,0 @@ -l = shared_library('stuff', 'stuff.c') diff --git a/test cases/unit/89 pkgconfig build rpath order/sub/stuff.c b/test cases/unit/89 pkgconfig build rpath order/sub/stuff.c deleted file mode 100644 index d56d8b0..0000000 --- a/test cases/unit/89 pkgconfig build rpath order/sub/stuff.c +++ /dev/null @@ -1,3 +0,0 @@ -int get_stuff() { - return 0; -} diff --git a/test cases/unit/89 run native test/main.c b/test cases/unit/89 run native test/main.c new file mode 100644 index 0000000..3213780 --- /dev/null +++ b/test cases/unit/89 run native test/main.c @@ -0,0 +1,17 @@ +#include + +int main (int argc, char * argv[]) +{ + const char *out = "SUCCESS!"; + + if (argc != 2) { + printf ("%s\n", out); + } else { + int ret; + FILE *f = fopen (argv[1], "w"); + ret = fwrite (out, sizeof (out), 1, f); + if (ret != 1) + return -1; + } + return 0; +} diff --git a/test cases/unit/89 run native test/meson.build b/test cases/unit/89 run native test/meson.build new file mode 100644 index 0000000..3bf419c --- /dev/null +++ b/test cases/unit/89 run native test/meson.build @@ -0,0 +1,6 @@ +project('run native test', ['c']) + +executable('terget_exe', 'main.c') + +native_exe = executable('native_exe', 'main.c', native: true) +test('native_exe', native_exe, args: ['native_test_has_run.stamp']) diff --git a/test cases/unit/90 pkgconfig build rpath order/dummy.pc b/test cases/unit/90 pkgconfig build rpath order/dummy.pc new file mode 100644 index 0000000..9e3048b --- /dev/null +++ b/test cases/unit/90 pkgconfig build rpath order/dummy.pc @@ -0,0 +1,7 @@ +prefix=/foo +libdir=${prefix}/dummy + +Name: dummy +Description: Nonexisting lib but add an rpath +Version: 1.0.0 +Libs: -Wl,-rpath,${libdir} diff --git a/test cases/unit/90 pkgconfig build rpath order/meson.build b/test cases/unit/90 pkgconfig build rpath order/meson.build new file mode 100644 index 0000000..76ed8de --- /dev/null +++ b/test cases/unit/90 pkgconfig build rpath order/meson.build @@ -0,0 +1,20 @@ +project('build rpath', 'c', 'cpp') + +subdir('sub') +pkgconf_dep = dependency('dummy') + +executable('prog', 'prog.c', + dependencies : pkgconf_dep, + link_with : l, + build_rpath : '/foo/bar', + install_rpath : '/baz', + install : true, + ) + +executable('progcxx', 'prog.cc', + dependencies : pkgconf_dep, + link_with : l, + build_rpath : '/foo/bar', + install_rpath : 'baz', + install : true, + ) diff --git a/test cases/unit/90 pkgconfig build rpath order/prog.c b/test cases/unit/90 pkgconfig build rpath order/prog.c new file mode 100644 index 0000000..45b2fa3 --- /dev/null +++ b/test cases/unit/90 pkgconfig build rpath order/prog.c @@ -0,0 +1,5 @@ +int get_stuff(); + +int main(int argc, char **argv) { + return get_stuff(); +} diff --git a/test cases/unit/90 pkgconfig build rpath order/prog.cc b/test cases/unit/90 pkgconfig build rpath order/prog.cc new file mode 100644 index 0000000..c7c2123 --- /dev/null +++ b/test cases/unit/90 pkgconfig build rpath order/prog.cc @@ -0,0 +1,8 @@ +#include +#include + +int main(int argc, char **argv) { + std::string* s = new std::string("Hello"); + delete s; + return 0; +} diff --git a/test cases/unit/90 pkgconfig build rpath order/sub/meson.build b/test cases/unit/90 pkgconfig build rpath order/sub/meson.build new file mode 100644 index 0000000..6879ec6 --- /dev/null +++ b/test cases/unit/90 pkgconfig build rpath order/sub/meson.build @@ -0,0 +1 @@ +l = shared_library('stuff', 'stuff.c') diff --git a/test cases/unit/90 pkgconfig build rpath order/sub/stuff.c b/test cases/unit/90 pkgconfig build rpath order/sub/stuff.c new file mode 100644 index 0000000..d56d8b0 --- /dev/null +++ b/test cases/unit/90 pkgconfig build rpath order/sub/stuff.c @@ -0,0 +1,3 @@ +int get_stuff() { + return 0; +} -- cgit v1.1