summaryrefslogtreecommitdiffstats
path: root/test/GetBuildFailures
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2008-08-14 04:10:09 (GMT)
committerSteven Knight <knight@baldmt.com>2008-08-14 04:10:09 (GMT)
commit6426897104128875124931dc350a106bd1d0754c (patch)
treefc130c2f1d97410906303b5c056cdd23c3a48455 /test/GetBuildFailures
parentb841996944455f3e7bfe8aabfbf6d3f62dd07fd7 (diff)
downloadSCons-6426897104128875124931dc350a106bd1d0754c.zip
SCons-6426897104128875124931dc350a106bd1d0754c.tar.gz
SCons-6426897104128875124931dc350a106bd1d0754c.tar.bz2
Issue 2150: accommodate sporadic timing-related errors in the test output.
(Ludwig Haene)
Diffstat (limited to 'test/GetBuildFailures')
-rw-r--r--test/GetBuildFailures/parallel.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/test/GetBuildFailures/parallel.py b/test/GetBuildFailures/parallel.py
index 789cfbf..6998730 100644
--- a/test/GetBuildFailures/parallel.py
+++ b/test/GetBuildFailures/parallel.py
@@ -98,14 +98,20 @@ test.write('f4.in', "f4.in\n")
test.write('f5.in', "f5.in\n")
test.write('f6.in', "f6.in\n")
-expect_stderr = """\
-scons: *** [f4] Error 1
-scons: *** [f5] Error 1
-"""
-
test.run(arguments = '-Q -j 4 .',
status = 2,
- stderr = expect_stderr)
+ stderr = None)
+
+f4_error = "scons: *** [f4] Error 1\n"
+f5_error = "scons: *** [f5] Error 1\n"
+
+error_45 = f4_error + f5_error
+error_54 = f5_error + f4_error
+
+if test.stderr() not in [error_45, error_54]:
+ print "Did not find the following output in list of expected strings:"
+ print test.stderr(),
+ test.fail_test()
# We jump through hoops above to try to make sure that the individual
# commands execute and exit in the order we want, but we still can't be