From c0236e10f36448703ca2f85689aaa880810d93c6 Mon Sep 17 00:00:00 2001 From: Christoph Behle Date: Sat, 6 Oct 2018 17:19:09 +0200 Subject: 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. --- run_unittests.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'run_unittests.py') 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") -- cgit v1.1