* testsuite/runtest.all/utils.test: Fix a test for proc find which

	assumed that "subsubfile1" would appear at the end of the returned
	list.  Adjust to use a more robust regular expression.

2 files changed, 7 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 009883a..3f37562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-03  Ben Elliston  <bje@wasabisystems.com>
+
+	* testsuite/runtest.all/utils.test: Fix a test for proc find which
+	assumed that "subsubfile1" would appear at the end of the returned
+	list.  Adjust to use a more robust regular expression.
+
 2003-11-26  Ben Elliston  <bje@wasabisystems.com>
 
 	* doc/overview.sgml (version): Update.
diff --git a/testsuite/runtest.all/utils.test b/testsuite/runtest.all/utils.test
index ee08306..c85d69d 100644
--- a/testsuite/runtest.all/utils.test
+++ b/testsuite/runtest.all/utils.test
@@ -50,10 +50,7 @@ if [string match "*/subdir2/subfile2" "[find ${srcdir}/runtest.all/topdir/subdir
     puts "FAILED: find, only one level deep"
 }
 
-#set path ${srcdir}/runtest.all/topdir/subdir1
-#exp_test "find ${path} sub*" "Adding */subdir1/subsubdir1/subsubfile1" "find, two levels deep"
-
-if [string match "*/subdir1/subsubdir1/subsubfile1" "[find ${srcdir}/runtest.all/topdir/subdir1 sub*]"] {
+if [regexp ".*/subdir1/subsubdir1/subsubfile1( |$)" "[find ${srcdir}/runtest.all/topdir/subdir1 sub*]"] {
     puts "PASSED: find, two levels deep"
 } else {
     puts "FAILED: find, two  levels deep"
@@ -108,11 +105,3 @@ if [info exists env(TESTRUN)] {
 # absolute path
 # psource file
 # diff file_1 file_2
-
-
-
-
-
-
-
-