mauve.exp (mauve_find_harness_files): New proc.

	* libjava.mauve/mauve.exp (mauve_find_harness_files): New proc.
	(test_mauve): Use it.
	(test_mauve_sim): Likewise.

From-SVN: r69620

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index 576318bd682ea99449ff4cd6cac319f14758ccbc..8c37e22858ebd69f110ecc091c872df875794814 100644 (file)
--- 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 dcd8a57fd1add4c9acd2e4174b2c7199ad2ddde6..4ef1a104fd29fe744d19d182141f0e5123023527 100644 (file)
--- 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 \