summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-06-07 18:58:42 (GMT)
committerGreg Noel <GregNoel@tigris.org>2010-06-07 18:58:42 (GMT)
commitd783379d12cf14d3a0d169ef78a230e15ebc072a (patch)
tree5536c5067cc609b6fe12a655807b0a85b8a4ce43 /test
parent7e4dcd7b2852453a33c2f54339193c31958fe869 (diff)
downloadSCons-d783379d12cf14d3a0d169ef78a230e15ebc072a.zip
SCons-d783379d12cf14d3a0d169ef78a230e15ebc072a.tar.gz
SCons-d783379d12cf14d3a0d169ef78a230e15ebc072a.tar.bz2
Fixed a bug in the regression test to use the right filenames for each
platform; it was causing the test to fail on Windows. Added some documentation to bin/update-release-info.py. In my last log message, I forgot to mention that QMTest/TestRuntest.py was tweaked to make it less specialized for testing runtest.py. It can now be used to test other programs; in this case, bin/update-release-info.py. The defaults are unchanged so that it will normally test runtest.py.
Diffstat (limited to 'test')
-rw-r--r--test/update-release-info.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/test/update-release-info.py b/test/update-release-info.py
index 38371fd..4de60df 100644
--- a/test/update-release-info.py
+++ b/test/update-release-info.py
@@ -21,7 +21,8 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
"""
-XXX Put a description of the test here.
+Test bin/update-release-info.py. Also verify that the original files
+have the appropriate triggers to cause the modifications.
"""
__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
@@ -162,15 +163,13 @@ unsupported_python_version = Not done with junk
deprecated_python_version = It goes on forever
""")
-combo_run(0, 7, stdout =
-"""Updating src%(sep)sCHANGES.txt...
-Updating src%(sep)sRELEASE.txt...
-Updating src%(sep)sAnnounce.txt...
-Updating SConstruct...
-Updating README...
-Updating QMTest%(sep)sTestSCons.py...
-Updating src%(sep)sengine%(sep)sSCons%(sep)sScript%(sep)sMain.py...
-""" % {'sep':os.sep})
+def updating_run(*args):
+ stdout = ''
+ for file in args:
+ stdout += 'Updating %s...\n' % os.path.join(*file)
+ combo_run(0, 7, stdout = stdout)
+
+updating_run(CHANGES, RELEASE, Announce, SConstruct, README, TestSCons, Main)
test.must_match(CHANGES, """
RELEASE 2.0.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE