From 21ea2229e15d1638d8ee1aa4717bc0b5b32479ad Mon Sep 17 00:00:00 2001 From: das Date: Thu, 14 Aug 2008 00:08:34 +0000 Subject: * tests/fCmd.test (fCmd-6.23): made result matching robust when test workdir and /tmp are not on same FS. --- ChangeLog | 3 +++ tests/fCmd.test | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9773e0..2718e61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2008-08-14 Daniel Steffen + * tests/fCmd.test (fCmd-6.23): made result matching robust when test + workdir and /tmp are not on same FS. + * unix/Makefile.in: ensure Makefile shell is /bin/bash for * unix/configure.in (SunOS): DTrace-enabled build on Solaris. (followup to 2008-06-12) [Bug 2016584] diff --git a/tests/fCmd.test b/tests/fCmd.test index ececb2e..a1f214d 100644 --- a/tests/fCmd.test +++ b/tests/fCmd.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: fCmd.test,v 1.60 2008/03/28 11:18:48 dkf Exp $ +# RCS: @(#) $Id: fCmd.test,v 1.60.2.1 2008/08/14 00:08:34 das Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { @@ -576,7 +576,7 @@ test fCmd-6.23 {CopyRenameOneFile: TclpCopyDirectory failed} -setup { file rename td1 /tmp } -returnCodes error -cleanup { file attributes td1 -permissions 0755 -} -result {error renaming "td1": permission denied} +} -match regexp -result {^error renaming "td1"( to "/tmp/td1")?: permission denied$} test fCmd-6.24 {CopyRenameOneFile: error uses original name} -setup { cleanup } -constraints {unix notRoot} -body { -- cgit v0.12