From a2118ec6c2192120464d307828dcfb9f3e335672 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Wed, 28 Jun 2023 00:44:29 +0300 Subject: Condense test directory names for release. --- test cases/common/263 default_options dict/lib.c | 1 + .../common/263 default_options dict/meson.build | 22 ++++++++++++++++++++++ .../263 default_options dict/meson_options.txt | 4 ++++ test cases/common/264 default_options dict/lib.c | 1 - .../common/264 default_options dict/meson.build | 22 ---------------------- .../264 default_options dict/meson_options.txt | 4 ---- test cases/fortran/22 preprocess/main.f90 | 4 ---- test cases/fortran/22 preprocess/meson.build | 7 ------- test cases/fortran/23 preprocess/main.f90 | 4 ++++ test cases/fortran/23 preprocess/meson.build | 7 +++++++ 10 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 test cases/common/263 default_options dict/lib.c create mode 100644 test cases/common/263 default_options dict/meson.build create mode 100644 test cases/common/263 default_options dict/meson_options.txt delete mode 100644 test cases/common/264 default_options dict/lib.c delete mode 100644 test cases/common/264 default_options dict/meson.build delete mode 100644 test cases/common/264 default_options dict/meson_options.txt delete mode 100644 test cases/fortran/22 preprocess/main.f90 delete mode 100644 test cases/fortran/22 preprocess/meson.build create mode 100644 test cases/fortran/23 preprocess/main.f90 create mode 100644 test cases/fortran/23 preprocess/meson.build diff --git a/test cases/common/263 default_options dict/lib.c b/test cases/common/263 default_options dict/lib.c new file mode 100644 index 0000000..3ef78ee --- /dev/null +++ b/test cases/common/263 default_options dict/lib.c @@ -0,0 +1 @@ +#warning Make sure this is not fatal diff --git a/test cases/common/263 default_options dict/meson.build b/test cases/common/263 default_options dict/meson.build new file mode 100644 index 0000000..06edd7b --- /dev/null +++ b/test cases/common/263 default_options dict/meson.build @@ -0,0 +1,22 @@ +project('test default options', 'c', + default_options: { + 'bool': true, + 'int': 42, + 'str': 'foo', + 'array': ['foo'], + 'werror': true, + }, +) + +assert(get_option('bool') == true) +assert(get_option('int') == 42) +assert(get_option('str') == 'foo') +assert(get_option('array') == ['foo']) +assert(get_option('werror') == true) + +cc = meson.get_compiler('c') + +# MSVC does not support #warning +if cc.get_id() != 'msvc' + static_library('foo', 'lib.c', override_options: {'werror': false}) +endif diff --git a/test cases/common/263 default_options dict/meson_options.txt b/test cases/common/263 default_options dict/meson_options.txt new file mode 100644 index 0000000..1b0b0e1 --- /dev/null +++ b/test cases/common/263 default_options dict/meson_options.txt @@ -0,0 +1,4 @@ +option('bool', type: 'boolean', value: false) +option('int', type: 'integer', value: 0) +option('str', type: 'string', value: 'bar') +option('array', type: 'array', value: ['bar']) diff --git a/test cases/common/264 default_options dict/lib.c b/test cases/common/264 default_options dict/lib.c deleted file mode 100644 index 3ef78ee..0000000 --- a/test cases/common/264 default_options dict/lib.c +++ /dev/null @@ -1 +0,0 @@ -#warning Make sure this is not fatal diff --git a/test cases/common/264 default_options dict/meson.build b/test cases/common/264 default_options dict/meson.build deleted file mode 100644 index 06edd7b..0000000 --- a/test cases/common/264 default_options dict/meson.build +++ /dev/null @@ -1,22 +0,0 @@ -project('test default options', 'c', - default_options: { - 'bool': true, - 'int': 42, - 'str': 'foo', - 'array': ['foo'], - 'werror': true, - }, -) - -assert(get_option('bool') == true) -assert(get_option('int') == 42) -assert(get_option('str') == 'foo') -assert(get_option('array') == ['foo']) -assert(get_option('werror') == true) - -cc = meson.get_compiler('c') - -# MSVC does not support #warning -if cc.get_id() != 'msvc' - static_library('foo', 'lib.c', override_options: {'werror': false}) -endif diff --git a/test cases/common/264 default_options dict/meson_options.txt b/test cases/common/264 default_options dict/meson_options.txt deleted file mode 100644 index 1b0b0e1..0000000 --- a/test cases/common/264 default_options dict/meson_options.txt +++ /dev/null @@ -1,4 +0,0 @@ -option('bool', type: 'boolean', value: false) -option('int', type: 'integer', value: 0) -option('str', type: 'string', value: 'bar') -option('array', type: 'array', value: ['bar']) diff --git a/test cases/fortran/22 preprocess/main.f90 b/test cases/fortran/22 preprocess/main.f90 deleted file mode 100644 index 7cbc11c..0000000 --- a/test cases/fortran/22 preprocess/main.f90 +++ /dev/null @@ -1,4 +0,0 @@ -#define MYDEF program -MYDEF foo - write (*,*) 'Hello, world!' -end MYDEF foo diff --git a/test cases/fortran/22 preprocess/meson.build b/test cases/fortran/22 preprocess/meson.build deleted file mode 100644 index b776940..0000000 --- a/test cases/fortran/22 preprocess/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('preprocess', 'fortran') - -fc = meson.get_compiler('fortran') - -pp_files = fc.preprocess('main.f90', output: '@PLAINNAME@') - -library('foo', pp_files) diff --git a/test cases/fortran/23 preprocess/main.f90 b/test cases/fortran/23 preprocess/main.f90 new file mode 100644 index 0000000..7cbc11c --- /dev/null +++ b/test cases/fortran/23 preprocess/main.f90 @@ -0,0 +1,4 @@ +#define MYDEF program +MYDEF foo + write (*,*) 'Hello, world!' +end MYDEF foo diff --git a/test cases/fortran/23 preprocess/meson.build b/test cases/fortran/23 preprocess/meson.build new file mode 100644 index 0000000..b776940 --- /dev/null +++ b/test cases/fortran/23 preprocess/meson.build @@ -0,0 +1,7 @@ +project('preprocess', 'fortran') + +fc = meson.get_compiler('fortran') + +pp_files = fc.preprocess('main.f90', output: '@PLAINNAME@') + +library('foo', pp_files) -- cgit v1.1