diff options
| author | Steven Knight <knight@baldmt.com> | 2010-06-06 00:48:58 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2010-06-06 00:48:58 (GMT) |
| commit | 5bf482c69d08f5ef89e9cb120ae89872b033b287 (patch) | |
| tree | ac058390368dd11f3cdf8fb8b716eb2803b8dd6b /test/explain | |
| parent | 2fc4d8d28cfba093f9d14c4215cee301aa6602c7 (diff) | |
| download | SCons-5bf482c69d08f5ef89e9cb120ae89872b033b287.zip SCons-5bf482c69d08f5ef89e9cb120ae89872b033b287.tar.gz SCons-5bf482c69d08f5ef89e9cb120ae89872b033b287.tar.bz2 | |
Windows portability fixes in various tests. Fix runtest.py detection
of non-zero exit status on systems that don't have os.WEXITSTATUS().
Diffstat (limited to 'test/explain')
| -rw-r--r-- | test/explain/basic.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/explain/basic.py b/test/explain/basic.py index 7b3e512..bca8436 100644 --- a/test/explain/basic.py +++ b/test/explain/basic.py @@ -93,8 +93,8 @@ kscan = Scanner(name = 'kfile', argument = None, skeys = ['.k']) -cat = Builder(action = [[r'%(_python_)s', r'%(cat_py)s', '$TARGET', '$SOURCES']]) -one_cat = Builder( action = [[r'%(_python_)s', r'%(cat_py)s', '$TARGET', '${SOURCES[0]}']]) +cat = Builder(action = [[r'%(python)s', r'%(cat_py)s', '$TARGET', '$SOURCES']]) +one_cat = Builder( action = [[r'%(python)s', r'%(cat_py)s', '$TARGET', '${SOURCES[0]}']]) env = Environment() env.Append(BUILDERS = {'Cat':cat, 'OneCat':one_cat}, @@ -341,9 +341,9 @@ env.AddPreAction(f3, r'%(_python_)s %(cat_py)s ${TARGET}.alt $SOURCES') expect = test.wrap_stdout("""\ scons: rebuilding `file3' because the build action changed: - old: %(_python_)s %(cat_py)s $TARGET $SOURCES + old: %(python)s %(cat_py)s $TARGET $SOURCES new: %(_python_)s %(cat_py)s ${TARGET}.alt $SOURCES - %(_python_)s %(cat_py)s $TARGET $SOURCES + %(python)s %(cat_py)s $TARGET $SOURCES %(_python_)s %(cat_py)s ${TARGET}.yyy $SOURCES yyy %(_python_)s %(cat_py)s file3.alt zzz yyy xxx %(_python_)s %(cat_py)s file3 zzz yyy xxx @@ -369,10 +369,10 @@ env.AddPreAction(f3, r'%(_python_)s %(cat_py)s ${TARGET}.alt $SOURCES') expect = test.wrap_stdout("""\ scons: rebuilding `file3' because the build action changed: old: %(_python_)s %(cat_py)s ${TARGET}.alt $SOURCES - %(_python_)s %(cat_py)s $TARGET $SOURCES + %(python)s %(cat_py)s $TARGET $SOURCES %(_python_)s %(cat_py)s ${TARGET}.yyy $SOURCES yyy new: %(_python_)s %(cat_py)s ${TARGET}.alt $SOURCES - %(_python_)s %(cat_py)s $TARGET $SOURCES + %(python)s %(cat_py)s $TARGET $SOURCES %(_python_)s %(cat_py)s ${TARGET}.yyy $SOURCES xxx %(_python_)s %(cat_py)s file3.alt zzz yyy xxx %(_python_)s %(cat_py)s file3 zzz yyy xxx |