3.3 PATCH: Sort libjava test sources

Rainer Orth ro@TechFak.Uni-Bielefeld.DE
Wed Jul 17 09:51:00 GMT 2002


libjava testcases are run in a random order (i.e. as tcl's glob procedure
finds them) which can vary between testsuite runs.  This makes it difficult
to compare mail-report.log for changes in testsuite results.  The following
patch fixes this by sorting the source files, just like e.g. the
libstdc++-v3 testsuite does.

Successfully bootstrapped on i386-pc-solaris2.8 with the desired effect :-)

Ok for mainline?

	Rainer


Mon Jul 15 14:20:01 2002  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>

	* libjava.compile/compile.exp: Sort sources.
	* libjava.jni/jni.exp (gcj_jni_run): Likewise.
	* libjava.lang/lang.exp: Likewise.

Index: libjava.compile/compile.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/libjava.compile/compile.exp,v
retrieving revision 1.2
diff -u -p -r1.2 compile.exp
--- libjava.compile/compile.exp	17 May 2000 15:48:44 -0000	1.2
+++ libjava.compile/compile.exp	17 Jul 2002 16:47:24 -0000
@@ -1,6 +1,6 @@
 global srcdir subdir
 
-catch "glob -nocomplain ${srcdir}/${subdir}/*.java" srcfiles
+catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.java] } srcfiles
 verbose "srcfiles are $srcfiles"
 
 set prefix ""
Index: libjava.jni/jni.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/libjava.jni/jni.exp,v
retrieving revision 1.7
diff -u -p -r1.7 jni.exp
--- libjava.jni/jni.exp	27 Mar 2002 16:29:04 -0000	1.7
+++ libjava.jni/jni.exp	17 Jul 2002 16:47:24 -0000
@@ -167,7 +167,7 @@ proc gcj_jni_run {} {
 
   # For now we only test JNI on native builds.
   if {$build_triplet == $host_triplet} {
-    catch "glob -nocomplain ${srcdir}/${subdir}/*.java" srcfiles
+    catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.java] } srcfiles
 
     foreach x $srcfiles {
       gcj_jni_test_one $x
Index: libjava.lang/lang.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/libjava.lang/lang.exp,v
retrieving revision 1.1
diff -u -p -r1.1 lang.exp
--- libjava.lang/lang.exp	4 Oct 1999 03:30:54 -0000	1.1
+++ libjava.lang/lang.exp	17 Jul 2002 16:47:24 -0000
@@ -1,6 +1,6 @@
 global srcdir subdir
 
-catch "glob -nocomplain ${srcdir}/${subdir}/*.out" srcfiles
+catch { lsort [glob -nocomplain ${srcdir}/${subdir}/*.out] } srcfiles
 verbose "srcfiles are $srcfiles"
 
 set prefix ""



More information about the Java-patches mailing list