diff options
| author | Steven Knight <knight@baldmt.com> | 2009-07-24 16:30:08 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-07-24 16:30:08 (GMT) |
| commit | f1ac141da175ed8939044f9a55146980cf4634a8 (patch) | |
| tree | f5b5919c4ab0244fefb6cde50eac274455c1a895 /test | |
| parent | 10dc447016536d663d6031edc04e09cc50948130 (diff) | |
| download | SCons-f1ac141da175ed8939044f9a55146980cf4634a8.zip SCons-f1ac141da175ed8939044f9a55146980cf4634a8.tar.gz SCons-f1ac141da175ed8939044f9a55146980cf4634a8.tar.bz2 | |
Update the Test{Cmd,Common}.py 0.36, with better diff reporting
(specifically of output matches using regular expressions).
Update tests for corresponding inteface changes.
Add use of diff_re() to test/sconsign/script/Configure.py
so we can get accurate information about its buildbot failure.
Diffstat (limited to 'test')
| -rw-r--r-- | test/SConstruct.py | 2 | ||||
| -rw-r--r-- | test/option-n.py | 3 | ||||
| -rw-r--r-- | test/scons-time/run/option/quiet.py | 4 | ||||
| -rw-r--r-- | test/scons-time/run/option/verbose.py | 4 | ||||
| -rw-r--r-- | test/sconsign/script/Configure.py | 3 |
5 files changed, 9 insertions, 7 deletions
diff --git a/test/SConstruct.py b/test/SConstruct.py index 4b80f3e..f061728 100644 --- a/test/SConstruct.py +++ b/test/SConstruct.py @@ -36,7 +36,7 @@ test.run(arguments = ".", scons: \*\*\* No SConstruct file found. """ + TestSCons.file_expr) -test.match_func = TestCmd.match_exact +test.match_function = TestCmd.match_exact wpath = test.workpath() diff --git a/test/option-n.py b/test/option-n.py index abb0284..b8dde0f 100644 --- a/test/option-n.py +++ b/test/option-n.py @@ -168,7 +168,8 @@ test.fail_test(os.path.exists(test.workpath('build', 'f4.in'))) # test Configure-calls in conjunction with -n test.subdir('configure') -test.match_func = TestSCons.match_re_dotall +test.match_function = TestSCons.match_re_dotall +test.diff_function = TestSCons.diff_re test.write('configure/SConstruct', """def CustomTest(context): def userAction(target,source,env): diff --git a/test/scons-time/run/option/quiet.py b/test/scons-time/run/option/quiet.py index 58b5e82..2910e8e 100644 --- a/test/scons-time/run/option/quiet.py +++ b/test/scons-time/run/option/quiet.py @@ -34,8 +34,8 @@ import TestSCons_time python = TestSCons_time.python -test = TestSCons_time.TestSCons_time(match = TestSCons_time.match_re) -test.diff_function = TestSCons_time.diff_re +test = TestSCons_time.TestSCons_time(match = TestSCons_time.match_re, + diff = TestSCons_time.diff_re) scons_py = re.escape(test.workpath('src', 'script', 'scons.py')) src_engine = re.escape(test.workpath('src', 'engine')) diff --git a/test/scons-time/run/option/verbose.py b/test/scons-time/run/option/verbose.py index 8b0be4a..7f693d1 100644 --- a/test/scons-time/run/option/verbose.py +++ b/test/scons-time/run/option/verbose.py @@ -35,8 +35,8 @@ import TestSCons_time _python_ = re.escape(TestSCons_time._python_) -test = TestSCons_time.TestSCons_time(match = TestSCons_time.match_re) -test.diff_function = TestSCons_time.diff_re +test = TestSCons_time.TestSCons_time(match = TestSCons_time.match_re, + diff = TestSCons_time.diff_re) scons_py = re.escape(test.workpath('src', 'script', 'scons.py')) src_engine = re.escape(test.workpath('src', 'engine')) diff --git a/test/sconsign/script/Configure.py b/test/sconsign/script/Configure.py index fb54dd2..865b607 100644 --- a/test/sconsign/script/Configure.py +++ b/test/sconsign/script/Configure.py @@ -37,7 +37,8 @@ import TestSConsign _obj = TestSCons._obj -test = TestSConsign.TestSConsign(match = TestSConsign.match_re) +test = TestSConsign.TestSConsign(match = TestSConsign.match_re, + diff = TestSConsign.diff_re) CC = test.detect('CC', norm=1) CC_dir, CC_file = os.path.split(CC) |