This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: RFC: pass KEYS variable to mauve.exp
- From: Thomas Fitzsimmons <fitzsim at redhat dot com>
- To: java-patches at gcc dot gnu dot org
- Date: Tue, 21 Dec 2004 21:57:18 -0500
- Subject: Patch: RFC: pass KEYS variable to mauve.exp
Hi,
This patch adds support to mauve.exp and Makefile.am for specifying KEYS
on the "make check" command line. Comments?
Tom
2004-12-21 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am (AM_MAKEFLAGS): Set KEYS variable.
* testsuite/libjava.mauve/mauve.exp (test_mauve): If KEYS exists
and is non-empty pass its value to "make check".
(test_mauve_sim): Likewise.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.434
diff -u -r1.434 Makefile.am
--- Makefile.am 3 Dec 2004 11:14:53 -0000 1.434
+++ Makefile.am 22 Dec 2004 02:26:45 -0000
@@ -3600,6 +3604,7 @@
"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
"SHELL=$(SHELL)" \
"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+ "KEYS=$(KEYS)" \
"exec_prefix=$(exec_prefix)" \
"infodir=$(infodir)" \
"libdir=$(libdir)" \
Index: testsuite/libjava.mauve/mauve.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/libjava.mauve/mauve.exp,v
retrieving revision 1.23
diff -u -r1.23 mauve.exp
--- testsuite/libjava.mauve/mauve.exp 12 Aug 2003 17:59:17 -0000 1.23
+++ testsuite/libjava.mauve/mauve.exp 22 Dec 2004 02:26:45 -0000
@@ -144,7 +144,13 @@
catch {system "ln -s $full_srcdir/libjava.mauve/xfails xfails"}
if {[catch {
- system "make KEYS=libgcj classes.stamp 2>&1"
+ if { [info exists env(KEYS)] && [string length $env(KEYS)] > 0 } {
+ verbose "running make check with overridden keys: $env(KEYS)"
+ system "make KEYS=\"$env(KEYS)\" classes.stamp 2>&1"
+ } else {
+ verbose "running make check with default keys"
+ system "make KEYS=libgcj classes.stamp 2>&1"
+ }
} msg]} then {
fail "Mauve build"
verbose "build failed with $msg"
@@ -299,7 +305,13 @@
catch {system "ln -s $full_srcdir/libjava.mauve/xfails xfails"}
if {[catch {
- system "make KEYS=libgcj classes.stamp 2>&1"
+ if { [info exists env(KEYS)] && [string length $env(KEYS)] > 0 } {
+ verbose "running make check with overridden keys: $env(KEYS)"
+ system "make KEYS=\"$env(KEYS)\" classes.stamp 2>&1"
+ } else {
+ verbose "running make check with default keys"
+ system "make KEYS=libgcj classes.stamp 2>&1"
+ }
} msg]} then {
fail "Mauve build"
verbose "build failed with $msg"