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 /run_unittests.py | |
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 'run_unittests.py')
-rwxr-xr-x | run_unittests.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/run_unittests.py b/run_unittests.py index 8bea2d0..9ffce52 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2682,6 +2682,8 @@ recommended as it is not supported on some platforms''') self.assertRegex(out, "WARNING:.*\"double_output.txt\".*overwrites") self.assertRegex(out, "WARNING:.*\"subdir.double_output2.txt\".*overwrites") self.assertNotRegex(out, "WARNING:.*no_write_conflict.txt.*overwrites") + self.assertNotRegex(out, "WARNING:.*@BASENAME@.*overwrites") + self.assertRegex(out, "WARNING:.*\"sameafterbasename\".*overwrites") # No warnings about empty configuration data objects passed to files with substitutions self.assertNotRegex(out, "WARNING:.*empty configuration_data.*nosubst-nocopy1.txt.in") self.assertNotRegex(out, "WARNING:.*empty configuration_data.*nosubst-nocopy2.txt.in") |