summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorrmax <rmax>2004-11-25 11:31:30 (GMT)
committerrmax <rmax>2004-11-25 11:31:30 (GMT)
commit1063186177a469f20d87291881ddac9d3242fc39 (patch)
tree6ecd8ac3926b445ab63a41b0286d47595b34bf1a /tests
parentd331d5d18a7bbff8535a5c3ea443381221f99d04 (diff)
downloadtcl-1063186177a469f20d87291881ddac9d3242fc39.zip
tcl-1063186177a469f20d87291881ddac9d3242fc39.tar.gz
tcl-1063186177a469f20d87291881ddac9d3242fc39.tar.bz2
* tests/tcltest.test: The order in which [glob] returns the file names
* tests/fCmd.test: is undefined, so tests should not depend on it.
Diffstat (limited to 'tests')
-rw-r--r--tests/fCmd.test6
-rwxr-xr-xtests/tcltest.test6
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/fCmd.test b/tests/fCmd.test
index 6d3d059..bb94d42 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.26.2.5 2004/11/11 01:15:29 das Exp $
+# RCS: @(#) $Id: fCmd.test,v 1.26.2.6 2004/11/25 11:31:31 rmax Exp $
#
if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -2373,10 +2373,10 @@ test fCmd-28.16 {file link: glob inside link} {linkDirectory} {
cd [temporaryDirectory]
file delete -force abc.link
file link abc.link abc.dir
- set res [glob -dir abc.link -tails *]
+ set res [lsort [glob -dir abc.link -tails *]]
cd [workingDirectory]
set res
-} {abc.file abc2.file}
+} [lsort [list abc.file abc2.file]]
test fCmd-28.17 {file link: glob -type l} {linkDirectory} {
cd [temporaryDirectory]
diff --git a/tests/tcltest.test b/tests/tcltest.test
index c6ee2a1..99efabf 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.7 2004/11/11 01:16:36 das Exp $
+# RCS: @(#) $Id: tcltest.test,v 1.37.2.8 2004/11/25 11:31:32 rmax Exp $
# Note that there are several places where the value of
# tcltest::currentFailure is stored/reset in the -setup/-cleanup
@@ -980,7 +980,7 @@ test tcltest-15.1 {basic directory walking} {
}
-match regexp
-returnCodes 1
- -result {Tests located in:.*dirtestdir.*Tests located in:.*dirtestdir2.1.*Tests located in:.*dirtestdir2.2.*Tests located in:.*dirtestdir2.3}
+ -result {Tests located in:.*dirtestdir.*Tests located in:.*dirtestdir2.[123].*Tests located in:.*dirtestdir2.[123].*Tests located in:.*dirtestdir2.[123]}
}
test tcltest-15.2 {-asidefromdir} {
@@ -995,7 +995,7 @@ test tcltest-15.2 {-asidefromdir} {
}
-match regexp
-returnCodes 1
- -result {Tests located in:.*dirtestdir.*Tests located in:.*dirtestdir2.1.*Tests located in:.*dirtestdir2.2.*dirtestdir2.2 test ended at .*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ -result {Tests located in:.*dirtestdir.*Tests located in:.*dirtestdir2.[12].*Tests located in:.*dirtestdir2.[12].*dirtestdir2.[12] test ended at .*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Error: No test files remain after applying your match and skip patterns!
Error: No test files remain after applying your match and skip patterns!
Error: No test files remain after applying your match and skip patterns!$}