summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/regexp.test16
-rw-r--r--tests/regexpComp.test14
2 files changed, 19 insertions, 11 deletions
diff --git a/tests/regexp.test b/tests/regexp.test
index e5b2bd8..86ee8c8 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.23 2003/06/17 20:36:20 vincentdarley Exp $
+# RCS: @(#) $Id: regexp.test,v 1.24 2003/10/07 04:48:38 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}