diff options
author | Greg Noel <GregNoel@tigris.org> | 2010-06-07 09:33:56 (GMT) |
---|---|---|
committer | Greg Noel <GregNoel@tigris.org> | 2010-06-07 09:33:56 (GMT) |
commit | 309df4ac53e3c96e642db2cfa215125c15a7e6ed (patch) | |
tree | 7584e3b8c7630fd681be01b5747760035b9fbe0b /QMTest | |
parent | 4342bb15a6592e9a29716523902d717aaa841ccc (diff) | |
download | SCons-309df4ac53e3c96e642db2cfa215125c15a7e6ed.zip SCons-309df4ac53e3c96e642db2cfa215125c15a7e6ed.tar.gz SCons-309df4ac53e3c96e642db2cfa215125c15a7e6ed.tar.bz2 |
Initial drop of bin/update-release-info.py.
This program automates the process of inserting the release configuration
information that is currently done by hand. The configuration data now
all lives in a file, 'ReleaseConfig'. Change the configuration file, run
the program, and, hey presto, the files are updated.
More work needs to be done; the documentation doesn't quite match with the
program and the regression tests only cover the release flows, but it's
important to get this stuff out before the next release is published so
people can start using it.
Diffstat (limited to 'QMTest')
-rw-r--r-- | QMTest/TestRuntest.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/QMTest/TestRuntest.py b/QMTest/TestRuntest.py index c8b5893..6682514 100644 --- a/QMTest/TestRuntest.py +++ b/QMTest/TestRuntest.py @@ -101,10 +101,8 @@ class TestRuntest(TestCommon): temporary directory, duplicating how this test infrastructure appears in a normal workspace. """ - set_workpath_runtest = None if 'program' not in kw: kw['program'] = 'runtest.py' - set_workpath_runtest = 1 if 'interpreter' not in kw: kw['interpreter'] = [python, '-tt'] if 'match' not in kw: @@ -119,6 +117,16 @@ class TestRuntest(TestCommon): else: del kw['noqmtest'] + try: + things_to_copy = kw['things_to_copy'] + except KeyError: + things_to_copy = [ + 'runtest.py', + 'QMTest', + ] + else: + del kw['things_to_copy'] + orig_cwd = os.getcwd() TestCommon.__init__(self, **kw) @@ -127,11 +135,6 @@ class TestRuntest(TestCommon): if not qmtest: self.skip_test("Could not find 'qmtest'; skipping test(s).\n") - things_to_copy = [ - 'runtest.py', - 'QMTest', - ] - dirs = [os.environ.get('SCONS_RUNTEST_DIR', orig_cwd)] spe = os.environ.get('SCONS_SOURCE_PATH_EXECUTABLE', orig_cwd) @@ -150,8 +153,7 @@ class TestRuntest(TestCommon): copy_func(t, self.workpath(thing)) break - if set_workpath_runtest: - self.program_set(self.workpath('runtest.py')) + self.program_set(self.workpath(kw['program'])) for key in os.environ.keys(): if key[:5] == 'AEGIS': |