summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2003-10-07 04:48:07 (GMT)
committerdgp <dgp@users.sourceforge.net>2003-10-07 04:48:07 (GMT)
commitcc08946ddcd033c47f905e13d9be46cb1ef0b385 (patch)
treea020fcbbe489998d136a4a9880484831e889838f
parentf0b3bab433064ab445e23607e9486f419e3ab8b5 (diff)
downloadtcl-cc08946ddcd033c47f905e13d9be46cb1ef0b385.zip
tcl-cc08946ddcd033c47f905e13d9be46cb1ef0b385.tar.gz
tcl-cc08946ddcd033c47f905e13d9be46cb1ef0b385.tar.bz2
* tests/regexp.test: Matched [makeFile] with [removeFile].
* tests/regexpComp.test: [Bug 675652]
-rw-r--r--ChangeLog3
-rw-r--r--tests/regexp.test16
-rw-r--r--tests/regexpComp.test14
3 files changed, 22 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 190c24c..07dd267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2003-10-06 Don Porter <dgp@users.sourceforge.net>
+ * tests/regexp.test: Matched [makeFile] with [removeFile].
+ * tests/regexpComp.test: [Bug 675652]
+
* tests/fCmd.test (fCmd-8.2): Test only that tilde-substitution
happens, not for any particular result. [Bug 685991]
diff --git a/tests/regexp.test b/tests/regexp.test
index af27771..08ec147 100644
--- a/tests/regexp.test
+++ b/tests/regexp.test
@@ -11,10 +11,10 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: regexp.test,v 1.22.2.1 2003/06/17 20:42:37 vincentdarley Exp $
+# RCS: @(#) $Id: regexp.test,v 1.22.2.2 2003/10/07 04:48:07 dgp Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
- package require tcltest
+ package require tcltest 2
namespace import -force ::tcltest::*
}
@@ -434,11 +434,15 @@ test regexp-14.2 {CompileRegexp: regexp cache, different flags} {
} 1
testConstraint exec [llength [info commands exec]]
-test regexp-14.3 {CompileRegexp: regexp cache, empty regexp and empty cache} {
+test regexp-14.3 {CompileRegexp: regexp cache, empty regexp and empty cache} -constraints {
exec
-} {
- exec [interpreter] [makeFile {puts [regexp {} foo]} junk.tcl]
-} 1
+} -setup {
+ set junk [makeFile {puts [regexp {} foo]} junk.tcl]
+} -body {
+ exec [interpreter] $junk
+} -cleanup {
+ removeFile junk.tcl
+} -result 1
test regexp-15.1 {regexp -start} {
catch {unset x}
diff --git a/tests/regexpComp.test b/tests/regexpComp.test
index 6665e63..b8600dd 100644
--- a/tests/regexpComp.test
+++ b/tests/regexpComp.test
@@ -14,7 +14,7 @@
# RCS: @(#) $Id$
if {[lsearch [namespace children] ::tcltest] == -1} {
- package require tcltest
+ package require tcltest 2
namespace import -force ::tcltest::*
}
@@ -593,11 +593,15 @@ test regexp-14.2 {CompileRegexp: regexp cache, different flags} {
} 1
testConstraint exec [llength [info commands exec]]
-test regexp-14.3 {CompileRegexp: regexp cache, empty regexp and empty cache} {
+test regexp-14.3 {CompileRegexp: regexp cache, empty regexp and empty cache} -constraints {
exec
-} {
- exec [interpreter] [makeFile {puts [regexp {} foo]} junk.tcl]
-} 1
+} -setup {
+ set junk [makeFile {puts [regexp {} foo]} junk.tcl]
+} -body {
+ exec [interpreter] $junk
+} -cleanup {
+ removeFile junk.tcl
+} -result 1
test regexp-15.1 {regexp -start} {
catch {unset x}