summaryrefslogtreecommitdiffstats
path: root/test/GetBuildFailures
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-05-01 04:42:33 (GMT)
committerGreg Noel <GregNoel@tigris.org>2010-05-01 04:42:33 (GMT)
commit8c0690bceff753ce1dea6f5e14cce1a8e0af30f5 (patch)
tree8d3da1d925e17b981246ea30afe977aa83c340e6 /test/GetBuildFailures
parentb6a7a7b274ca097cdc2cb1eed68afe083e4c1953 (diff)
downloadSCons-8c0690bceff753ce1dea6f5e14cce1a8e0af30f5.zip
SCons-8c0690bceff753ce1dea6f5e14cce1a8e0af30f5.tar.gz
SCons-8c0690bceff753ce1dea6f5e14cce1a8e0af30f5.tar.bz2
Add test routine to exactly match a set of lines no matter the order
Diffstat (limited to 'test/GetBuildFailures')
-rw-r--r--test/GetBuildFailures/option-k.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/test/GetBuildFailures/option-k.py b/test/GetBuildFailures/option-k.py
index a9818a6..142fbf4 100644
--- a/test/GetBuildFailures/option-k.py
+++ b/test/GetBuildFailures/option-k.py
@@ -23,7 +23,7 @@
#
"""
-Verify that a failed build action with -j works as expected.
+Verify that a failed build action with -k works as expected.
"""
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
@@ -90,10 +90,9 @@ scons: *** [f4] Error 1
scons: *** [f5] Error 1
"""
-test.run(arguments = '-k .',
- status = 2,
- stdout = expect_stdout,
- stderr = expect_stderr)
+test.run(arguments = '-k .', status = 2, stdout=None, stderr=None)
+test.exactly_contain_all_lines(test.stdout(), expect_stdout, title='stdout')
+test.exactly_contain_all_lines(test.stderr(), expect_stderr, title='stderr')
test.must_match(test.workpath('f3'), 'f3.in\n')
test.must_not_exist(test.workpath('f4'))
@@ -101,7 +100,6 @@ test.must_not_exist(test.workpath('f5'))
test.must_match(test.workpath('f6'), 'f6.in\n')
-
test.pass_test()
# Local Variables: