Make match_exact the default match function for TestSCons.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@74 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index 314198942401d0b26e5affaf117c68d6083761d4..959e568df64e696b53fda8d5d2f411140e116f4d 100644 (file)
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -45,6 +45,7 @@ class TestSCons(TestCmd.TestCmd):
                program = 'scons' if it exists,
                          else 'scons.py'
                interpreter = 'python'
+               match = TestCmd.match_exact
                workdir = ''
 
         The workdir value means that, by default, a temporary workspace
@@ -60,6 +61,8 @@ class TestSCons(TestCmd.TestCmd):
                kw['program'] = 'scons.py'
        if not kw.has_key('interpreter'):
            kw['interpreter'] = 'python'
+       if not kw.has_key('match'):
+           kw['match'] = TestCmd.match_exact
        if not kw.has_key('workdir'):
            kw['workdir'] = ''
        apply(TestCmd.TestCmd.__init__, [self], kw)

diff --git a/test/SCONSFLAGS.py b/test/SCONSFLAGS.py
index 274ab47a8e40c41584d484dcb27028975032f421..3ae3a79827f59220705de8d2d6418b9c09cfb1ef 100644 (file)
--- a/test/SCONSFLAGS.py
+++ b/test/SCONSFLAGS.py
@@ -2,11 +2,12 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import TestCmd
+import TestSCons
 import os
 import string
-import TestSCons
 
-test = TestSCons.TestSCons()
+test = TestSCons.TestSCons(match = TestCmd.match_re)
 
 wpath = test.workpath()
 

diff --git a/test/SConstruct.py b/test/SConstruct.py
index 8837b62ddeb0801b90b7687537411403dcf526ad..6f1ce2540c60b8d4b0b5b54e09eb1b82959aeff1 100644 (file)
--- a/test/SConstruct.py
+++ b/test/SConstruct.py
@@ -2,9 +2,10 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import TestCmd
 import TestSCons
 
-test = TestSCons.TestSCons()
+test = TestSCons.TestSCons(match = TestCmd.match_re)
 
 test.run(stdout = "",
        stderr = """
@@ -12,6 +13,8 @@ SCons error: No SConstruct file found.
 File "\S+scons(\.py)?", line \d+, in main
 """)
 
+test.match_func = TestCmd.match_exact
+
 wpath = test.workpath()
 
 test.write('sconstruct', """

diff --git a/test/errors.py b/test/errors.py
index f94ebe5cd3ec08ba4d515cece63711a909106bcf..545db5a0be9bec4d2333b63a268d48fb0254f2af 100644 (file)
--- a/test/errors.py
+++ b/test/errors.py
@@ -2,9 +2,10 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import TestCmd
 import TestSCons
 
-test = TestSCons.TestSCons()
+test = TestSCons.TestSCons(match = TestCmd.match_re)
 
 test.write('SConstruct1', """
 a ! x

diff --git a/test/exitfns.py b/test/exitfns.py
index 49afa932b751800d5c704f61c66efb39869b3e29..cc478c8aeb5fe84a8f2662323a020f5a64b7b5f0 100644 (file)
--- a/test/exitfns.py
+++ b/test/exitfns.py
@@ -2,10 +2,9 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
-import TestCmd
 import TestSCons
 
-test = TestSCons.TestSCons(match = TestCmd.match_exact)
+test = TestSCons.TestSCons()
 
 sconstruct = """
 from SCons.exitfuncs import *

diff --git a/test/option-unknown.py b/test/option-unknown.py
index 28d3ceb84cd321d72a1ce757ea2f192f08c1fa4c..7240b9651c40b44333f5d75a1d216370280fb03d 100644 (file)
--- a/test/option-unknown.py
+++ b/test/option-unknown.py
@@ -2,11 +2,12 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import TestCmd
 import TestSCons
 import string
 import sys
 
-test = TestSCons.TestSCons()
+test = TestSCons.TestSCons(match = TestCmd.match_re)
 
 test.write('SConstruct', "")
 
@@ -17,4 +18,3 @@ test.run(arguments = '--ZizzerZazzerZuzz',
         stderr = '\nSCons error: option --ZizzerZazzerZuzz not recognized\nFile "\S+", line \d+, in long_has_args\n')
 
 test.pass_test()
- 

diff --git a/test/option-v.py b/test/option-v.py
index b65e4d058ec62e3430ca508883fbad9803412dbd..5f67b05cff923ded02c4059f9c9b38bf104467ed 100644 (file)
--- a/test/option-v.py
+++ b/test/option-v.py
@@ -2,11 +2,12 @@
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import TestCmd
 import TestSCons
 import string
 import sys
 
-test = TestSCons.TestSCons()
+test = TestSCons.TestSCons(match = TestCmd.match_re)
 
 test.write('SConstruct', "")