* btest-gcc.sh: Support -j option.

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

diff --git a/contrib/regression/ChangeLog b/contrib/regression/ChangeLog
index 153e0f6..62aa9ba 100644 (file)
--- a/contrib/regression/ChangeLog
+++ b/contrib/regression/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-20  Geoffrey Keating  <geoffk@apple.com>
+
+       * btest-gcc.sh: Support -j option.
+

 2005-11-28  Geoffrey Keating  <geoffk@geoffk.org>
 
        * GCC Regression Tester.wdgt: Rename to GCC_Regression_Tester.wdgt.
 2005-11-28  Geoffrey Keating  <geoffk@geoffk.org>
 
        * GCC Regression Tester.wdgt: Rename to GCC_Regression_Tester.wdgt.

diff --git a/contrib/regression/btest-gcc.sh b/contrib/regression/btest-gcc.sh
index b03d025..bff069a 100755 (executable)
--- a/contrib/regression/btest-gcc.sh
+++ b/contrib/regression/btest-gcc.sh
@@ -21,15 +21,20 @@
 # btest <options> <target> <source> <prefix> <state> <build>
 
 add_passes_despite_regression=0
 # btest <options> <target> <source> <prefix> <state> <build>
 
 add_passes_despite_regression=0

+dashj=''

 
 # <options> can be
 # --add-passes-despite-regression:
 #  Add new "PASSes" despite there being some regressions.
 
 # <options> can be
 # --add-passes-despite-regression:
 #  Add new "PASSes" despite there being some regressions.

+# -j<n>:
+#  Pass '-j<n>' to make.

 
 case "$1" in
  --add-passes-despite-regression)
   add_passes_despite_regression=1; shift;;
 
 case "$1" in
  --add-passes-despite-regression)
   add_passes_despite_regression=1; shift;;

- --*) echo "Invalid option: $1"; exit 2;;
+ -j*)
+  dashj=$1; shift;;
+ -*) echo "Invalid option: $1"; exit 2;;

 esac
 
 # TARGET is the target triplet.  It should be the same one as used in
 esac
 
 # TARGET is the target triplet.  It should be the same one as used in


@@ -117,10 +122,10 @@ gcc/testsuite/objc.sum"
 echo build > $RESULT
 if [ $H_HOST = $H_TARGET ] ; then
   $SOURCE/configure --prefix=$PREFIX --target=$H_TARGET || exit 1
 echo build > $RESULT
 if [ $H_HOST = $H_TARGET ] ; then
   $SOURCE/configure --prefix=$PREFIX --target=$H_TARGET || exit 1

-  if ! make bootstrap ; then
+  if ! make $dashj bootstrap ; then

     [ -s gcc/.bad_compare ] || exit 1
     cat gcc/.bad_compare >> $REGRESS || exit 1
     [ -s gcc/.bad_compare ] || exit 1
     cat gcc/.bad_compare >> $REGRESS || exit 1

-    make all || exit 1
+    make $dashj all || exit 1

   fi
 else
   withopt="--with-gnu-ld --with-gnu-as"
   fi
 else
   withopt="--with-gnu-ld --with-gnu-as"


@@ -129,27 +134,21 @@ else
     *) withopt="$withopt --with-newlib";;
   esac
   $SOURCE/configure --prefix=$PREFIX --target=$H_TARGET $withopt || exit 1
     *) withopt="$withopt --with-newlib";;
   esac
   $SOURCE/configure --prefix=$PREFIX --target=$H_TARGET $withopt || exit 1

-  make || exit 1
+  make $dashj || exit 1

 fi
 echo error > $RESULT || exit 1
 
 # Test GCC against its internal testsuite.
 fi
 echo error > $RESULT || exit 1
 
 # Test GCC against its internal testsuite.

-make -k check-gcc
+make $dashj -k check

 
 

-# Test libstd++-v3
-make check-target-libstdc++-v3

 if [ -f $BUILD/$H_TARGET/libstdc++-v3/testsuite/libstdc++.sum ] ; then
   TESTLOGS="$TESTLOGS $H_TARGET/libstdc++-v3/testsuite/libstdc++.sum"
 fi
 
 if [ -f $BUILD/$H_TARGET/libstdc++-v3/testsuite/libstdc++.sum ] ; then
   TESTLOGS="$TESTLOGS $H_TARGET/libstdc++-v3/testsuite/libstdc++.sum"
 fi
 

-# Test libffi
-make check-target-libffi

 if [ -f $BUILD/$H_TARGET/libffi/testsuite/libffi.sum ] ; then
   TESTLOGS="$TESTLOGS $H_TARGET/libffi/testsuite/libffi.sum"
 fi
 
 if [ -f $BUILD/$H_TARGET/libffi/testsuite/libffi.sum ] ; then
   TESTLOGS="$TESTLOGS $H_TARGET/libffi/testsuite/libffi.sum"
 fi
 

-# Test libjava
-make check-target-libjava

 if [ -f $BUILD/$H_TARGET/libjava/testsuite/libjava.sum ] ; then
   TESTLOGS="$TESTLOGS $H_TARGET/libjava/testsuite/libjava.sum"
 fi
 if [ -f $BUILD/$H_TARGET/libjava/testsuite/libjava.sum ] ; then
   TESTLOGS="$TESTLOGS $H_TARGET/libjava/testsuite/libjava.sum"
 fi