diff options
Diffstat (limited to 'test/Deprecated/debug-dtree.py')
| -rw-r--r-- | test/Deprecated/debug-dtree.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/Deprecated/debug-dtree.py b/test/Deprecated/debug-dtree.py index 2aec880..8918052 100644 --- a/test/Deprecated/debug-dtree.py +++ b/test/Deprecated/debug-dtree.py @@ -31,7 +31,6 @@ dependencies (sources or Depends()) of a target. import TestSCons import sys -import string import re import time @@ -87,7 +86,7 @@ dtree1 = """ test.run(arguments = "--debug=dtree foo.xxx", stderr = stderr) -test.fail_test(string.find(test.stdout(), dtree1) == -1) +test.must_contain_all_lines(test.stdout(), [dtree1]) dtree2 = """ +-. @@ -99,7 +98,7 @@ dtree2 = """ """ test.run(arguments = "--debug=dtree .", stderr = stderr) -test.fail_test(string.find(test.stdout(), dtree2) == -1) +test.must_contain_all_lines(test.stdout(), [dtree2]) # Make sure we print the debug stuff even if there's a build failure. test.write('bar.h', """ @@ -113,6 +112,6 @@ THIS SHOULD CAUSE A BUILD FAILURE test.run(arguments = "--debug=dtree foo.xxx", status = 2, stderr = None) -test.fail_test(string.find(test.stdout(), dtree1) == -1) +test.must_contain_all_lines(test.stdout(), [dtree1]) test.pass_test() |