summaryrefslogtreecommitdiff
path: root/test/Errors
diff options
context:
space:
mode:
authordirkbaechle <devnull@localhost>2012-09-05 01:23:13 +0200
committerdirkbaechle <devnull@localhost>2012-09-05 01:23:13 +0200
commit8d53f8adbaa758c53da24f7aa0f44e905137f2f3 (patch)
tree5d422a83251e4afe9a3941b3bb97a79fdb38765f /test/Errors
parente7bd33843093affec4fc9d182613248f19ca9e10 (diff)
downloadscons-8d53f8adbaa758c53da24f7aa0f44e905137f2f3.tar.gz
- first swoop of changes for getting all Buildbot slaves to run successfully again
Diffstat (limited to 'test/Errors')
-rw-r--r--test/Errors/execute-a-directory.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/Errors/execute-a-directory.py b/test/Errors/execute-a-directory.py
index 55d6844c..1b679c6e 100644
--- a/test/Errors/execute-a-directory.py
+++ b/test/Errors/execute-a-directory.py
@@ -84,6 +84,11 @@ is_a_directory = """\
scons: *** [%s] Error %s
"""
+Is_a_directory = """\
+%s: Is a directory
+scons: *** [%s] Error %s
+"""
+
test.description_set("Incorrect STDERR:\n%s\n" % test.stderr())
if os.name == 'nt':
errs = [
@@ -101,7 +106,7 @@ else:
errs = [
cannot_execute % (not_executable, 'f3', 126),
is_a_directory % (test.workdir, 'f3', 126),
- Permission_denied % (test.workdir, 'f3', 126),
+ Is_a_directory % (test.workdir, 'f3', 126),
Permission_denied % (test.workdir, 'f3', 126),
]
test.must_contain_any_line(test.stderr(), errs)