[PATCH] contrib/patch_tester.sh, 4 of 7

Janis Johnson janis187@us.ibm.com
Wed Mar 5 23:55:00 GMT 2008


This patch to contrib/patch_tester.sh causes options specified for
configure, make, and make check to be evaluated, allowing them to
include environment variables that can be different on different
machines (including different targets) on which the patch is tested.
It also adds more information to a failure message, and uses "make"
instead of "make bootstrap" allowing simple builds with
"disable-bootstrap" for preliminary test runs.

The "eval" changes are probably not needed with Tom's change to pick
up local options from a file, but might still be useful.

Sebastian, OK for trunk?  

--- patch_tester.sh.3	2008-03-05 15:29:28.000000000 -0800
+++ patch_tester.sh	2008-03-05 15:29:31.000000000 -0800
@@ -301,14 +301,15 @@ bootntest () {
     cd $BUILD
 
     CONFIG_OPTIONS=`grep "^configure:" $PATCH | sed -e "s/^configure://g"`
-    if ! $SOURCE/configure $CONFIG_OPTIONS &> $1/configure ; then
-	report "configure failed with:"
+    if ! eval $SOURCE/configure $CONFIG_OPTIONS &> $1/configure ; then
+	report "configure with `basename $1` version failed with:"
 	freport $1/configure
 	return 1
     fi
 
-    if ! make $dashj `grep "^make:" $PATCH | sed -e "s/^make://g"` bootstrap &> $1/bootstrap ; then
-	report "bootstrap failed with last lines:"
+    if ! eval make $dashj `grep "^make:" $PATCH \
+	    | sed -e "s/^make://g"` &> $1/bootstrap ; then
+	report "bootstrap with `basename $1` version failed with last lines:"
 	tail -30 $1/bootstrap > $1/last_bootstrap
 	freport $1/last_bootstrap
 	report "grep --context=20 Error bootstrap:"
@@ -318,7 +319,7 @@ bootntest () {
     fi
 
     CHECK_OPTIONS=`grep "^check:" $PATCH | sed -e "s/^check://g"`
-    make $dashj $CHECK_OPTIONS -k check &> $1/check
+    eval make $dashj $CHECK_OPTIONS -k check &> $1/check
 
     for LOG in $TESTLOGS ; do
 	if [ -f $BUILD/$LOG ]; then




More information about the Gcc-patches mailing list