From 506cc57cc83491e89d8242081f7f23a7150a80ba Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 25 Jun 2017 21:43:38 +0300 Subject: Do not permit invalid and/or nodes to be declared. Closes #1886. --- test cases/failing/55 or on new line/meson.build | 7 ------- test cases/failing/55 or on new line/meson_options.txt | 1 - test cases/failing/57 or on new line/meson.build | 7 +++++++ test cases/failing/57 or on new line/meson_options.txt | 1 + 4 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 test cases/failing/55 or on new line/meson.build delete mode 100644 test cases/failing/55 or on new line/meson_options.txt create mode 100644 test cases/failing/57 or on new line/meson.build create mode 100644 test cases/failing/57 or on new line/meson_options.txt (limited to 'test cases/failing') diff --git a/test cases/failing/55 or on new line/meson.build b/test cases/failing/55 or on new line/meson.build deleted file mode 100644 index 12f2705..0000000 --- a/test cases/failing/55 or on new line/meson.build +++ /dev/null @@ -1,7 +0,0 @@ -project('silent_or', 'c') - -if get_option('foo') == 'true' - or get_option('foo') == 'auto' -else - message('If this message is printed then something is wrong. The or above should give a syntax error.') -endif diff --git a/test cases/failing/55 or on new line/meson_options.txt b/test cases/failing/55 or on new line/meson_options.txt deleted file mode 100644 index 3302cf4..0000000 --- a/test cases/failing/55 or on new line/meson_options.txt +++ /dev/null @@ -1 +0,0 @@ -option('foo', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto') diff --git a/test cases/failing/57 or on new line/meson.build b/test cases/failing/57 or on new line/meson.build new file mode 100644 index 0000000..12f2705 --- /dev/null +++ b/test cases/failing/57 or on new line/meson.build @@ -0,0 +1,7 @@ +project('silent_or', 'c') + +if get_option('foo') == 'true' + or get_option('foo') == 'auto' +else + message('If this message is printed then something is wrong. The or above should give a syntax error.') +endif diff --git a/test cases/failing/57 or on new line/meson_options.txt b/test cases/failing/57 or on new line/meson_options.txt new file mode 100644 index 0000000..3302cf4 --- /dev/null +++ b/test cases/failing/57 or on new line/meson_options.txt @@ -0,0 +1 @@ +option('foo', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto') -- cgit v1.1