summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2001-09-29 03:22:21 (GMT)
committerSteven Knight <knight@baldmt.com>2001-09-29 03:22:21 (GMT)
commit39bc5ccf18d346c14ade0cce6e6f46e53b88fd97 (patch)
treeecaa1c4b2a002298458f72d48e131d5534079c30 /test
parent8a28cfb1801cbada701e471b7ca9ea78db137221 (diff)
downloadSCons-39bc5ccf18d346c14ade0cce6e6f46e53b88fd97.zip
SCons-39bc5ccf18d346c14ade0cce6e6f46e53b88fd97.tar.gz
SCons-39bc5ccf18d346c14ade0cce6e6f46e53b88fd97.tar.bz2
Make match_exact the default match function for TestSCons.
Diffstat (limited to 'test')
-rw-r--r--test/SCONSFLAGS.py5
-rw-r--r--test/SConstruct.py5
-rw-r--r--test/errors.py3
-rw-r--r--test/exitfns.py3
-rw-r--r--test/option-unknown.py4
-rw-r--r--test/option-v.py3
6 files changed, 14 insertions, 9 deletions
diff --git a/test/SCONSFLAGS.py b/test/SCONSFLAGS.py
index 274ab47..3ae3a79 100644
--- 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 8837b62..6f1ce25 100644
--- 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 f94ebe5..545db5a 100644
--- 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 49afa93..cc478c8 100644
--- 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 28d3ceb..7240b96 100644
--- 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 b65e4d0..5f67b05 100644
--- 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', "")