diff options
| author | Christoph Behle <behlec@gmail.com> | 2018-10-06 17:19:09 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-10-07 19:06:01 +0300 |
| commit | c0236e10f36448703ca2f85689aaa880810d93c6 (patch) | |
| tree | d0ec0e7765b295ce6a201751f4d9d87c6642ed2b /test cases/common/14 configure file | |
| parent | 646a073e36fb273f3267ecd424502c4d8480c0bb (diff) | |
| download | meson-c0236e10f36448703ca2f85689aaa880810d93c6.zip meson-c0236e10f36448703ca2f85689aaa880810d93c6.tar.gz meson-c0236e10f36448703ca2f85689aaa880810d93c6.tar.bz2 | |
Substitute output file then check for conflict.
Fixes Issue #4323.
The check to see if a call to configure_file() overwrites the output of
a preceding call should perform the substitution for the output file
before doing the check.
Added tests to ensure the proper behaviour.
Diffstat (limited to 'test cases/common/14 configure file')
5 files changed, 24 insertions, 0 deletions
diff --git a/test cases/common/14 configure file/differentafterbasename1.in b/test cases/common/14 configure file/differentafterbasename1.in new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/common/14 configure file/differentafterbasename1.in diff --git a/test cases/common/14 configure file/differentafterbasename2.in b/test cases/common/14 configure file/differentafterbasename2.in new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/common/14 configure file/differentafterbasename2.in diff --git a/test cases/common/14 configure file/meson.build b/test cases/common/14 configure file/meson.build index a3601aa..b040c89 100644 --- a/test cases/common/14 configure file/meson.build +++ b/test cases/common/14 configure file/meson.build @@ -218,6 +218,30 @@ configure_file( output: 'no_write_conflict.txt', configuration: conf) +# Test that @BASENAME@ is substituted before checking and does not create a warning. +configure_file( + input: 'differentafterbasename1.in', + output: '@BASENAME@', + configuration: conf +) +configure_file( + input: 'differentafterbasename2.in', + output: '@BASENAME@', + configuration: conf +) + +# Test that @BASENAME@ is substituted before checking and does create a warning on conflict. +configure_file( + input: 'sameafterbasename.in', + output: '@BASENAME@', + configuration: conf +) +configure_file( + input: 'sameafterbasename.in2', + output: '@BASENAME@', + configuration: conf +) + test('configure-file', test_file) cdata = configuration_data() diff --git a/test cases/common/14 configure file/sameafterbasename.in b/test cases/common/14 configure file/sameafterbasename.in new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/common/14 configure file/sameafterbasename.in diff --git a/test cases/common/14 configure file/sameafterbasename.in2 b/test cases/common/14 configure file/sameafterbasename.in2 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/common/14 configure file/sameafterbasename.in2 |