From 6855a1fa6afb4654fbdd7614af54edae396a2474 Mon Sep 17 00:00:00 2001 From: dkf Date: Mon, 25 Oct 2004 21:52:41 +0000 Subject: Remove some of the contortions from cmdAH-8.45 --- ChangeLog | 5 +++++ tests/cmdAH.test | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98494f5..61dd902 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-25 Donal K. Fellows + + * tests/cmdAH.test (cmdAH-8.45): Simplify in the hope that the + reasons for [Bug 1053908] will become clearer. + 2004-10-25 Don Porter * generic/tclExecute.c (IllegalExprOperandType,TclExecuteByteCode): diff --git a/tests/cmdAH.test b/tests/cmdAH.test index 2ecb291..a448874 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.44 2004/09/27 15:00:40 vincentdarley Exp $ +# RCS: @(#) $Id: cmdAH.test,v 1.45 2004/10/25 21:52:42 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2.1 @@ -361,16 +361,18 @@ test cmdAH-8.44 {Tcl_FileObjCmd: dirname} testsetplatform { test cmdAH-8.45 {Tcl_FileObjCmd: dirname} { -constraints {Tcltest testsetplatform} -match regexp + -setup { + set temp $::env(HOME) + } -body { - global env - set temp $env(HOME) - set env(HOME) "/homewontexist/test" + set ::env(HOME) "/homewontexist/test" testsetplatform windows - set result [list [catch {file dirname ~} msg] $msg] - set env(HOME) $temp - set result + file dirname ~ } - -result {{0 ([a-zA-Z]:?)/homewontexist}} + -cleanup { + set ::env(HOME) $temp + } + -result {([a-zA-Z]:?)/homewontexist} } test cmdAH-8.46 {Tcl_FileObjCmd: dirname} { -- cgit v0.12