diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/cmdAH.test | 6 | ||||
| -rw-r--r-- | tests/fileName.test | 9 | ||||
| -rw-r--r-- | tests/pkgMkIndex.test | 18 |
3 files changed, 19 insertions, 14 deletions
diff --git a/tests/cmdAH.test b/tests/cmdAH.test index 973ecad..cd0cce8 100644 --- a/tests/cmdAH.test +++ b/tests/cmdAH.test @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: cmdAH.test,v 1.19 2002/04/08 09:02:11 das Exp $ +# RCS: @(#) $Id: cmdAH.test,v 1.20 2002/05/07 18:03:04 vincentdarley Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -60,7 +60,7 @@ test cmdAH-2.3 {Tcl_CdObjCmd} { file mkdir foo cd foo cd ~ - set result [string match [pwd] $oldpwd] + set result [string equal [pwd] $oldpwd] file delete foo set env(HOME) $temp set result @@ -74,7 +74,7 @@ test cmdAH-2.4 {Tcl_CdObjCmd} { file mkdir foo cd foo cd - set result [string match [pwd] $oldpwd] + set result [string equal [pwd] $oldpwd] file delete foo set env(HOME) $temp set result diff --git a/tests/fileName.test b/tests/fileName.test index 3d34e70..9289bc9 100644 --- a/tests/fileName.test +++ b/tests/fileName.test @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: fileName.test,v 1.19 2002/05/02 20:15:20 vincentdarley Exp $ +# RCS: @(#) $Id: fileName.test,v 1.20 2002/05/07 18:03:05 vincentdarley Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -1272,6 +1272,11 @@ test filename-11.21 {Tcl_GlobCmd} { list [catch {lsort [glob -type d -path $globname *]} msg] $msg } [list 0 [lsort [list $globname]]] +# Get rid of file/dir if it exists, since it will have +# been left behind by a previous failed run. +if {[file exists $horribleglobname]} { + file delete -force $horribleglobname +} file rename globTest $horribleglobname set globname $horribleglobname @@ -1769,7 +1774,7 @@ test filename-16.15 {windows specific globbing} {pcOnly} { glob .. } {..} test filename-16.16 {windows specific globbing} {pcOnly} { - file tail [glob "[lindex [glob -types d -dir C:/ *] 0]/.."] + file tail [lindex [glob "[lindex [glob -types d -dir C:/ *] 0]/.."] 0] } {..} # cleanup diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test index 76476f0..79a6b52 100644 --- a/tests/pkgMkIndex.test +++ b/tests/pkgMkIndex.test @@ -8,7 +8,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: pkgMkIndex.test,v 1.18 2001/01/12 09:54:16 dkf Exp $ +# RCS: @(#) $Id: pkgMkIndex.test,v 1.19 2002/05/07 18:03:05 vincentdarley Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -270,11 +270,11 @@ test pkgMkIndex-2.1 {simple package} { test pkgMkIndex-2.2 {simple package - use -direct} { pkgtest::runIndex -direct $fullPkgPath simple.tcl -} "0 {{simple:1.0 {source [file join $fullPkgPath simple.tcl]}}}" +} "0 {{simple:1.0 {[list source [file join $fullPkgPath simple.tcl]]}}}" test pkgMkIndex-2.3 {simple package - direct loading is default} { pkgtest::runIndex $fullPkgPath simple.tcl -} "0 {{simple:1.0 {source [file join $fullPkgPath simple.tcl]}}}" +} "0 {{simple:1.0 {[list source [file join $fullPkgPath simple.tcl]]}}}" test pkgMkIndex-3.1 {simple package with global symbols} { pkgtest::runIndex -lazy $fullPkgPath global.tcl @@ -286,8 +286,8 @@ test pkgMkIndex-4.1 {split package} { test pkgMkIndex-4.2 {split package - direct loading} { pkgtest::runIndex -direct $fullPkgPath pkg2_a.tcl pkg2_b.tcl -} "0 {{pkg2:1.0 {source [file join $fullPkgPath pkg2_a.tcl] -source [file join $fullPkgPath pkg2_b.tcl]}}}" +} "0 {{pkg2:1.0 {[list source [file join $fullPkgPath pkg2_a.tcl]] +[list source [file join $fullPkgPath pkg2_b.tcl]]}}}" # This will fail, with "direct1" procedures in the list of procedures # provided by std. @@ -305,7 +305,7 @@ test pkgMkIndex-6.1 {pkg1 requires pkg3} { test pkgMkIndex-6.2 {pkg1 requires pkg3 - use -direct} { pkgtest::runIndex -direct $fullPkgPath pkg1.tcl pkg3.tcl -} "0 {{pkg1:1.0 {source [file join $fullPkgPath pkg1.tcl]}} {pkg3:1.0 {source [file join $fullPkgPath pkg3.tcl]}}}" +} "0 {{pkg1:1.0 {[list source [file join $fullPkgPath pkg1.tcl]]}} {pkg3:1.0 {[list source [file join $fullPkgPath pkg3.tcl]]}}}" test pkgMkIndex-7.1 {pkg4 uses pkg3} { pkgtest::runIndex -lazy $fullPkgPath pkg4.tcl pkg3.tcl @@ -313,7 +313,7 @@ test pkgMkIndex-7.1 {pkg4 uses pkg3} { test pkgMkIndex-7.2 {pkg4 uses pkg3 - use -direct} { pkgtest::runIndex -direct $fullPkgPath pkg4.tcl pkg3.tcl -} "0 {{pkg3:1.0 {source [file join $fullPkgPath pkg3.tcl]}} {pkg4:1.0 {source [file join $fullPkgPath pkg4.tcl]}}}" +} "0 {{pkg3:1.0 {[list source [file join $fullPkgPath pkg3.tcl]]}} {pkg4:1.0 {[list source [file join $fullPkgPath pkg4.tcl]]}}}" test pkgMkIndex-8.1 {pkg5 uses pkg2} { pkgtest::runIndex -lazy $fullPkgPath pkg5.tcl pkg2_a.tcl pkg2_b.tcl @@ -321,8 +321,8 @@ test pkgMkIndex-8.1 {pkg5 uses pkg2} { test pkgMkIndex-8.2 {pkg5 uses pkg2 - use -direct} { pkgtest::runIndex -direct $fullPkgPath pkg5.tcl pkg2_a.tcl pkg2_b.tcl -} "0 {{pkg2:1.0 {source [file join $fullPkgPath pkg2_a.tcl] -source [file join $fullPkgPath pkg2_b.tcl]}} {pkg5:1.0 {source [file join $fullPkgPath pkg5.tcl]}}}" +} "0 {{pkg2:1.0 {[list source [file join $fullPkgPath pkg2_a.tcl]] +[list source [file join $fullPkgPath pkg2_b.tcl]]}} {pkg5:1.0 {[list source [file join $fullPkgPath pkg5.tcl]]}}}" test pkgMkIndex-9.1 {circular packages} { pkgtest::runIndex -lazy $fullPkgPath circ1.tcl circ2.tcl circ3.tcl |