summaryrefslogtreecommitdiffstats
path: root/test/Errors
diff options
context:
space:
mode:
authordirkbaechle <devnull@localhost>2012-09-04 23:23:13 (GMT)
committerdirkbaechle <devnull@localhost>2012-09-04 23:23:13 (GMT)
commit1c8744b6d4ec8812746415d1aae4f13e634809ca (patch)
tree5d422a83251e4afe9a3941b3bb97a79fdb38765f /test/Errors
parenta54670d821ac18abc3880ef9ca03c2f84edd5ae6 (diff)
downloadSCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.zip
SCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.tar.gz
SCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.tar.bz2
- 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 55d6844..1b679c6 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)