summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2008-08-14 00:08:34 (GMT)
committerdas <das>2008-08-14 00:08:34 (GMT)
commit21ea2229e15d1638d8ee1aa4717bc0b5b32479ad (patch)
tree1f004559949365b6c57901ffc8f2c7a8dcdef0fe
parent0698d7c0e51549fa2bdba86a55087d9503107876 (diff)
downloadtcl-21ea2229e15d1638d8ee1aa4717bc0b5b32479ad.zip
tcl-21ea2229e15d1638d8ee1aa4717bc0b5b32479ad.tar.gz
tcl-21ea2229e15d1638d8ee1aa4717bc0b5b32479ad.tar.bz2
* tests/fCmd.test (fCmd-6.23): made result matching robust when test
workdir and /tmp are not on same FS.
-rw-r--r--ChangeLog3
-rw-r--r--tests/fCmd.test4
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 <das@users.sourceforge.net>
+ * 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 {