FYI: batch_run, runner and choose-classes fixlets

[Mark Wielaard <mark at klomp dot org>]

Hi,

The batch_run, runner and choose-classes wouldn't automatically search
for the new gnu and org hierarchies (mainly crypto and corba tests) and
didn't export some variables that the BinaryCompatibility tests
expected. This fixes that so that the autobuilder on
builder.classpath.org should pick up these tests automatically now.

2006-02-19  Mark Wielaard  <mark@klomp.org>

    * batch_run (KEYS): Add GNU and GNU-CRYPTO
    (COMPILER): Export either GCJ or JAVAC.
    * choose-classes: Also search gnu and org hierarchies.
    * runner (RUNTIME): Export RUNTIME as JAVA.

Committed,

Mark

Index: batch_run
===================================================================
RCS file: /cvs/mauve/mauve/batch_run,v
retrieving revision 1.19
diff -u -r1.19 batch_run
--- batch_run	14 Feb 2006 21:09:12 -0000	1.19
+++ batch_run	19 Feb 2006 14:26:08 -0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2002, 2004 Free Software Foundation, Inc.
+# Copyright (c) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
 # Written by Mark Wielaard <mark@klomp.org>
 
 # This file is part of Mauve.
@@ -33,7 +33,7 @@
 
 # Include every key/tag we can think of but always exclude the unicode test.
 if test "x$KEYS" = "x"; then
-KEYS="JDK1.0 JDK1.1 JDK1.2 JDK1.3 JDK1.4 JDBC1.0 JDBC2.0"
+KEYS="JDK1.0 JDK1.1 JDK1.2 JDK1.3 JDK1.4 JDK1.5 JDBC1.0 JDBC2.0 GNU GNU-CRYPTO"
 KEYS="$KEYS !java.lang.Character.unicode"
 fi
 
@@ -54,8 +54,10 @@
 
 if test "x$COMPILER" = "xgcj"; then
 NATIVE="true"
+GCJ=gcj; export GCJ;
 else
 NATIVE=
+JAVAC=$COMPILER; export JAVAC
 fi
 
 # Cleanup if COMPILER != none
Index: choose-classes
===================================================================
RCS file: /cvs/mauve/mauve/choose-classes,v
retrieving revision 1.5
diff -u -r1.5 choose-classes
--- choose-classes	5 Jan 2005 00:15:12 -0000	1.5
+++ choose-classes	19 Feb 2006 14:26:08 -0000
@@ -3,7 +3,7 @@
 # Copyright (c) 1998, 1999 Cygnus Solutions
 # Written by Tom Tromey <tromey@cygnus.com>
 
-# Copyright (c) 2002 Free Software Foundation, Inc.
+# Copyright (c) 2002, 2006 Free Software Foundation, Inc.
 # Adapted by Mark Wielaard <mark@klomp.org>
 
 # This file is part of Mauve.
@@ -131,7 +131,7 @@
 classes=/tmp/classes-$$
 : > $classes
 
-(cd gnu/testlet; find java javax locales BinaryCompatibility -name '*.java' -print) |
+(cd gnu/testlet; find java javax gnu org locales BinaryCompatibility -name '*.java' -print) |
 while read file; do
    exact_match=no
    test -n "$verbose" && echo "Examining $file"
Index: runner
===================================================================
RCS file: /cvs/mauve/mauve/runner,v
retrieving revision 1.14
diff -u -r1.14 runner
--- runner	31 Jul 2005 17:42:52 -0000	1.14
+++ runner	19 Feb 2006 14:26:08 -0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2002, 2004 Free Software Foundation, Inc.
+# Copyright (c) 2002, 2004, 2006 Free Software Foundation, Inc.
 # Written by Mark Wielaard <mark@klomp.org>
 
 # This file is part of Mauve.
@@ -39,6 +39,8 @@
 #RUNTIME="native"
 fi
 
+JAVA=$RUNTIME; export JAVA
+
 # Number of seconds to wait for the test to finish
 WAIT=60

Attachment: signature.asc
Description: This is a digitally signed message part