diff options
| -rw-r--r-- | libjava/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.mauve/mauve.exp | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 576318b..8c37e22 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2003-07-20 Tom Tromey <tromey@redhat.com> + + * libjava.mauve/mauve.exp (mauve_find_harness_files): New proc. + (test_mauve): Use it. + (test_mauve_sim): Likewise. + 2003-07-19 Tom Tromey <tromey@redhat.com> * libjava.verify/verify.exp (gcj_verify_list_tests): Only change diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp index dcd8a57..4ef1a10 100644 --- a/libjava/testsuite/libjava.mauve/mauve.exp +++ b/libjava/testsuite/libjava.mauve/mauve.exp @@ -74,6 +74,16 @@ proc find_mauve_sources {} { return 0 } +# Find all the harness files and return a list of them, with no +# suffix. +proc mauve_find_harness_files {} { + set result {} + foreach file [glob -nocomplain -- *.class gnu/testlet/*.class] { + lappend result [file root $file] + } + return $result +} + # Run all the Mauve tests. Return 1 on success, 0 on any failure. If # the tests are skipped, that is treated like success. proc test_mauve {} { @@ -159,7 +169,7 @@ proc test_mauve {} { set ok 1 set objlist {} - foreach base {DejaGNUTestHarness gnu/testlet/SimpleTestHarness gnu/testlet/TestHarness gnu/testlet/Testlet gnu/testlet/ResourceNotFoundException gnu/testlet/config} { + foreach base [mauve_find_harness_files] { set file $base.class set obj $base.o set x [libjava_prune_warnings \ @@ -298,9 +308,7 @@ proc test_mauve_sim {} { set ok 1 set objlist {} - foreach base {gnu/testlet/SimpleTestHarness gnu/testlet/TestHarness \ - gnu/testlet/Testlet gnu/testlet/ResourceNotFoundException \ - gnu/testlet/config} { + foreach base [mauve_find_harness_files] { set file $base.class set obj $base.o set x [libjava_prune_warnings \ |