diff options
| author | Ben Elliston <bje@gnu.org> | 2003-12-03 04:24:32 +0000 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2003-12-03 04:24:32 +0000 |
| commit | 9664d9f6280dd2f5ca00dffbbdacb69f45257aa5 (patch) | |
| tree | 3eae689e51d6edb76ef540278f8d10c980070cc9 | |
| parent | 9200a8f38eaf39c1ce05ec561a02161190e7a7bc (diff) | |
| download | dejagnu-9664d9f6280dd2f5ca00dffbbdacb69f45257aa5.zip dejagnu-9664d9f6280dd2f5ca00dffbbdacb69f45257aa5.tar.gz dejagnu-9664d9f6280dd2f5ca00dffbbdacb69f45257aa5.tar.bz2 | |
Merge from DejaGnu 1.4 branch:
* 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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | testsuite/runtest.all/utils.test | 13 |
2 files changed, 7 insertions, 12 deletions
@@ -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-10-16 Rob Savoye <rob@welcomehome.org> * packaging/prototype: Remove sh-hms-sim.exp, add sh-sim. 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 - - - - - - - - |