Issue 2150: accommodate sporadic timing-related errors in the test output.

(Ludwig Haene)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3273 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index e9b585f5c3a14489ac2c97a904a09d492c2ffaf3..49f5a1d5f4028110d4ff0380edb266c3c443aeda 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -8,6 +8,14 @@
 
 
 
+RELEASE 1.0.0 - Sat, 09 Aug 2008 12:19:44 -0700
+
+From Ludwig Hähne:
+
+  - Fix sporadic output-order failures in test/GetBuildFailures/parallel.py.
+
+
+
 RELEASE 1.0.0 - Sat, 09 Aug 2008 12:19:44 -0700
 
 From Luca Falavigna:

diff --git a/test/GetBuildFailures/parallel.py b/test/GetBuildFailures/parallel.py
index 789cfbfea32b34f228034fc054c8ff24838a2619..69987301ac27ea8945a9bc4cbd8a197ddce9c1da 100644 (file)
--- 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