From d45db903acf37b5775274e256793fbf2ad931066 Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 13 Nov 2016 03:57:34 -0500 Subject: Rename test cases to remove duplicate numbers. --- test cases/common/121 skip/meson.build | 4 ---- test cases/common/122 skip/meson.build | 4 ++++ .../common/122 subproject project arguments/exe.c | 23 --------------------- .../122 subproject project arguments/exe.cpp | 24 ---------------------- .../122 subproject project arguments/meson.build | 14 ------------- .../subprojects/subexe/meson.build | 13 ------------ .../subprojects/subexe/subexe.c | 23 --------------------- .../common/123 subproject project arguments/exe.c | 23 +++++++++++++++++++++ .../123 subproject project arguments/exe.cpp | 24 ++++++++++++++++++++++ .../123 subproject project arguments/meson.build | 14 +++++++++++++ .../subprojects/subexe/meson.build | 13 ++++++++++++ .../subprojects/subexe/subexe.c | 23 +++++++++++++++++++++ .../meson.build | 4 ---- .../meson.build | 4 ++++ .../failing/35 project argument after target/exe.c | 3 --- .../35 project argument after target/meson.build | 7 ------- .../failing/36 project argument after target/exe.c | 3 +++ .../36 project argument after target/meson.build | 7 +++++++ test cases/vala/12 custom output/foo.vala | 0 test cases/vala/12 custom output/meson.build | 9 -------- test cases/vala/13 custom output/foo.vala | 0 test cases/vala/13 custom output/meson.build | 9 ++++++++ test cases/vala/13 find library/meson.build | 9 -------- test cases/vala/13 find library/test.vala | 6 ------ test cases/vala/14 find library/meson.build | 9 ++++++++ test cases/vala/14 find library/test.vala | 6 ++++++ 26 files changed, 139 insertions(+), 139 deletions(-) delete mode 100644 test cases/common/121 skip/meson.build create mode 100644 test cases/common/122 skip/meson.build delete mode 100644 test cases/common/122 subproject project arguments/exe.c delete mode 100644 test cases/common/122 subproject project arguments/exe.cpp delete mode 100644 test cases/common/122 subproject project arguments/meson.build delete mode 100644 test cases/common/122 subproject project arguments/subprojects/subexe/meson.build delete mode 100644 test cases/common/122 subproject project arguments/subprojects/subexe/subexe.c create mode 100644 test cases/common/123 subproject project arguments/exe.c create mode 100644 test cases/common/123 subproject project arguments/exe.cpp create mode 100644 test cases/common/123 subproject project arguments/meson.build create mode 100644 test cases/common/123 subproject project arguments/subprojects/subexe/meson.build create mode 100644 test cases/common/123 subproject project arguments/subprojects/subexe/subexe.c delete mode 100644 test cases/failing/34 dependency not-required then required/meson.build create mode 100644 test cases/failing/35 dependency not-required then required/meson.build delete mode 100644 test cases/failing/35 project argument after target/exe.c delete mode 100644 test cases/failing/35 project argument after target/meson.build create mode 100644 test cases/failing/36 project argument after target/exe.c create mode 100644 test cases/failing/36 project argument after target/meson.build delete mode 100644 test cases/vala/12 custom output/foo.vala delete mode 100644 test cases/vala/12 custom output/meson.build create mode 100644 test cases/vala/13 custom output/foo.vala create mode 100644 test cases/vala/13 custom output/meson.build delete mode 100644 test cases/vala/13 find library/meson.build delete mode 100644 test cases/vala/13 find library/test.vala create mode 100644 test cases/vala/14 find library/meson.build create mode 100644 test cases/vala/14 find library/test.vala diff --git a/test cases/common/121 skip/meson.build b/test cases/common/121 skip/meson.build deleted file mode 100644 index 1adedb6..0000000 --- a/test cases/common/121 skip/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('skip', 'c') - -error('MESON_SKIP_TEST this test is always skipped.') - diff --git a/test cases/common/122 skip/meson.build b/test cases/common/122 skip/meson.build new file mode 100644 index 0000000..1adedb6 --- /dev/null +++ b/test cases/common/122 skip/meson.build @@ -0,0 +1,4 @@ +project('skip', 'c') + +error('MESON_SKIP_TEST this test is always skipped.') + diff --git a/test cases/common/122 subproject project arguments/exe.c b/test cases/common/122 subproject project arguments/exe.c deleted file mode 100644 index b04344a..0000000 --- a/test cases/common/122 subproject project arguments/exe.c +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef PROJECT_OPTION -#error -#endif - -#ifndef PROJECT_OPTION_1 -#error -#endif - -#ifndef GLOBAL_ARGUMENT -#error -#endif - -#ifdef SUBPROJECT_OPTION -#error -#endif - -#ifdef OPTION_CPP -#error -#endif - -int main(int argc, char **argv) { - return 0; -} diff --git a/test cases/common/122 subproject project arguments/exe.cpp b/test cases/common/122 subproject project arguments/exe.cpp deleted file mode 100644 index 7ffe098..0000000 --- a/test cases/common/122 subproject project arguments/exe.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#ifdef PROJECT_OPTION -#error -#endif - -#ifdef PROJECT_OPTION_1 -#error -#endif - -#ifdef GLOBAL_ARGUMENT -#error -#endif - -#ifdef SUBPROJECT_OPTION -#error -#endif - -#ifndef PROJECT_OPTION_CPP -#error -#endif - -int main(int argc, char **argv) { - return 0; -} - diff --git a/test cases/common/122 subproject project arguments/meson.build b/test cases/common/122 subproject project arguments/meson.build deleted file mode 100644 index aee803c..0000000 --- a/test cases/common/122 subproject project arguments/meson.build +++ /dev/null @@ -1,14 +0,0 @@ -project('project options tester', 'c', 'cpp', - version : '2.3.4', - license : 'mylicense') - -add_global_arguments('-DGLOBAL_ARGUMENT', language: 'c') -add_project_arguments('-DPROJECT_OPTION', language: 'c') -add_project_arguments('-DPROJECT_OPTION_1', language: 'c') -add_project_arguments('-DPROJECT_OPTION_CPP', language: 'cpp') - -sub = subproject('subexe', version : '1.0.0') -e = executable('exe', 'exe.c') -e = executable('execpp', 'exe.cpp') -test('exetest', e) -test('execpptest', e) diff --git a/test cases/common/122 subproject project arguments/subprojects/subexe/meson.build b/test cases/common/122 subproject project arguments/subprojects/subexe/meson.build deleted file mode 100644 index ef141dc..0000000 --- a/test cases/common/122 subproject project arguments/subprojects/subexe/meson.build +++ /dev/null @@ -1,13 +0,0 @@ -project('subproject', 'c', - version : '1.0.0', - license : ['sublicense1', 'sublicense2']) - -if not meson.is_subproject() - error('Claimed to be master project even though we are a subproject.') -endif - -assert(meson.project_name() == 'subproject', 'Incorrect subproject name') - -add_project_arguments('-DSUBPROJECT_OPTION', language: 'c') -e = executable('subexe', 'subexe.c') -test('subexetest', e) diff --git a/test cases/common/122 subproject project arguments/subprojects/subexe/subexe.c b/test cases/common/122 subproject project arguments/subprojects/subexe/subexe.c deleted file mode 100644 index 6ebd752..0000000 --- a/test cases/common/122 subproject project arguments/subprojects/subexe/subexe.c +++ /dev/null @@ -1,23 +0,0 @@ -#ifdef PROJECT_OPTION -#error -#endif - -#ifdef PROJECT_OPTION_1 -#error -#endif - -#ifndef GLOBAL_ARGUMENT -#error -#endif - -#ifndef SUBPROJECT_OPTION -#error -#endif - -#ifdef OPTION_CPP -#error -#endif - -int main(int argc, char **argv) { - return 0; -} diff --git a/test cases/common/123 subproject project arguments/exe.c b/test cases/common/123 subproject project arguments/exe.c new file mode 100644 index 0000000..b04344a --- /dev/null +++ b/test cases/common/123 subproject project arguments/exe.c @@ -0,0 +1,23 @@ +#ifndef PROJECT_OPTION +#error +#endif + +#ifndef PROJECT_OPTION_1 +#error +#endif + +#ifndef GLOBAL_ARGUMENT +#error +#endif + +#ifdef SUBPROJECT_OPTION +#error +#endif + +#ifdef OPTION_CPP +#error +#endif + +int main(int argc, char **argv) { + return 0; +} diff --git a/test cases/common/123 subproject project arguments/exe.cpp b/test cases/common/123 subproject project arguments/exe.cpp new file mode 100644 index 0000000..7ffe098 --- /dev/null +++ b/test cases/common/123 subproject project arguments/exe.cpp @@ -0,0 +1,24 @@ +#ifdef PROJECT_OPTION +#error +#endif + +#ifdef PROJECT_OPTION_1 +#error +#endif + +#ifdef GLOBAL_ARGUMENT +#error +#endif + +#ifdef SUBPROJECT_OPTION +#error +#endif + +#ifndef PROJECT_OPTION_CPP +#error +#endif + +int main(int argc, char **argv) { + return 0; +} + diff --git a/test cases/common/123 subproject project arguments/meson.build b/test cases/common/123 subproject project arguments/meson.build new file mode 100644 index 0000000..aee803c --- /dev/null +++ b/test cases/common/123 subproject project arguments/meson.build @@ -0,0 +1,14 @@ +project('project options tester', 'c', 'cpp', + version : '2.3.4', + license : 'mylicense') + +add_global_arguments('-DGLOBAL_ARGUMENT', language: 'c') +add_project_arguments('-DPROJECT_OPTION', language: 'c') +add_project_arguments('-DPROJECT_OPTION_1', language: 'c') +add_project_arguments('-DPROJECT_OPTION_CPP', language: 'cpp') + +sub = subproject('subexe', version : '1.0.0') +e = executable('exe', 'exe.c') +e = executable('execpp', 'exe.cpp') +test('exetest', e) +test('execpptest', e) diff --git a/test cases/common/123 subproject project arguments/subprojects/subexe/meson.build b/test cases/common/123 subproject project arguments/subprojects/subexe/meson.build new file mode 100644 index 0000000..ef141dc --- /dev/null +++ b/test cases/common/123 subproject project arguments/subprojects/subexe/meson.build @@ -0,0 +1,13 @@ +project('subproject', 'c', + version : '1.0.0', + license : ['sublicense1', 'sublicense2']) + +if not meson.is_subproject() + error('Claimed to be master project even though we are a subproject.') +endif + +assert(meson.project_name() == 'subproject', 'Incorrect subproject name') + +add_project_arguments('-DSUBPROJECT_OPTION', language: 'c') +e = executable('subexe', 'subexe.c') +test('subexetest', e) diff --git a/test cases/common/123 subproject project arguments/subprojects/subexe/subexe.c b/test cases/common/123 subproject project arguments/subprojects/subexe/subexe.c new file mode 100644 index 0000000..6ebd752 --- /dev/null +++ b/test cases/common/123 subproject project arguments/subprojects/subexe/subexe.c @@ -0,0 +1,23 @@ +#ifdef PROJECT_OPTION +#error +#endif + +#ifdef PROJECT_OPTION_1 +#error +#endif + +#ifndef GLOBAL_ARGUMENT +#error +#endif + +#ifndef SUBPROJECT_OPTION +#error +#endif + +#ifdef OPTION_CPP +#error +#endif + +int main(int argc, char **argv) { + return 0; +} diff --git a/test cases/failing/34 dependency not-required then required/meson.build b/test cases/failing/34 dependency not-required then required/meson.build deleted file mode 100644 index 1796699..0000000 --- a/test cases/failing/34 dependency not-required then required/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('dep-test', 'c', version : '1.0') - -foo_dep = dependency('foo-bar-xyz-12.3', required : false) -bar_dep = dependency('foo-bar-xyz-12.3') diff --git a/test cases/failing/35 dependency not-required then required/meson.build b/test cases/failing/35 dependency not-required then required/meson.build new file mode 100644 index 0000000..1796699 --- /dev/null +++ b/test cases/failing/35 dependency not-required then required/meson.build @@ -0,0 +1,4 @@ +project('dep-test', 'c', version : '1.0') + +foo_dep = dependency('foo-bar-xyz-12.3', required : false) +bar_dep = dependency('foo-bar-xyz-12.3') diff --git a/test cases/failing/35 project argument after target/exe.c b/test cases/failing/35 project argument after target/exe.c deleted file mode 100644 index 11b7fad..0000000 --- a/test cases/failing/35 project argument after target/exe.c +++ /dev/null @@ -1,3 +0,0 @@ -int main(int argc, char **argv) { - return 0; -} diff --git a/test cases/failing/35 project argument after target/meson.build b/test cases/failing/35 project argument after target/meson.build deleted file mode 100644 index 5402c67..0000000 --- a/test cases/failing/35 project argument after target/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('project argument after target failing', 'c', - version : '2.3.4', - license : 'mylicense') - -add_project_arguments('-DPROJECT_OPTION', language: 'c') -e = executable('exe', 'exe.c') -add_project_arguments('-DPROJECT_OPTION1', language: 'c') diff --git a/test cases/failing/36 project argument after target/exe.c b/test cases/failing/36 project argument after target/exe.c new file mode 100644 index 0000000..11b7fad --- /dev/null +++ b/test cases/failing/36 project argument after target/exe.c @@ -0,0 +1,3 @@ +int main(int argc, char **argv) { + return 0; +} diff --git a/test cases/failing/36 project argument after target/meson.build b/test cases/failing/36 project argument after target/meson.build new file mode 100644 index 0000000..5402c67 --- /dev/null +++ b/test cases/failing/36 project argument after target/meson.build @@ -0,0 +1,7 @@ +project('project argument after target failing', 'c', + version : '2.3.4', + license : 'mylicense') + +add_project_arguments('-DPROJECT_OPTION', language: 'c') +e = executable('exe', 'exe.c') +add_project_arguments('-DPROJECT_OPTION1', language: 'c') diff --git a/test cases/vala/12 custom output/foo.vala b/test cases/vala/12 custom output/foo.vala deleted file mode 100644 index e69de29..0000000 diff --git a/test cases/vala/12 custom output/meson.build b/test cases/vala/12 custom output/meson.build deleted file mode 100644 index ef6dbb5..0000000 --- a/test cases/vala/12 custom output/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('valatest', 'c', 'vala') - -glib = dependency('glib-2.0') -gobject = dependency('gobject-2.0') - -library('foo-1.0', 'foo.vala', - vala_header: 'foo.h', - vala_vapi: 'foo.vapi', - dependencies: [glib, gobject]) diff --git a/test cases/vala/13 custom output/foo.vala b/test cases/vala/13 custom output/foo.vala new file mode 100644 index 0000000..e69de29 diff --git a/test cases/vala/13 custom output/meson.build b/test cases/vala/13 custom output/meson.build new file mode 100644 index 0000000..ef6dbb5 --- /dev/null +++ b/test cases/vala/13 custom output/meson.build @@ -0,0 +1,9 @@ +project('valatest', 'c', 'vala') + +glib = dependency('glib-2.0') +gobject = dependency('gobject-2.0') + +library('foo-1.0', 'foo.vala', + vala_header: 'foo.h', + vala_vapi: 'foo.vapi', + dependencies: [glib, gobject]) diff --git a/test cases/vala/13 find library/meson.build b/test cases/vala/13 find library/meson.build deleted file mode 100644 index 03054d2..0000000 --- a/test cases/vala/13 find library/meson.build +++ /dev/null @@ -1,9 +0,0 @@ -project('find vala library', 'vala', 'c') - -valac = meson.get_compiler('vala') - -gobject = dependency('gobject-2.0') -zlib = valac.find_library('zlib') - -e = executable('zlibtest', 'test.vala', dependencies : [gobject, zlib]) -test('testzlib', e) diff --git a/test cases/vala/13 find library/test.vala b/test cases/vala/13 find library/test.vala deleted file mode 100644 index b087cfb..0000000 --- a/test cases/vala/13 find library/test.vala +++ /dev/null @@ -1,6 +0,0 @@ -using ZLib; - -public static int main(string[] args) { - stdout.printf("ZLIB_VERSION is: %s\n", ZLib.VERSION.STRING); - return 0; -} diff --git a/test cases/vala/14 find library/meson.build b/test cases/vala/14 find library/meson.build new file mode 100644 index 0000000..03054d2 --- /dev/null +++ b/test cases/vala/14 find library/meson.build @@ -0,0 +1,9 @@ +project('find vala library', 'vala', 'c') + +valac = meson.get_compiler('vala') + +gobject = dependency('gobject-2.0') +zlib = valac.find_library('zlib') + +e = executable('zlibtest', 'test.vala', dependencies : [gobject, zlib]) +test('testzlib', e) diff --git a/test cases/vala/14 find library/test.vala b/test cases/vala/14 find library/test.vala new file mode 100644 index 0000000..b087cfb --- /dev/null +++ b/test cases/vala/14 find library/test.vala @@ -0,0 +1,6 @@ +using ZLib; + +public static int main(string[] args) { + stdout.printf("ZLIB_VERSION is: %s\n", ZLib.VERSION.STRING); + return 0; +} -- cgit v1.1