From e7e70407bd54811604f8e907819e36a6025f7915 Mon Sep 17 00:00:00 2001 From: Mats Wichmann Date: Sat, 2 Mar 2019 15:35:59 -0700 Subject: For PR #3320 re-unindent expect strings in with block Previous change created a with: block but accidentally indented two literal strings used as the expected stderr, causing them to no longer match; these are restored to original state. Signed-off-by: Mats Wichmann --- test/VariantDir/errors.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/VariantDir/errors.py b/test/VariantDir/errors.py index d3ecd54..26ef4a2 100644 --- a/test/VariantDir/errors.py +++ b/test/VariantDir/errors.py @@ -135,14 +135,14 @@ with open(file_in, 'r'): arguments = ".", status = 2, stderr = """\ - scons: *** Cannot duplicate `%s' in `build': Permission denied. Stop. - """ % (os.path.join('src', 'file.in'))) +scons: *** Cannot duplicate `%s' in `build': Permission denied. Stop. +""" % (os.path.join('src', 'file.in'))) test.run(chdir = 'ro-src', arguments = "-k .", status = 2, stderr = """\ - scons: *** Cannot duplicate `%s' in `build': Permission denied. Stop. +scons: *** Cannot duplicate `%s' in `build': Permission denied. Stop. """ % (os.path.join('src', 'file.in'))) # ensure that specifying multiple source directories for one -- cgit v0.12