diff options
Diffstat (limited to 'tests/pkgMkIndex.test')
| -rw-r--r-- | tests/pkgMkIndex.test | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/pkgMkIndex.test b/tests/pkgMkIndex.test index cf3509d..958acaf 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.24 2003/07/24 08:45:09 rmax Exp $ +# RCS: @(#) $Id: pkgMkIndex.test,v 1.25 2003/11/14 20:44:46 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -89,7 +89,7 @@ proc pkgtest::parseIndex { filePath } { set ver [lindex $args 2] set ::PKGS($pkg:$ver) [lindex $args 3] } else { - return [eval package_original $args] + return [package_original {expand}$args] } } array set ::PKGS {} @@ -148,7 +148,7 @@ proc pkgtest::parseIndex { filePath } { # 1: the error result if element 0 was 1 proc pkgtest::createIndex { args } { - set parsed [eval parseArgs $args] + set parsed [parseArgs {expand}$args] set options [lindex $parsed 0] set dirPath [lindex $parsed 1] set patternList [lindex $parsed 2] @@ -157,7 +157,7 @@ proc pkgtest::createIndex { args } { if {[catch { file delete [file join $dirPath pkgIndex.tcl] - eval pkg_mkIndex $options [list $dirPath] $patternList + pkg_mkIndex {expand}$options $dirPath {expand}$patternList } err]} { return [list 1 $err] } @@ -231,7 +231,7 @@ proc makePkgList { inList } { proc pkgtest::runCreatedIndex {rv args} { if {[lindex $rv 0] == 0} { - set parsed [eval parseArgs $args] + set parsed [parseArgs {expand}$args] set dirPath [lindex $parsed 1] set idxFile [file join $dirPath pkgIndex.tcl] @@ -248,8 +248,8 @@ proc pkgtest::runCreatedIndex {rv args} { return $result } proc pkgtest::runIndex { args } { - set rv [eval createIndex $args] - return [eval [list runCreatedIndex $rv] $args] + set rv [createIndex {expand}$args] + return [runCreatedIndex $rv {expand}$args] } # If there is no match to the patterns, make sure the directory hasn't |