From 55b2cf944b2501328926c9ea94f9036d2ce1f669 Mon Sep 17 00:00:00 2001 From: das Date: Thu, 11 Nov 2004 01:16:05 +0000 Subject: * tests/fileName.test: * tests/fileSystem.test: * tests/io.test: * tests/msgcat.test: * tests/tcltest.test: * tests/unixInit.test: fixed bugs causing failures when running tests with -tmpdir arg not set to working dir. --- tests/fileName.test | 4 ++-- tests/fileSystem.test | 1 + tests/io.test | 6 +++--- tests/msgcat.test | 5 +++-- tests/tcltest.test | 6 +++--- tests/unixInit.test | 6 +++--- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/tests/fileName.test b/tests/fileName.test index 0cf0c1c..1e50b01 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.44 2004/10/07 14:50:23 vincentdarley Exp $ +# RCS: @(#) $Id: fileName.test,v 1.45 2004/11/11 01:16:05 das Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -230,7 +230,7 @@ test filename-4.19 {Tcl_SplitPath} { set norm } err] cd $oldDir - catch {file delete -force tildetmp} + catch {file delete -force [file join [temporaryDirectory] tildetmp]} list $res $err } {0 tildetmp/~tilde} diff --git a/tests/fileSystem.test b/tests/fileSystem.test index 3eb950a..44ba612 100644 --- a/tests/fileSystem.test +++ b/tests/fileSystem.test @@ -31,6 +31,7 @@ testConstraint testfilesystem [llength [info commands ::testfilesystem]] testConstraint testsetplatform [llength [info commands ::testsetplatform]] testConstraint testsimplefilesystem [llength [info commands ::testsimplefilesystem]] +cd [tcltest::temporaryDirectory] makeFile "test file" gorp.file makeDirectory dir.dir makeDirectory [file join dir.dir dirinside.dir] diff --git a/tests/io.test b/tests/io.test index 56be76b..de7cb3a 100644 --- a/tests/io.test +++ b/tests/io.test @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: io.test,v 1.63 2004/10/31 21:24:07 dgp Exp $ +# RCS: @(#) $Id: io.test,v 1.64 2004/11/11 01:16:06 das Exp $ if {[catch {package require tcltest 2}]} { puts stderr "Skipping tests in [info script]. tcltest 2 required." @@ -414,7 +414,7 @@ test io-6.6 {Tcl_GetsObj: loop test} { test io-6.7 {Tcl_GetsObj: error in input} {stdio openpipe} { # if (FilterInputBytes(chanPtr, &gs) != 0) - set f [open "|[list [interpreter] cat]" w+] + set f [open "|[list [interpreter] $path(cat)]" w+] puts -nonewline $f "hi\nwould" flush $f gets $f @@ -5150,7 +5150,7 @@ test io-40.3 {POSIX open access modes: CREAT} {unix umask} { file delete $path(test3) set f [open $path(test3) {WRONLY CREAT}] close $f - file stat test3 stats + file stat $path(test3) stats format "0%o" [expr $stats(mode)&0777] } [format %04o [expr {0666 & ~ $umaskValue}]] test io-40.4 {POSIX open access modes: CREAT} { diff --git a/tests/msgcat.test b/tests/msgcat.test index 6e05d64..0ceb2e9 100644 --- a/tests/msgcat.test +++ b/tests/msgcat.test @@ -12,7 +12,7 @@ # Note that after running these tests, entries will be left behind in the # message catalogs for locales foo, foo_BAR, and foo_BAR_baz. # -# RCS: @(#) $Id: msgcat.test,v 1.15 2004/08/13 21:39:24 dgp Exp $ +# RCS: @(#) $Id: msgcat.test,v 1.16 2004/11/11 01:16:07 das Exp $ package require Tcl 8.2 if {[catch {package require tcltest 2}]} { @@ -396,7 +396,8 @@ namespace eval ::msgcat::test { } else { set msg [string tolower $loc] } - makeFile [list ::msgcat::mcset $loc abc abc-$loc] $msg.msg msgdir + makeFile [list ::msgcat::mcset $loc abc abc-$loc] $msg.msg \ + [file join [temporaryDirectory] msgdir] } variable count 1 foreach loc {foo foo_BAR foo_BAR_baz} { diff --git a/tests/tcltest.test b/tests/tcltest.test index 5dee76f..e7a36fb 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.46 2004/11/02 19:03:29 dgp Exp $ +# RCS: @(#) $Id: tcltest.test,v 1.47 2004/11/11 01:16:07 das Exp $ # Note that there are several places where the value of # tcltest::currentFailure is stored/reset in the -setup/-cleanup @@ -1752,7 +1752,7 @@ test tcltest-26.1 {Bug/RFE 1017151} -setup { tcltest::cleanupTests } test.tcl } -body { - slave msg test.tcl + slave msg [file join [temporaryDirectory] test.tcl] set msg } -cleanup { removeFile test.tcl @@ -1772,7 +1772,7 @@ test tcltest-26.2 {Bug/RFE 1017151} -setup { tcltest::cleanupTests } test.tcl } -body { - slave msg test.tcl + slave msg [file join [temporaryDirectory] test.tcl] set msg } -cleanup { removeFile test.tcl diff --git a/tests/unixInit.test b/tests/unixInit.test index 350c748..6098870 100644 --- a/tests/unixInit.test +++ b/tests/unixInit.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: unixInit.test,v 1.40 2004/06/23 15:36:58 dkf Exp $ +# RCS: @(#) $Id: unixInit.test,v 1.41 2004/11/11 01:16:07 das Exp $ package require tcltest 2 namespace import -force ::tcltest::* @@ -397,9 +397,9 @@ test unixInit-7.1 {closed standard channel: Bug 772288} -constraints { makeFile {puts [open /dev/null]} crash.tcl makeFile " close stdin - [list exec $tclsh crash.tcl] + [list exec $tclsh [file join [temporaryDirectory] crash.tcl]] " crashtest.tcl - exec $tclsh crashtest.tcl + exec $tclsh [file join [temporaryDirectory] crashtest.tcl] } -cleanup { removeFile crash.tcl removeFile crashtest.tcl -- cgit v0.12