2010-04-29 Joel Sherrill <joel.sherrill@oarcorp.com>

	* do_one, test_driver: Add more arguments. Remove early exit.

3 files changed, 31 insertions, 15 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c510083..e95850e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-29	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* do_one, test_driver: Add more arguments. Remove early exit.
+
 2010-04-13	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* rundeja, test_driver: Add lm32.  Do not attempt to update gcc
diff --git a/gcc/do_one b/gcc/do_one
index 4740fbd..f1610c7 100755
--- a/gcc/do_one
+++ b/gcc/do_one
@@ -294,7 +294,8 @@ j_binutils()
       rm -rf b-binutils-${cpu}
       mkdir b-binutils-${cpu}
       cd b-binutils-${cpu}
-      (${BINUTILSDIR}/configure --target=${TARGET} --prefix=$INSTALL && \
+      (${BINUTILSDIR}/configure --target=${TARGET} --prefix=$INSTALL \
+        --disable-werror && \
         make ${MAKEJOBS} && make install) >${LOGDIR}/${cpu}-binutils.log 2>&1
       if [ $? -ne 0 ] ; then
         echo "Failed to build Binutils from source"
diff --git a/gcc/test_driver b/gcc/test_driver
index c8df1a4..4ee3b10 100755
--- a/gcc/test_driver
+++ b/gcc/test_driver
@@ -42,7 +42,12 @@ usage()
 {
 cat <<EOF
 do_one [options] CPU ..  CPU
+  -A - enable clean, native, and update
+  -a - build Ada (default=yes)
   -c - clean install point (also installs auto tools)
+  -m - mail results to lists (default=yes)
+  -n - build native
+  -T - run tests (default=yes)
   -u - update GNU source if version from CVS/SVN
   -U - update RTEMS source if version from CVS/SVN (will bootstrap)
   -v - verbose
@@ -54,8 +59,11 @@ doUpdateTools="no"
 doUpdateRTEMS="no"
 doNative="no"
 verbose="no"
+doAda="yes"
+doMail="yes"
+doTests="yes"
 
-while getopts AcnuUv OPT
+while getopts AacmnuUv OPT
 do
   case "$OPT" in
     A) doCleanInstallPoint=`toggle ${doCleanInstallPoint}`
@@ -63,8 +71,11 @@ do
        doUpdateTools=`toggle ${doUpdateTools}`
        doUpdateRTEMS=`toggle ${doUpdateRTEMS}`
        ;;
+    a) doAda=`toggle ${doAda}` ;;
     c) doCleanInstallPoint=`toggle ${doCleanInstallPoint}` ;;
+    m) doMail=`toggle ${doMail}` ;;
     n) doNative=`toggle ${doNative}` ;;
+    T) doTests=`toggle ${doTests}` ;;
     u) doUpdateTools=`toggle ${doUpdateTools}` ;;
     U) doUpdateRTEMS=`toggle ${doUpdateRTEMS}` ;;
     v) verbose=`toggle ${verbose}` ;;
@@ -94,9 +105,20 @@ if [ ${verbose} = "yes" ] ; then
   echo "Install Native:      " ${doNative}
   echo "Update Tool Source:  " ${doUpdateTools}
   echo "Update RTEMS:        " ${doUpdateRTEMS}
-  echo "CPUs to Build:       " ${CPUs}
+  echo "Build Ada            " ${doAda}
+  echo "Email Results:       " ${doMail}
+  echo "Run Tests:           " ${doTests}
+  if [ X${CPUs} = X ] ; then
+    echo "CPUs to Build:       " ALL
+  else
+    echo "CPUs to Build:       " ${CPUs}
+  fi
 fi
 
+test ${doMail}  = "no"   && mailArg="-M"
+test ${doTests} = "yes" && testArg="-T"
+test ${doAda}   = "yes" && adaArg="-a"
+
 start=`date`
 echo Started at: ${start}
 
@@ -167,8 +189,6 @@ update_others()
 
 do_cpus()
 {
-  tests=-T
-
   bsp=
 
   exitStatus=0
@@ -195,16 +215,8 @@ do_cpus()
     esac
 
     doOne=${SCRIPTDIR}/gcc/do_one 
-    # Everything
-    # -M -> do not mail
-    #time sh -x ${doOne} -v -d -A ${tests} \
-#	${cpu} ${bsp} >${BASEDIR}/${bsp}.log 2>&1
-    # Just C/C++, no clean up, no mail
-    time sh -x ${doOne} -v -b -D -1 -d -M -r ${tests} \
+    time sh -x ${doOne} -v -b -D -1 -d -r ${adaArg} ${mailArg} ${testArg} \
         ${cpu} ${bsp} >${BASEDIR}/${bsp}.log 2>&1
-    # Just C/C++
-    #time sh -x ${doOne} -v -1 -r -g ${tests}\
-    #     ${cpu} ${bsp} >${BASEDIR}/${bsp}.log 2>&1
     echo $?
   done
 
@@ -214,7 +226,6 @@ do_cpus()
 }
 
 update_gcc
-exit 0
 
 if [ ${doCleanInstallPoint} = "yes" ] ; then
   # Clean the install point