* btest-gcc.sh: Add gdb.sum to TESTLOGS only when GDB testsuite is run.

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

diff --git a/contrib/regression/ChangeLog b/contrib/regression/ChangeLog
index 9b3406a..b7759bc 100644 (file)
--- a/contrib/regression/ChangeLog
+++ b/contrib/regression/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-22  Geoffrey Keating  <geoffk@apple.com>
+
+       * btest-gcc.sh: Add gdb.sum to TESTLOGS only when GDB testsuite is run.
+
 2002-10-11  Geoffrey Keating  <geoffk@apple.com>
 
        * objs-gcc.sh: Don't install GDB testsuite if GDB was not built.

diff --git a/contrib/regression/btest-gcc.sh b/contrib/regression/btest-gcc.sh
index 7dfddb8..524dfd9 100755 (executable)
--- a/contrib/regression/btest-gcc.sh
+++ b/contrib/regression/btest-gcc.sh
@@ -99,8 +99,7 @@ H_REAL_TARGET=`$SOURCE/config.sub $H_TARGET || exit 1`
 TESTLOGS="gcc/testsuite/gcc.sum
 gcc/testsuite/g++.sum
 gcc/testsuite/g77.sum
-gcc/testsuite/objc.sum
-test-gdb/gdb.sum"
+gcc/testsuite/objc.sum"
 # $H_TARGET/libstdc++-v3/testsuite/libstdc++-v3.sum
 
 # Build.
@@ -126,25 +125,24 @@ make -k check-gcc
 make check-target-libstdc++-v3
 
 # Test the just-built GCC with the GDB testsuite.
-mkdir test-gdb || exit 1
 if [ -d $GDB_TESTSUITE ] ; then
-cd $GDB_TESTSUITE || exit 1
-for i in gdb.* ; do
-  if [ -d $i ] ; then
-    mkdir $BUILD/test-gdb/$i
-  fi
-done
-cd $BUILD/test-gdb || exit 1
-echo "set host_alias $H_HOST" > site.exp
-echo "set host_triplet $H_HOST" >> site.exp
-echo "set target_alias $H_TARGET" >> site.exp
-echo "set target_triplet $H_REAL_TARGET" >> site.exp
-echo "set build_alias $H_BUILD" >> site.exp
-echo "set build_triplet $H_BUILD" >> site.exp
-echo "set srcdir $GDB_TESTSUITE" >> site.exp
-runtest --tool gdb
-else
-  echo 'gdb tests not run' > $BUILD/test-gdb/gdb.sum
+  mkdir test-gdb || exit 1
+  cd $GDB_TESTSUITE || exit 1
+  for i in gdb.* ; do
+    if [ -d $i ] ; then
+      mkdir $BUILD/test-gdb/$i
+    fi
+  done
+  cd $BUILD/test-gdb || exit 1
+  echo "set host_alias $H_HOST" > site.exp
+  echo "set host_triplet $H_HOST" >> site.exp
+  echo "set target_alias $H_TARGET" >> site.exp
+  echo "set target_triplet $H_REAL_TARGET" >> site.exp
+  echo "set build_alias $H_BUILD" >> site.exp
+  echo "set build_triplet $H_BUILD" >> site.exp
+  echo "set srcdir $GDB_TESTSUITE" >> site.exp
+  runtest --tool gdb
+  TESTLOGS="$TESTLOGS test-gdb/gdb.sum"
 fi
 
 # Sanity-check the testlogs.  They should contain at least one PASS.