diff options
author | Steven Knight <knight@baldmt.com> | 2003-05-02 04:09:02 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2003-05-02 04:09:02 (GMT) |
commit | 77568a787451a72ef62198db424ac62bbaf50294 (patch) | |
tree | 1c9a820e32ea1a4eb89d70d9ef895ed6557cb2a4 /test/build-errors.py | |
parent | 8adc0857c2ebd976314a29ca338d6ce82ece251f (diff) | |
download | SCons-77568a787451a72ef62198db424ac62bbaf50294.zip SCons-77568a787451a72ef62198db424ac62bbaf50294.tar.gz SCons-77568a787451a72ef62198db424ac62bbaf50294.tar.bz2 |
Fix regression tests that use test.whereis(). (Anthony Roach)
Diffstat (limited to 'test/build-errors.py')
-rw-r--r-- | test/build-errors.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/build-errors.py b/test/build-errors.py index ac6e066..e4e1666 100644 --- a/test/build-errors.py +++ b/test/build-errors.py @@ -77,9 +77,9 @@ elif string.find(sys.platform, 'irix') != -1: scons: *** [f1] Error 127 """ % no_such_file) else: - test.fail_test(test.stderr() != """sh: %s: No such file or directory + test.fail_test(string.find(test.stderr(), """%s: No such file or directory scons: *** [f1] Error 127 -""" % no_such_file) +""" % no_such_file) == -1) test.write('SConstruct2', r""" @@ -106,9 +106,9 @@ elif string.find(sys.platform, 'irix') != -1: scons: *** [f2] Error 126 """ % not_executable) else: - test.fail_test(test.stderr() != """sh: %s: Permission denied + test.fail_test(string.find(test.stderr(), """%s: Permission denied scons: *** [f2] Error 126 -""" % not_executable) +""" % not_executable) == -1) test.write('SConstruct3', r""" bld = Builder(action = '%s $SOURCES $TARGET') @@ -134,8 +134,8 @@ elif string.find(sys.platform, 'irix') != -1: scons: *** [f3] Error 126 """ % test.workdir) else: - test.fail_test(test.stderr() != """sh: %s: is a directory + test.fail_test(string.find(test.stderr(), """%s: is a directory scons: *** [f3] Error 126 -""" % test.workdir) +""" % test.workdir) == -1) test.pass_test() |