From 2437a4e0eef54c58295a621eeb546d9bc4a2d9c3 Mon Sep 17 00:00:00 2001 From: das Date: Thu, 11 Nov 2004 01:16:19 +0000 Subject: * tests/fileName.test: * tests/fileSystem.test: * tests/io.test: * tests/tcltest.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 | 4 ++-- tests/tcltest.test | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/fileName.test b/tests/fileName.test index 19b08ec..d0497de 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.30.2.5 2004/05/04 22:12:49 hobbs Exp $ +# RCS: @(#) $Id: fileName.test,v 1.30.2.6 2004/11/11 01:16:19 das Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -331,7 +331,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 7febfcd..7ce7746 100644 --- a/tests/fileSystem.test +++ b/tests/fileSystem.test @@ -27,6 +27,7 @@ namespace eval ::tcl::test::fileSystem { file delete -force [file join dir.file linkinside.file] } +cd [tcltest::temporaryDirectory] makeFile "test file" gorp.file makeDirectory dir.file makeFile "test file in directory" [file join dir.file inside.file] diff --git a/tests/io.test b/tests/io.test index a66bf89..9492b22 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.40.2.7 2004/10/28 00:01:08 dgp Exp $ +# RCS: @(#) $Id: io.test,v 1.40.2.8 2004/11/11 01:16:20 das Exp $ if {[catch {package require tcltest 2}]} { puts stderr "Skipping tests in [info script]. tcltest 2 required." @@ -410,7 +410,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 diff --git a/tests/tcltest.test b/tests/tcltest.test index ae5332d..c6ee2a1 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.6 2004/11/02 19:03:08 dgp Exp $ +# RCS: @(#) $Id: tcltest.test,v 1.37.2.7 2004/11/11 01:16:36 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 -- cgit v0.12