Patch: FYI: make test suite more robust

Tom Tromey tromey@redhat.com
Mon Jul 21 01:09:00 GMT 2003


I'm checking this in on the trunk.

This makes the Mauve tests a little more robust.  In particular if
anybody adds a new harness file (which I'm about to), we will now
build it.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

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

Index: libjava.mauve/mauve.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/libjava.mauve/mauve.exp,v
retrieving revision 1.21
diff -u -r1.21 mauve.exp
--- libjava.mauve/mauve.exp 6 Jun 2003 10:03:30 -0000 1.21
+++ libjava.mauve/mauve.exp 21 Jul 2003 00:58:40 -0000
@@ -74,6 +74,16 @@
   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 @@
 
   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 @@
 
   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 \



More information about the Java-patches mailing list