X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=contrib%2Fregression%2Fbtest-gcc.sh;h=28985760d2b785218b04eaf04d3bc4775fb8328c;hp=524dfd9cffdb72ee923ea042aaf28144af510004;hb=46f93afa56df6700cb7c9e461b9086c169c61c4a;hpb=fb7dc860cf134fdafcb6ad4fb3a106c8d48b0735

diff --git a/contrib/regression/btest-gcc.sh b/contrib/regression/btest-gcc.sh
index 524dfd9cffd..28985760d2b 100755
--- a/contrib/regression/btest-gcc.sh
+++ b/contrib/regression/btest-gcc.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
 #  Test GCC.
-#  Copyright (C) 1999, 2000, 2001, 2002  Free Software Foundation, Inc.
+#  Copyright (C) 1999, 2000, 2001, 2002, 2005, 2006, 2009
+#  Free Software Foundation, Inc.
 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
+#  the Free Software Foundation; either version 3 of the License, or
 #  (at your option) any later version.
 
 #  This program is distributed in the hope that it will be useful,
@@ -14,11 +15,29 @@
 #  GNU General Public License for more details.
 
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#  along with this program; see the file COPYING3.  If not see
+#  <http://www.gnu.org/licenses/>.
 
 # INPUT:
-# btest <target> <source> <prefix> <state> <build>
+# 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.
+# -j<n>:
+#  Pass '-j<n>' to make.
+
+case "$1" in
+ --add-passes-despite-regression)
+  add_passes_despite_regression=1; shift;;
+ -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
 # constructing PREFIX.  Or it can be the keyword 'native', indicating
 # a target of whatever platform the script is running on.
@@ -96,33 +115,50 @@ H_REAL_TARGET=`$SOURCE/config.sub $H_TARGET || exit 1`
 
 # TESTLOGS is the list of dejagnu .sum files that the tester should
 # look at.
-TESTLOGS="gcc/testsuite/gcc.sum
-gcc/testsuite/g++.sum
-gcc/testsuite/g77.sum
-gcc/testsuite/objc.sum"
-# $H_TARGET/libstdc++-v3/testsuite/libstdc++-v3.sum
+TESTLOGS="gcc/testsuite/gcc/gcc.sum
+gcc/testsuite/g++/g++.sum
+gcc/testsuite/gfortran/gfortran.sum
+gcc/testsuite/objc/objc.sum"
 
 # Build.
 echo build > $RESULT
 if [ $H_HOST = $H_TARGET ] ; then
   $SOURCE/configure --prefix=$PREFIX --target=$H_TARGET || exit 1
-  if ! make bootstrap ; then
-    [ -s gcc/.bad_compare ] || exit 1
-    cat gcc/.bad_compare >> $REGRESS || exit 1
-    make all || exit 1
+  if ! make $dashj bootstrap ; then
+    [ -s .bad_compare ] || exit 1
+    cat .bad_compare >> $REGRESS || exit 1
+    touch compare || exit 1   # Prevent the comparison from running again
+    make $dashj all || exit 1
   fi
 else
-  $SOURCE/configure --prefix=$PREFIX --target=$H_TARGET \
-    --with-gnu-ld --with-gnu-as --with-newlib || exit 1
-  make || exit 1
+  withopt="--with-gnu-ld --with-gnu-as"
+  case "$H_TARGET" in
+    *-linux*) ;;
+    *) withopt="$withopt --with-newlib";;
+  esac
+  $SOURCE/configure --prefix=$PREFIX --target=$H_TARGET $withopt || exit 1
+  make $dashj || exit 1
 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/libffi/testsuite/libffi.sum ] ; then
+  TESTLOGS="$TESTLOGS $H_TARGET/libffi/testsuite/libffi.sum"
+fi
+
+if [ -f $BUILD/$H_TARGET/libjava/testsuite/libjava.sum ] ; then
+  TESTLOGS="$TESTLOGS $H_TARGET/libjava/testsuite/libjava.sum"
+fi
+
+if [ -f $BUILD/$H_TARGET/libgomp/testsuite/libgomp.sum ] ; then
+  TESTLOGS="$TESTLOGS $H_TARGET/libgomp/testsuite/libgomp.sum"
+fi
 
 # Test the just-built GCC with the GDB testsuite.
 if [ -d $GDB_TESTSUITE ] ; then
@@ -161,17 +197,38 @@ for LOG in $TESTLOGS ; do
 done | sort | uniq > $FAILED || exit 1
 comm -12 $FAILED $PASSES >> $REGRESS || exit 1
 NUMREGRESS=`wc -l < $REGRESS | tr -d ' '`
+
+if [ $NUMREGRESS -eq 0 ] || [ $add_passes_despite_regression -ne 0 ] ; then
+  # Update the state.
+  for LOG in $TESTLOGS ; do
+    L=`basename $LOG`
+    awk '/^PASS: / { print "'$L'",$2; }' $LOG || exit 1
+  done | sort | uniq | comm -23 - $FAILED > ${PASSES}~ || exit 1
+  [ -s ${PASSES}~ ] || exit 1
+  if [ $NUMREGRESS -ne 0 ] ; then
+    # The way we keep track of new PASSes when in "regress-N" for
+    # --add-passes-despite-regression, is to *add* them to previous
+    # PASSes.  Just as without this option, we don't forget *any* PASS
+    # lines, because besides the ones in $REGRESS that we definitely
+    # don't want to lose, their removal or rename may have been a
+    # mistake (as in, the cause of the "regress-N" state).  If they
+    # come back, we then know they're regressions.
+    cat ${PASSES}~ ${PASSES} | sort -u > ${PASSES}~~
+    mv ${PASSES}~~ ${PASSES} || exit 1
+    rm ${PASSES}~ || exit 1
+  else
+    # In contrast to the merging for "regress-N", we just overwrite
+    # the known PASSes when in the "pass" state, so we get rid of
+    # stale PASS lines for removed, moved or otherwise changed tests
+    # which may be added back with a different meaning later on.
+    mv ${PASSES}~ ${PASSES} || exit 1
+  fi
+fi
+
 if [ $NUMREGRESS -ne 0 ] ; then
   echo regress-$NUMREGRESS > $RESULT
   exit 1
 fi
 
-# It passed.  Update the state.
-for LOG in $TESTLOGS ; do
-  L=`basename $LOG`
-  awk '/^PASS: / { print "'$L'",$2; }' $LOG || exit 1
-done | sort | uniq | comm -23 - $FAILED > ${PASSES}~ || exit 1
-[ -s ${PASSES}~ ] || exit 1
-mv ${PASSES}~ ${PASSES} || exit 1
 echo pass > $RESULT
 exit 0