diff options
| author | Steven Knight <knight@baldmt.com> | 2009-02-06 14:55:23 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-02-06 14:55:23 (GMT) |
| commit | e112f6b49c9063e6a584ff4f7abf9d7a644eef30 (patch) | |
| tree | 978573b4ff11f036428c0a08a89085313ad990fa /test/CC | |
| parent | 9405dad6e18db3934eec7b992e12a2016b1466db (diff) | |
| download | SCons-e112f6b49c9063e6a584ff4f7abf9d7a644eef30.zip SCons-e112f6b49c9063e6a584ff4f7abf9d7a644eef30.tar.gz SCons-e112f6b49c9063e6a584ff4f7abf9d7a644eef30.tar.bz2 | |
Commonize new string-search-in-output methods:
test.must_contain_all_lines()
test.must_contain_any_line()
test.must_not_contain_any_line()
Update tests to use them. Remove "import string" lines where the
change made them unnecessary.
Diffstat (limited to 'test/CC')
| -rw-r--r-- | test/CC/CFLAGS.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/CC/CFLAGS.py b/test/CC/CFLAGS.py index f14fcc5..6ccf7e2 100644 --- a/test/CC/CFLAGS.py +++ b/test/CC/CFLAGS.py @@ -24,7 +24,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" -import sys, string +import sys import TestSCons test = TestSCons.TestSCons() @@ -38,8 +38,8 @@ print env.subst('$SHCXXCOM') print env.subst('$SHCXXCOMSTR') """) test.run(arguments = '.') -test.fail_test(string.find(test.stdout(), "-xyz") != -1) -test.fail_test(string.find(test.stdout(), "-abc") == -1) +test.must_not_contain_any_line(test.stdout(), ["-xyz"]) +test.must_contain_all_lines(test.stdout(), ["-abc"]) # Test passing CFLAGS to C compiler by actually compiling programs |