From 458dcf8aac74903380c2adceb2b16a87f231b42b Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 24 Oct 2022 01:00:57 +0300 Subject: Condense test directory numbers. --- .../meson.build | 18 -------------- .../subprojects/subfiles/foo.c | 1 - .../subprojects/subfiles/meson.build | 29 ---------------------- .../subprojects/subfiles/subdir/foo.c | 1 - .../subprojects/subfiles/subdir2/foo.c | 1 - .../252 subproject dependency variables/test.json | 8 ------ test cases/common/253 long output/dumper.c | 17 ------------- test cases/common/253 long output/meson.build | 5 ---- test cases/common/253 module warnings/meson.build | 9 ------- test cases/common/253 module warnings/test.json | 16 ------------ .../meson.build | 18 ++++++++++++++ .../subprojects/subfiles/foo.c | 1 + .../subprojects/subfiles/meson.build | 29 ++++++++++++++++++++++ .../subprojects/subfiles/subdir/foo.c | 1 + .../subprojects/subfiles/subdir2/foo.c | 1 + .../253 subproject dependency variables/test.json | 8 ++++++ .../common/253 subproject extracted objects/foo.c | 11 -------- .../253 subproject extracted objects/meson.build | 5 ---- .../subprojects/myobjects/cpplib.cpp | 6 ----- .../subprojects/myobjects/cpplib.h | 12 --------- .../subprojects/myobjects/meson.build | 3 --- .../253 subproject extracted objects/test.json | 5 ---- test cases/common/254 generated header dep/foo.c | 1 - .../common/254 generated header dep/meson.build | 22 ---------------- test cases/common/254 long output/dumper.c | 17 +++++++++++++ test cases/common/254 long output/meson.build | 5 ++++ .../common/254 subsubproject inplace/meson.build | 3 --- .../subprojects/sub/meson.build | 3 --- .../sub/subprojects/subsub-1.0/meson.build | 1 - .../subprojects/sub/subprojects/subsub.wrap | 2 -- test cases/common/255 module warnings/meson.build | 9 +++++++ test cases/common/255 module warnings/test.json | 16 ++++++++++++ test cases/common/255 preprocess/bar.c | 3 --- test cases/common/255 preprocess/foo.c | 1 - test cases/common/255 preprocess/foo.h | 2 -- test cases/common/255 preprocess/meson.build | 15 ----------- test cases/common/255 preprocess/src/file.map.in | 3 --- test cases/common/255 preprocess/src/meson.build | 3 --- .../common/256 subproject extracted objects/foo.c | 11 ++++++++ .../256 subproject extracted objects/meson.build | 5 ++++ .../subprojects/myobjects/cpplib.cpp | 6 +++++ .../subprojects/myobjects/cpplib.h | 12 +++++++++ .../subprojects/myobjects/meson.build | 3 +++ .../256 subproject extracted objects/test.json | 5 ++++ test cases/common/257 generated header dep/foo.c | 1 + .../common/257 generated header dep/meson.build | 22 ++++++++++++++++ .../common/258 subsubproject inplace/meson.build | 3 +++ .../subprojects/sub/meson.build | 3 +++ .../sub/subprojects/subsub-1.0/meson.build | 1 + .../subprojects/sub/subprojects/subsub.wrap | 2 ++ test cases/common/259 preprocess/bar.c | 3 +++ test cases/common/259 preprocess/foo.c | 1 + test cases/common/259 preprocess/foo.h | 2 ++ test cases/common/259 preprocess/meson.build | 15 +++++++++++ test cases/common/259 preprocess/src/file.map.in | 3 +++ test cases/common/259 preprocess/src/meson.build | 3 +++ 56 files changed, 206 insertions(+), 206 deletions(-) delete mode 100644 test cases/common/252 subproject dependency variables/meson.build delete mode 100644 test cases/common/252 subproject dependency variables/subprojects/subfiles/foo.c delete mode 100644 test cases/common/252 subproject dependency variables/subprojects/subfiles/meson.build delete mode 100644 test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir/foo.c delete mode 100644 test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir2/foo.c delete mode 100644 test cases/common/252 subproject dependency variables/test.json delete mode 100644 test cases/common/253 long output/dumper.c delete mode 100644 test cases/common/253 long output/meson.build delete mode 100644 test cases/common/253 module warnings/meson.build delete mode 100644 test cases/common/253 module warnings/test.json create mode 100644 test cases/common/253 subproject dependency variables/meson.build create mode 100644 test cases/common/253 subproject dependency variables/subprojects/subfiles/foo.c create mode 100644 test cases/common/253 subproject dependency variables/subprojects/subfiles/meson.build create mode 100644 test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir/foo.c create mode 100644 test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir2/foo.c create mode 100644 test cases/common/253 subproject dependency variables/test.json delete mode 100644 test cases/common/253 subproject extracted objects/foo.c delete mode 100644 test cases/common/253 subproject extracted objects/meson.build delete mode 100644 test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.cpp delete mode 100644 test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.h delete mode 100644 test cases/common/253 subproject extracted objects/subprojects/myobjects/meson.build delete mode 100644 test cases/common/253 subproject extracted objects/test.json delete mode 100644 test cases/common/254 generated header dep/foo.c delete mode 100644 test cases/common/254 generated header dep/meson.build create mode 100644 test cases/common/254 long output/dumper.c create mode 100644 test cases/common/254 long output/meson.build delete mode 100644 test cases/common/254 subsubproject inplace/meson.build delete mode 100644 test cases/common/254 subsubproject inplace/subprojects/sub/meson.build delete mode 100644 test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build delete mode 100644 test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap create mode 100644 test cases/common/255 module warnings/meson.build create mode 100644 test cases/common/255 module warnings/test.json delete mode 100644 test cases/common/255 preprocess/bar.c delete mode 100644 test cases/common/255 preprocess/foo.c delete mode 100644 test cases/common/255 preprocess/foo.h delete mode 100644 test cases/common/255 preprocess/meson.build delete mode 100644 test cases/common/255 preprocess/src/file.map.in delete mode 100644 test cases/common/255 preprocess/src/meson.build create mode 100644 test cases/common/256 subproject extracted objects/foo.c create mode 100644 test cases/common/256 subproject extracted objects/meson.build create mode 100644 test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.cpp create mode 100644 test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.h create mode 100644 test cases/common/256 subproject extracted objects/subprojects/myobjects/meson.build create mode 100644 test cases/common/256 subproject extracted objects/test.json create mode 100644 test cases/common/257 generated header dep/foo.c create mode 100644 test cases/common/257 generated header dep/meson.build create mode 100644 test cases/common/258 subsubproject inplace/meson.build create mode 100644 test cases/common/258 subsubproject inplace/subprojects/sub/meson.build create mode 100644 test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build create mode 100644 test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap create mode 100644 test cases/common/259 preprocess/bar.c create mode 100644 test cases/common/259 preprocess/foo.c create mode 100644 test cases/common/259 preprocess/foo.h create mode 100644 test cases/common/259 preprocess/meson.build create mode 100644 test cases/common/259 preprocess/src/file.map.in create mode 100644 test cases/common/259 preprocess/src/meson.build (limited to 'test cases/common') diff --git a/test cases/common/252 subproject dependency variables/meson.build b/test cases/common/252 subproject dependency variables/meson.build deleted file mode 100644 index 403b6f11c..000000000 --- a/test cases/common/252 subproject dependency variables/meson.build +++ /dev/null @@ -1,18 +0,0 @@ -project('subproject dependency variables', 'c') - -subfiles_dep = subproject('subfiles').get_variable('files_dep') - -executable( - 'foo', - join_paths(subfiles_dep.get_variable('pkgdatadir'), 'foo.c') -) - -executable( - 'foo2', - subfiles_dep.get_variable('pkgdatadir2') / 'foo.c' -) - -executable( - 'foor32', - subfiles_dep.get_variable('pkgdatadir3') / 'foo.c' -) diff --git a/test cases/common/252 subproject dependency variables/subprojects/subfiles/foo.c b/test cases/common/252 subproject dependency variables/subprojects/subfiles/foo.c deleted file mode 100644 index 78f2de106..000000000 --- a/test cases/common/252 subproject dependency variables/subprojects/subfiles/foo.c +++ /dev/null @@ -1 +0,0 @@ -int main(void) { return 0; } diff --git a/test cases/common/252 subproject dependency variables/subprojects/subfiles/meson.build b/test cases/common/252 subproject dependency variables/subprojects/subfiles/meson.build deleted file mode 100644 index f5ad0f2d9..000000000 --- a/test cases/common/252 subproject dependency variables/subprojects/subfiles/meson.build +++ /dev/null @@ -1,29 +0,0 @@ -project('dependency variable resource') - -files_dep = declare_dependency( - variables: [ - 'pkgdatadir=@0@/subdir'.format(meson.current_source_dir()), - 'pkgdatadir2=@0@/subdir2'.format(meson.current_source_dir()), - 'pkgdatadir3=@0@'.format(meson.current_source_dir()), - ] -) - -install_data('subdir/foo.c', install_dir: get_option('datadir') / 'subdir') -install_subdir('subdir2', install_dir: get_option('datadir')) -install_data('foo.c', install_dir: get_option('datadir')) - -import('pkgconfig').generate( - name: 'depvar_resource', - description: 'Get a resource file from pkgconfig or a subproject', - version: '0.1', - variables: [ - 'pkgdatadir=${datadir}/subdir', - 'pkgdatadir2=${datadir}/subdir2', - ], - uninstalled_variables: [ - 'pkgdatadir=@0@/subdir'.format(meson.current_source_dir()), - 'pkgdatadir2=@0@/subdir2'.format(meson.current_source_dir()), - 'pkgdatadir3=@0@'.format(meson.current_source_dir()), - ], - dataonly: true, -) diff --git a/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir/foo.c b/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir/foo.c deleted file mode 100644 index 78f2de106..000000000 --- a/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir/foo.c +++ /dev/null @@ -1 +0,0 @@ -int main(void) { return 0; } diff --git a/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir2/foo.c b/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir2/foo.c deleted file mode 100644 index 78f2de106..000000000 --- a/test cases/common/252 subproject dependency variables/subprojects/subfiles/subdir2/foo.c +++ /dev/null @@ -1 +0,0 @@ -int main(void) { return 0; } diff --git a/test cases/common/252 subproject dependency variables/test.json b/test cases/common/252 subproject dependency variables/test.json deleted file mode 100644 index c345bbea5..000000000 --- a/test cases/common/252 subproject dependency variables/test.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "installed": [ - { "type": "file", "file": "usr/share/pkgconfig/depvar_resource.pc" }, - { "type": "file", "file": "usr/share/foo.c" }, - { "type": "file", "file": "usr/share/subdir/foo.c" }, - { "type": "file", "file": "usr/share/subdir2/foo.c" } - ] -} diff --git a/test cases/common/253 long output/dumper.c b/test cases/common/253 long output/dumper.c deleted file mode 100644 index d479e08ad..000000000 --- a/test cases/common/253 long output/dumper.c +++ /dev/null @@ -1,17 +0,0 @@ -#include - -int main(void) -{ - for (int i = 0 ; i < 100000 ; i++) - fprintf(stderr, "# Iteration %d to stderr\n", i + 1); - - printf("ok 1 - dumper to stderr\n"); - - for (int i = 0 ; i < 100000 ; i++) - fprintf(stdout, "# Iteration %d to stdout\n", i + 1); - - printf("ok 2 - dumper to stdout\n1..2\n"); - - return 0; -} - diff --git a/test cases/common/253 long output/meson.build b/test cases/common/253 long output/meson.build deleted file mode 100644 index 6d8d62b22..000000000 --- a/test cases/common/253 long output/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('long-stderr', 'c') - -dumper = executable('dumper', 'dumper.c') -test('dump-test', dumper) -test('dump-test-TAP', dumper, protocol : 'tap') diff --git a/test cases/common/253 module warnings/meson.build b/test cases/common/253 module warnings/meson.build deleted file mode 100644 index 56e205526..000000000 --- a/test cases/common/253 module warnings/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('module warnings', meson_version : '>= 0.56') - -import('python3') # deprecated module -import('java') # new module -import('unstable-keyval') # module that has been stabilized, import with unstable- -import('unstable_simd') # A module with the deprecated `unstable_foo` instead of `unstable-foo` - -ice = import('icestorm', required : false) -assert(not ice.found(), 'unstable-icestorm module should not be importable as `simd`') diff --git a/test cases/common/253 module warnings/test.json b/test cases/common/253 module warnings/test.json deleted file mode 100644 index be3160129..000000000 --- a/test cases/common/253 module warnings/test.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "stdout": [ - { - "line": "test cases/common/253 module warnings/meson.build:3: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.48.0': module python3." - }, - { - "line": "test cases/common/253 module warnings/meson.build:4: WARNING: Project targets '>= 0.56' but uses feature introduced in '0.60.0': module java." - }, - { - "line": "test cases/common/253 module warnings/meson.build:5: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.56.0': module keyval has been stabilized. drop \"unstable-\" prefix from the module name" - }, - { - "line": "test cases/common/253 module warnings/meson.build:6: DEPRECATION: Importing unstable modules as \"unstable_simd\" instead of \"unstable-simd\"" - } - ] -} diff --git a/test cases/common/253 subproject dependency variables/meson.build b/test cases/common/253 subproject dependency variables/meson.build new file mode 100644 index 000000000..403b6f11c --- /dev/null +++ b/test cases/common/253 subproject dependency variables/meson.build @@ -0,0 +1,18 @@ +project('subproject dependency variables', 'c') + +subfiles_dep = subproject('subfiles').get_variable('files_dep') + +executable( + 'foo', + join_paths(subfiles_dep.get_variable('pkgdatadir'), 'foo.c') +) + +executable( + 'foo2', + subfiles_dep.get_variable('pkgdatadir2') / 'foo.c' +) + +executable( + 'foor32', + subfiles_dep.get_variable('pkgdatadir3') / 'foo.c' +) diff --git a/test cases/common/253 subproject dependency variables/subprojects/subfiles/foo.c b/test cases/common/253 subproject dependency variables/subprojects/subfiles/foo.c new file mode 100644 index 000000000..78f2de106 --- /dev/null +++ b/test cases/common/253 subproject dependency variables/subprojects/subfiles/foo.c @@ -0,0 +1 @@ +int main(void) { return 0; } diff --git a/test cases/common/253 subproject dependency variables/subprojects/subfiles/meson.build b/test cases/common/253 subproject dependency variables/subprojects/subfiles/meson.build new file mode 100644 index 000000000..f5ad0f2d9 --- /dev/null +++ b/test cases/common/253 subproject dependency variables/subprojects/subfiles/meson.build @@ -0,0 +1,29 @@ +project('dependency variable resource') + +files_dep = declare_dependency( + variables: [ + 'pkgdatadir=@0@/subdir'.format(meson.current_source_dir()), + 'pkgdatadir2=@0@/subdir2'.format(meson.current_source_dir()), + 'pkgdatadir3=@0@'.format(meson.current_source_dir()), + ] +) + +install_data('subdir/foo.c', install_dir: get_option('datadir') / 'subdir') +install_subdir('subdir2', install_dir: get_option('datadir')) +install_data('foo.c', install_dir: get_option('datadir')) + +import('pkgconfig').generate( + name: 'depvar_resource', + description: 'Get a resource file from pkgconfig or a subproject', + version: '0.1', + variables: [ + 'pkgdatadir=${datadir}/subdir', + 'pkgdatadir2=${datadir}/subdir2', + ], + uninstalled_variables: [ + 'pkgdatadir=@0@/subdir'.format(meson.current_source_dir()), + 'pkgdatadir2=@0@/subdir2'.format(meson.current_source_dir()), + 'pkgdatadir3=@0@'.format(meson.current_source_dir()), + ], + dataonly: true, +) diff --git a/test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir/foo.c b/test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir/foo.c new file mode 100644 index 000000000..78f2de106 --- /dev/null +++ b/test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir/foo.c @@ -0,0 +1 @@ +int main(void) { return 0; } diff --git a/test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir2/foo.c b/test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir2/foo.c new file mode 100644 index 000000000..78f2de106 --- /dev/null +++ b/test cases/common/253 subproject dependency variables/subprojects/subfiles/subdir2/foo.c @@ -0,0 +1 @@ +int main(void) { return 0; } diff --git a/test cases/common/253 subproject dependency variables/test.json b/test cases/common/253 subproject dependency variables/test.json new file mode 100644 index 000000000..c345bbea5 --- /dev/null +++ b/test cases/common/253 subproject dependency variables/test.json @@ -0,0 +1,8 @@ +{ + "installed": [ + { "type": "file", "file": "usr/share/pkgconfig/depvar_resource.pc" }, + { "type": "file", "file": "usr/share/foo.c" }, + { "type": "file", "file": "usr/share/subdir/foo.c" }, + { "type": "file", "file": "usr/share/subdir2/foo.c" } + ] +} diff --git a/test cases/common/253 subproject extracted objects/foo.c b/test cases/common/253 subproject extracted objects/foo.c deleted file mode 100644 index f6c7aebe0..000000000 --- a/test cases/common/253 subproject extracted objects/foo.c +++ /dev/null @@ -1,11 +0,0 @@ -#if defined _WIN32 || defined __CYGWIN__ - #define DLL_IMPORT __declspec(dllimport) -#else - #define DLL_IMPORT -#endif - -int DLL_IMPORT cppfunc(void); - -int otherfunc(void) { - return cppfunc() != 42; -} diff --git a/test cases/common/253 subproject extracted objects/meson.build b/test cases/common/253 subproject extracted objects/meson.build deleted file mode 100644 index bad450fab..000000000 --- a/test cases/common/253 subproject extracted objects/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('link to extracted objects', 'c') - -sublib = subproject('myobjects').get_variable('sublib') - -mainlib = static_library('foo', 'foo.c', install: true, link_with: sublib) diff --git a/test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.cpp b/test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.cpp deleted file mode 100644 index 12ef756c7..000000000 --- a/test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#define BUILDING_DLL -#include "cpplib.h" - -extern "C" int DLL_PUBLIC cppfunc(void) { - return 42; -} diff --git a/test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.h b/test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.h deleted file mode 100644 index a1c38b3ba..000000000 --- a/test cases/common/253 subproject extracted objects/subprojects/myobjects/cpplib.h +++ /dev/null @@ -1,12 +0,0 @@ -/* See http://gcc.gnu.org/wiki/Visibility#How_to_use_the_new_C.2B-.2B-_visibility_support */ -#if defined(_WIN32) || defined(__CYGWIN__) - #ifdef BUILDING_DLL - #define DLL_PUBLIC __declspec(dllexport) - #else - #define DLL_PUBLIC __declspec(dllimport) - #endif -#else - #define DLL_PUBLIC __attribute__ ((visibility ("default"))) -#endif - -extern "C" int DLL_PUBLIC cppfunc(void); diff --git a/test cases/common/253 subproject extracted objects/subprojects/myobjects/meson.build b/test cases/common/253 subproject extracted objects/subprojects/myobjects/meson.build deleted file mode 100644 index 1c2729bc1..000000000 --- a/test cases/common/253 subproject extracted objects/subprojects/myobjects/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('myobjects', 'cpp') - -sublib = static_library('sublib', 'cpplib.cpp') diff --git a/test cases/common/253 subproject extracted objects/test.json b/test cases/common/253 subproject extracted objects/test.json deleted file mode 100644 index baa5dfb8b..000000000 --- a/test cases/common/253 subproject extracted objects/test.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "installed": [ - { "type": "file", "file": "usr/lib/libfoo.a" } - ] -} diff --git a/test cases/common/254 generated header dep/foo.c b/test cases/common/254 generated header dep/foo.c deleted file mode 100644 index f4de601ff..000000000 --- a/test cases/common/254 generated header dep/foo.c +++ /dev/null @@ -1 +0,0 @@ -#include "foo.h" diff --git a/test cases/common/254 generated header dep/meson.build b/test cases/common/254 generated header dep/meson.build deleted file mode 100644 index 195d082ac..000000000 --- a/test cases/common/254 generated header dep/meson.build +++ /dev/null @@ -1,22 +0,0 @@ -project('generated header dep', 'c') - -# Regression test case for a very specific case: -# - Uses both_libraries(), or library() with default_library=both. -# - A header file is generated by a custom_target() and passed as source. -# - A C file that uses that header is passed as a declare_dependency() source. -# Under those specific conditions, the static library used to miss an order -# dependency on the header file. This happened in GLib: -# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2917. - -python = import('python').find_installation() -header = custom_target( - output: 'foo.h', - capture: true, - command: [python, '-c', 'print("#define FOO")'], -) - -sources_dep = declare_dependency(sources: files('foo.c')) - -both_libraries('foo', header, - dependencies: sources_dep, -) diff --git a/test cases/common/254 long output/dumper.c b/test cases/common/254 long output/dumper.c new file mode 100644 index 000000000..d479e08ad --- /dev/null +++ b/test cases/common/254 long output/dumper.c @@ -0,0 +1,17 @@ +#include + +int main(void) +{ + for (int i = 0 ; i < 100000 ; i++) + fprintf(stderr, "# Iteration %d to stderr\n", i + 1); + + printf("ok 1 - dumper to stderr\n"); + + for (int i = 0 ; i < 100000 ; i++) + fprintf(stdout, "# Iteration %d to stdout\n", i + 1); + + printf("ok 2 - dumper to stdout\n1..2\n"); + + return 0; +} + diff --git a/test cases/common/254 long output/meson.build b/test cases/common/254 long output/meson.build new file mode 100644 index 000000000..6d8d62b22 --- /dev/null +++ b/test cases/common/254 long output/meson.build @@ -0,0 +1,5 @@ +project('long-stderr', 'c') + +dumper = executable('dumper', 'dumper.c') +test('dump-test', dumper) +test('dump-test-TAP', dumper, protocol : 'tap') diff --git a/test cases/common/254 subsubproject inplace/meson.build b/test cases/common/254 subsubproject inplace/meson.build deleted file mode 100644 index 26a421b32..000000000 --- a/test cases/common/254 subsubproject inplace/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('main') - -subproject('sub') diff --git a/test cases/common/254 subsubproject inplace/subprojects/sub/meson.build b/test cases/common/254 subsubproject inplace/subprojects/sub/meson.build deleted file mode 100644 index 5e33d2193..000000000 --- a/test cases/common/254 subsubproject inplace/subprojects/sub/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -project('sub') - -subproject('subsub') diff --git a/test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build b/test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build deleted file mode 100644 index 7807a1bae..000000000 --- a/test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build +++ /dev/null @@ -1 +0,0 @@ -project('subsub') diff --git a/test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap b/test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap deleted file mode 100644 index bf398525a..000000000 --- a/test cases/common/254 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap +++ /dev/null @@ -1,2 +0,0 @@ -[wrap-file] -directory = subsub-1.0 diff --git a/test cases/common/255 module warnings/meson.build b/test cases/common/255 module warnings/meson.build new file mode 100644 index 000000000..56e205526 --- /dev/null +++ b/test cases/common/255 module warnings/meson.build @@ -0,0 +1,9 @@ +project('module warnings', meson_version : '>= 0.56') + +import('python3') # deprecated module +import('java') # new module +import('unstable-keyval') # module that has been stabilized, import with unstable- +import('unstable_simd') # A module with the deprecated `unstable_foo` instead of `unstable-foo` + +ice = import('icestorm', required : false) +assert(not ice.found(), 'unstable-icestorm module should not be importable as `simd`') diff --git a/test cases/common/255 module warnings/test.json b/test cases/common/255 module warnings/test.json new file mode 100644 index 000000000..5556b90e2 --- /dev/null +++ b/test cases/common/255 module warnings/test.json @@ -0,0 +1,16 @@ +{ + "stdout": [ + { + "line": "test cases/common/255 module warnings/meson.build:3: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.48.0': module python3." + }, + { + "line": "test cases/common/255 module warnings/meson.build:4: WARNING: Project targets '>= 0.56' but uses feature introduced in '0.60.0': module java." + }, + { + "line": "test cases/common/255 module warnings/meson.build:5: WARNING: Project targets '>= 0.56' but uses feature deprecated since '0.56.0': module keyval has been stabilized. drop \"unstable-\" prefix from the module name" + }, + { + "line": "test cases/common/255 module warnings/meson.build:6: DEPRECATION: Importing unstable modules as \"unstable_simd\" instead of \"unstable-simd\"" + } + ] +} diff --git a/test cases/common/255 preprocess/bar.c b/test cases/common/255 preprocess/bar.c deleted file mode 100644 index 43737b940..000000000 --- a/test cases/common/255 preprocess/bar.c +++ /dev/null @@ -1,3 +0,0 @@ -int bar(void) { - return BAR; -} diff --git a/test cases/common/255 preprocess/foo.c b/test cases/common/255 preprocess/foo.c deleted file mode 100644 index c9d16c5eb..000000000 --- a/test cases/common/255 preprocess/foo.c +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/test cases/common/255 preprocess/foo.h b/test cases/common/255 preprocess/foo.h deleted file mode 100644 index ba60bf396..000000000 --- a/test cases/common/255 preprocess/foo.h +++ /dev/null @@ -1,2 +0,0 @@ -int bar(void); -int main(void) { return FOO + bar(); } diff --git a/test cases/common/255 preprocess/meson.build b/test cases/common/255 preprocess/meson.build deleted file mode 100644 index 4824598e7..000000000 --- a/test cases/common/255 preprocess/meson.build +++ /dev/null @@ -1,15 +0,0 @@ -project('preprocess', 'c') - -cc = meson.get_compiler('c') - -add_project_arguments(['-DFOO=0', '-DBAR=0'], language: 'c') - -pp_files = cc.preprocess('foo.c', 'bar.c', output: '@PLAINNAME@') - -foreach f : pp_files - message(f.full_path()) -endforeach - -subdir('src') - -test('test-foo', executable('app', pp_files, link_depends: file_map)) diff --git a/test cases/common/255 preprocess/src/file.map.in b/test cases/common/255 preprocess/src/file.map.in deleted file mode 100644 index 152fb6561..000000000 --- a/test cases/common/255 preprocess/src/file.map.in +++ /dev/null @@ -1,3 +0,0 @@ -#if 1 -Hello World -#endif diff --git a/test cases/common/255 preprocess/src/meson.build b/test cases/common/255 preprocess/src/meson.build deleted file mode 100644 index 4cd955444..000000000 --- a/test cases/common/255 preprocess/src/meson.build +++ /dev/null @@ -1,3 +0,0 @@ -file_map = cc.preprocess('file.map.in', - output: '@BASENAME@', -) diff --git a/test cases/common/256 subproject extracted objects/foo.c b/test cases/common/256 subproject extracted objects/foo.c new file mode 100644 index 000000000..f6c7aebe0 --- /dev/null +++ b/test cases/common/256 subproject extracted objects/foo.c @@ -0,0 +1,11 @@ +#if defined _WIN32 || defined __CYGWIN__ + #define DLL_IMPORT __declspec(dllimport) +#else + #define DLL_IMPORT +#endif + +int DLL_IMPORT cppfunc(void); + +int otherfunc(void) { + return cppfunc() != 42; +} diff --git a/test cases/common/256 subproject extracted objects/meson.build b/test cases/common/256 subproject extracted objects/meson.build new file mode 100644 index 000000000..bad450fab --- /dev/null +++ b/test cases/common/256 subproject extracted objects/meson.build @@ -0,0 +1,5 @@ +project('link to extracted objects', 'c') + +sublib = subproject('myobjects').get_variable('sublib') + +mainlib = static_library('foo', 'foo.c', install: true, link_with: sublib) diff --git a/test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.cpp b/test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.cpp new file mode 100644 index 000000000..12ef756c7 --- /dev/null +++ b/test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.cpp @@ -0,0 +1,6 @@ +#define BUILDING_DLL +#include "cpplib.h" + +extern "C" int DLL_PUBLIC cppfunc(void) { + return 42; +} diff --git a/test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.h b/test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.h new file mode 100644 index 000000000..a1c38b3ba --- /dev/null +++ b/test cases/common/256 subproject extracted objects/subprojects/myobjects/cpplib.h @@ -0,0 +1,12 @@ +/* See http://gcc.gnu.org/wiki/Visibility#How_to_use_the_new_C.2B-.2B-_visibility_support */ +#if defined(_WIN32) || defined(__CYGWIN__) + #ifdef BUILDING_DLL + #define DLL_PUBLIC __declspec(dllexport) + #else + #define DLL_PUBLIC __declspec(dllimport) + #endif +#else + #define DLL_PUBLIC __attribute__ ((visibility ("default"))) +#endif + +extern "C" int DLL_PUBLIC cppfunc(void); diff --git a/test cases/common/256 subproject extracted objects/subprojects/myobjects/meson.build b/test cases/common/256 subproject extracted objects/subprojects/myobjects/meson.build new file mode 100644 index 000000000..1c2729bc1 --- /dev/null +++ b/test cases/common/256 subproject extracted objects/subprojects/myobjects/meson.build @@ -0,0 +1,3 @@ +project('myobjects', 'cpp') + +sublib = static_library('sublib', 'cpplib.cpp') diff --git a/test cases/common/256 subproject extracted objects/test.json b/test cases/common/256 subproject extracted objects/test.json new file mode 100644 index 000000000..baa5dfb8b --- /dev/null +++ b/test cases/common/256 subproject extracted objects/test.json @@ -0,0 +1,5 @@ +{ + "installed": [ + { "type": "file", "file": "usr/lib/libfoo.a" } + ] +} diff --git a/test cases/common/257 generated header dep/foo.c b/test cases/common/257 generated header dep/foo.c new file mode 100644 index 000000000..f4de601ff --- /dev/null +++ b/test cases/common/257 generated header dep/foo.c @@ -0,0 +1 @@ +#include "foo.h" diff --git a/test cases/common/257 generated header dep/meson.build b/test cases/common/257 generated header dep/meson.build new file mode 100644 index 000000000..195d082ac --- /dev/null +++ b/test cases/common/257 generated header dep/meson.build @@ -0,0 +1,22 @@ +project('generated header dep', 'c') + +# Regression test case for a very specific case: +# - Uses both_libraries(), or library() with default_library=both. +# - A header file is generated by a custom_target() and passed as source. +# - A C file that uses that header is passed as a declare_dependency() source. +# Under those specific conditions, the static library used to miss an order +# dependency on the header file. This happened in GLib: +# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2917. + +python = import('python').find_installation() +header = custom_target( + output: 'foo.h', + capture: true, + command: [python, '-c', 'print("#define FOO")'], +) + +sources_dep = declare_dependency(sources: files('foo.c')) + +both_libraries('foo', header, + dependencies: sources_dep, +) diff --git a/test cases/common/258 subsubproject inplace/meson.build b/test cases/common/258 subsubproject inplace/meson.build new file mode 100644 index 000000000..26a421b32 --- /dev/null +++ b/test cases/common/258 subsubproject inplace/meson.build @@ -0,0 +1,3 @@ +project('main') + +subproject('sub') diff --git a/test cases/common/258 subsubproject inplace/subprojects/sub/meson.build b/test cases/common/258 subsubproject inplace/subprojects/sub/meson.build new file mode 100644 index 000000000..5e33d2193 --- /dev/null +++ b/test cases/common/258 subsubproject inplace/subprojects/sub/meson.build @@ -0,0 +1,3 @@ +project('sub') + +subproject('subsub') diff --git a/test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build b/test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build new file mode 100644 index 000000000..7807a1bae --- /dev/null +++ b/test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub-1.0/meson.build @@ -0,0 +1 @@ +project('subsub') diff --git a/test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap b/test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap new file mode 100644 index 000000000..bf398525a --- /dev/null +++ b/test cases/common/258 subsubproject inplace/subprojects/sub/subprojects/subsub.wrap @@ -0,0 +1,2 @@ +[wrap-file] +directory = subsub-1.0 diff --git a/test cases/common/259 preprocess/bar.c b/test cases/common/259 preprocess/bar.c new file mode 100644 index 000000000..43737b940 --- /dev/null +++ b/test cases/common/259 preprocess/bar.c @@ -0,0 +1,3 @@ +int bar(void) { + return BAR; +} diff --git a/test cases/common/259 preprocess/foo.c b/test cases/common/259 preprocess/foo.c new file mode 100644 index 000000000..c9d16c5eb --- /dev/null +++ b/test cases/common/259 preprocess/foo.c @@ -0,0 +1 @@ +#include diff --git a/test cases/common/259 preprocess/foo.h b/test cases/common/259 preprocess/foo.h new file mode 100644 index 000000000..ba60bf396 --- /dev/null +++ b/test cases/common/259 preprocess/foo.h @@ -0,0 +1,2 @@ +int bar(void); +int main(void) { return FOO + bar(); } diff --git a/test cases/common/259 preprocess/meson.build b/test cases/common/259 preprocess/meson.build new file mode 100644 index 000000000..4824598e7 --- /dev/null +++ b/test cases/common/259 preprocess/meson.build @@ -0,0 +1,15 @@ +project('preprocess', 'c') + +cc = meson.get_compiler('c') + +add_project_arguments(['-DFOO=0', '-DBAR=0'], language: 'c') + +pp_files = cc.preprocess('foo.c', 'bar.c', output: '@PLAINNAME@') + +foreach f : pp_files + message(f.full_path()) +endforeach + +subdir('src') + +test('test-foo', executable('app', pp_files, link_depends: file_map)) diff --git a/test cases/common/259 preprocess/src/file.map.in b/test cases/common/259 preprocess/src/file.map.in new file mode 100644 index 000000000..152fb6561 --- /dev/null +++ b/test cases/common/259 preprocess/src/file.map.in @@ -0,0 +1,3 @@ +#if 1 +Hello World +#endif diff --git a/test cases/common/259 preprocess/src/meson.build b/test cases/common/259 preprocess/src/meson.build new file mode 100644 index 000000000..4cd955444 --- /dev/null +++ b/test cases/common/259 preprocess/src/meson.build @@ -0,0 +1,3 @@ +file_map = cc.preprocess('file.map.in', + output: '@BASENAME@', +) -- cgit v1.2.3