diff options
| author | Steven Knight <knight@baldmt.com> | 2004-09-21 22:29:07 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-09-21 22:29:07 (GMT) |
| commit | 51fee8699e9d5f64a9ae5e06c0c1acaa7c084185 (patch) | |
| tree | 27545b59a33400658211928d8c8e55efcfd9084d /etc | |
| parent | 7700eb55bbf0da1e084ea4bd29212a8560376f55 (diff) | |
| download | SCons-51fee8699e9d5f64a9ae5e06c0c1acaa7c084185.zip SCons-51fee8699e9d5f64a9ae5e06c0c1acaa7c084185.tar.gz SCons-51fee8699e9d5f64a9ae5e06c0c1acaa7c084185.tar.bz2 | |
Better test infrastructure for cleaning (-c) messages. (Kevin Quick)
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/TestSCons.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/TestSCons.py b/etc/TestSCons.py index 0a5469b..64bb90d 100644 --- a/etc/TestSCons.py +++ b/etc/TestSCons.py @@ -165,18 +165,20 @@ class TestSCons(TestCommon): return None return env.Detect([prog]) - def wrap_stdout(self, build_str = "", read_str = "", error = 0): + def wrap_stdout(self, build_str = "", read_str = "", error = 0, cleaning = 0): """Wraps standard output string(s) in the normal "Reading ... done" and "Building ... done" strings """ + cap,lc = [ ('Build','build'), + ('Clean','clean') ][cleaning] if error: - term = "scons: building terminated because of errors.\n" + term = "scons: %sing terminated because of errors.\n" % lc else: - term = "scons: done building targets.\n" + term = "scons: done %sing targets.\n" % lc return "scons: Reading SConscript files ...\n" + \ read_str + \ "scons: done reading SConscript files.\n" + \ - "scons: Building targets ...\n" + \ + "scons: %sing targets ...\n" % cap + \ build_str + \ term |