From 78b19eb0cf87919273d02fb4b527223ad94b0e0b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 25 Feb 2005 22:37:52 +0000
Subject: backport tcltest test improvements
---
tests/tcltest.test | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/tests/tcltest.test b/tests/tcltest.test
index 5397e1e..7d3b1c4 100755
--- a/tests/tcltest.test
+++ b/tests/tcltest.test
@@ -6,7 +6,7 @@
# Copyright (c) 2000 by Ajuba Solutions
# All rights reserved.
#
-# RCS: @(#) $Id: tcltest.test,v 1.37.2.9 2005/02/24 18:03:37 dgp Exp $
+# RCS: @(#) $Id: tcltest.test,v 1.37.2.10 2005/02/25 22:37:52 dgp Exp $
# Note that there are several places where the value of
# tcltest::currentFailure is stored/reset in the -setup/-cleanup
@@ -561,7 +561,7 @@ switch $tcl_platform(platform) {
}
}
-test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {unixOnly notRoot} {
+test tcltest-8.3 {tcltest a.tcl -tmpdir notReadableDir} {unix notRoot} {
slave msg $a -tmpdir $notReadableDir
string match {*not readable*} $msg
} {1}
@@ -621,7 +621,7 @@ test tcltest-8.11 {tcltest a.tcl -testdir thisdirectoryisafile} {unixOrPc} {
string match "*not a directory*" $msg
} {1}
-test tcltest-8.12 {tcltest a.tcl -testdir notReadableDir} {unixOnly notRoot} {
+test tcltest-8.12 {tcltest a.tcl -testdir notReadableDir} {unix notRoot} {
slave msg $a -testdir $notReadableDir
string match {*not readable*} $msg
} {1}
@@ -699,23 +699,23 @@ removeFile thisdirectoryisafile
removeDirectory normaldirectory
# -file, -notfile, [matchFiles], [skipFiles]
-test tcltest-9.1 {-file a*.tcl} -constraints {unixOrPc} -setup {
+test tcltest-9.1 {-file d*.tcl} -constraints {unixOrPc} -setup {
set old [testsDirectory]
testsDirectory [file dirname [info script]]
} -body {
- slave msg [file join [testsDirectory] all.tcl] -file as*.test
+ slave msg [file join [testsDirectory] all.tcl] -file d*.test
set msg
} -cleanup {
testsDirectory $old
-} -match regexp -result {assocd\.test}
+} -match regexp -result {dstring\.test}
-test tcltest-9.2 {-file a*.tcl} -constraints {unixOrPc} -setup {
+test tcltest-9.2 {-file d*.tcl} -constraints {unixOrPc} -setup {
set old [testsDirectory]
testsDirectory [file dirname [info script]]
} -body {
slave msg [file join [testsDirectory] all.tcl] \
- -file as*.test -notfile assocd*
- regexp {assocd\.test} $msg
+ -file d*.test -notfile dstring*
+ regexp {dstring\.test} $msg
} -cleanup {
testsDirectory $old
} -result 0
@@ -747,16 +747,18 @@ test tcltest-9.4 {skipFiles} {
}
test tcltest-9.5 {GetMatchingFiles: Bug 1119798} -setup {
- file copy [file join [file dirname [info script]] all.tcl] [temporaryDirectory]
- makeDirectory foo
- makeFile {} fee
+ set d [makeDirectory tmp]
+ makeDirectory foo $d
+ makeFile {} fee $d
+ file copy [file join [file dirname [info script]] all.tcl] $d
} -body {
slave msg [file join [temporaryDirectory] all.tcl] -file f*
regexp {exiting with errors:} $msg
} -cleanup {
- removeFile fee
- removeDirectory foo
- file delete [file join [temporaryDirectory] all.tcl]
+ file delete [file join $d all.tcl]
+ removeFile fee $d
+ removeDirectory foo $d
+ removeDirectory tmp
} -result 0
# -preservecore, [preserveCore]
--
cgit v0.12