* gcc_build: Fix handling of -t option. Add -x option.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70658 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 8f353e1..f472267 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-21  Mark Mitchell  <mark@codesourcery.com>
+
+       * gcc_build: Fix handling of -t option.  Add -x option.
+
 2003-07-31  Matt Kraai  <kraai@alumni.cmu.edu>
 
        * texi2pod.pl: Remove extra line.

diff --git a/contrib/gcc_build b/contrib/gcc_build
index 21379fb..b36685e 100755 (executable)
--- a/contrib/gcc_build
+++ b/contrib/gcc_build
@@ -66,6 +66,7 @@ gcc_build        [-c configure_options]
                 [-u username]
                 [-p protocol]
                 [-t tarfile]
+                 [-x make_check_options]
                 [bootstrap]
                 [build]
                 [checkout]
@@ -174,7 +175,7 @@ test_gcc() {
     changedir ${OBJDIR}
 
     echo "Running tests...  This will take a while."
-    ${MAKE} -k check
+    eval \${MAKE} -k ${MAKE_CHECK_OPTIONS} check
     ${DESTINATION}/contrib/test_summary
 }
 
@@ -233,8 +234,10 @@ TARFILE="${HOME}/dev/gcc.tgz"
 CONFIGURE_OPTIONS=
 # The `make' program.
 MAKE=${MAKE:-make}
-# Options to pass to make.
+# Options to pass to "make bootstrap".
 MAKE_BOOTSTRAP_OPTIONS=
+# Options to pass to "make check".
+MAKE_CHECK_OPTIONS=
 
 # Modes of operation
 BOOTSTRAP=0
@@ -250,14 +253,15 @@ UPDATE=0
 ########################################################################
 
 # Parse the options.
-while getopts "c:d:m:o:p:t:u:" ARG; do
+while getopts "c:d:m:o:p:t:u:x:" ARG; do
     case $ARG in
     c)    CONFIGURE_OPTIONS="${OPTARG}";;
     d)    DESTINATION="${OPTARG}";;
     m)    MAKE_BOOTSTRAP_OPTIONS="${OPTARG}";;
     o)    OBJDIR="${OPTARG}";;
     p)    CVS_PROTOCOL="${OPTARG}";;
-    t)    CVS_TARGFILE="${OPTARG}";;
+    t)    TARFILE="${OPTARG}";;
+    x)    MAKE_CHECK_OPTIONS="${OPTARG}";;
     u)    CVS_USERNAME="${OPTARG}";;
     \?)   usage;;
     esac