From: J.T. Conklin Date: Thu, 16 Feb 1995 18:41:54 +0000 (+0000) Subject: * Makefile.in, gdb.{base,c++,chill}/Makefile.in (GDB, GDBFLAGS): X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=65424cda041d48a03284ca76c30483d9d80c6ad5;p=binutils-gdb.git * Makefile.in, gdb.{base,c++,chill}/Makefile.in (GDB, GDBFLAGS): Removed, these values are set by lib/gdb.exp. * lib/gdb.exp: If GDBFLAGS is unset, set it to -nx. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 562e1736828..753dfea9f15 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +Thu Feb 16 10:30:24 1995 J.T. Conklin + + * Makefile.in, gdb.{base,c++,chill}/Makefile.in (GDB, GDBFLAGS): + Removed, these values are set by lib/gdb.exp. + + * lib/gdb.exp: If GDBFLAGS is unset, set it to -nx. + Wed Feb 15 14:23:28 1995 J.T. Conklin * config/vx-gdb.exp (spawn_vxgdb): Use default_gdb_start instead diff --git a/gdb/testsuite/gdb.base/Makefile.in b/gdb/testsuite/gdb.base/Makefile.in index c48cfc07e2a..3893db5b678 100644 --- a/gdb/testsuite/gdb.base/Makefile.in +++ b/gdb/testsuite/gdb.base/Makefile.in @@ -1,5 +1,5 @@ # Makefile for the base tests for GDB. -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. # This file is part of GDB. @@ -84,20 +84,6 @@ CC = ` \ fi; \ fi` - -GDB = ` \ - if [ -f $${rootme}/../../gdb ] ; then \ - echo $${rootme}/../../gdb ; \ - else \ - if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ - echo gdb; \ - else \ - t='$(program_transform_name)'; echo gdb | sed -e '' $$t; \ - fi; \ - fi` - -GDBFLAGS = -nx - #### host, target, and site specific Makefile frags come in here. EXECUTABLES = \ @@ -293,7 +279,6 @@ site.exp: ./config.status Makefile @echo "## these variables are automatically generated by make ##" > ./tmp0 @echo "# Do not edit here. If you wish to override these values" >> ./tmp0 @echo "# add them to the last section" >> ./tmp0 - @echo "set GDBFLAGS \"${GDBFLAGS}\"" >> ./tmp0 @echo "set host_triplet ${host_canonical}" >> ./tmp0 @echo "set target_triplet ${target_canonical}" >> ./tmp0 @echo "set srcdir ${srcdir}" >> ./tmp0 @@ -314,7 +299,7 @@ just-check: if [ -f $${rootme}/../../expect/expect ] ; then \ TCL_LIBRARY=$${srcdir}/../../tcl/library ; \ export TCL_LIBRARY ; fi ; \ - $(RUNTEST) $(RUNTESTFLAGS) --tool gdb GDB=$(GDB) --srcdir $(srcdir) + $(RUNTEST) $(RUNTESTFLAGS) --tool gdb --srcdir $(srcdir) clean mostlyclean: -rm -f *~ *.o a.out xgdb *.x $(EXECUTABLES) diff --git a/gdb/testsuite/gdb.chill/Makefile.in b/gdb/testsuite/gdb.chill/Makefile.in index eb9dec41423..8b395836565 100644 --- a/gdb/testsuite/gdb.chill/Makefile.in +++ b/gdb/testsuite/gdb.chill/Makefile.in @@ -1,5 +1,5 @@ # Makefile for regression testing Chill support for the GNU debugger. -# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. # This file is part of GDB. @@ -92,19 +92,6 @@ CHILL_LIB = ` \ echo -lchill; \ fi` -GDB = ` \ - if [ -f $${rootme}/../../gdb ] ; then \ - echo $${rootme}/../../gdb ; \ - else \ - if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ - echo gdb; \ - else \ - t='$(program_transform_name)'; echo gdb | sed -e '' $$t; \ - fi; \ - fi` - -GDBFLAGS = -nx - #### host, target, and site specific Makefile frags come in here. EXECUTABLES = chillvars.exe result.exe tuples.exe \ @@ -132,7 +119,7 @@ pr-5646.o: pr-5646-grt.o rootme=`pwd`/; export rootme; \ cd .. ; \ $(MAKE) just-check RUNTESTFLAGS="${RUNTESTFLAGS} $*.exp" \ - GDB=${GDB} EXPECT=${EXPECT} + EXPECT=${EXPECT} .NOEXPORT: INFODIRS=doc @@ -152,7 +139,6 @@ site.exp: ./config.status Makefile @echo "## these variables are automatically generated by make ##" > ./tmp0 @echo "# Do not edit here. If you wish to override these values" >> ./tmp0 @echo "# add them to the last section" >> ./tmp0 - @echo "set GDBFLAGS \"${GDBFLAGS}\"" >> ./tmp0 @echo "set host_os ${host_os}" >> ./tmp0 @echo "set host_alias ${host_alias}" >> ./tmp0 @echo "set host_cpu ${host_cpu}" >> ./tmp0 @@ -179,7 +165,7 @@ just-check: rootme=`pwd`/; export rootme; \ cd .. ; \ $(MAKE) just-check RUNTESTFLAGS="${RUNTESTFLAGS} $${tests}" \ - GDB=${GDB} EXPECT=${EXPECT} + EXPECT=${EXPECT} clean mostlyclean: -rm -f *~ core *.o a.out xgdb *.x $(EXECUTABLES) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index a3e0fac75d1..31cdc4eaee0 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -30,7 +30,7 @@ if ![info exists GDB] then { global GDBFLAGS if ![info exists GDBFLAGS] then { - set GDBFLAGS "" + set GDBFLAGS "-nx" } # set the prompt if it doesn't exist @@ -220,16 +220,8 @@ proc gdb_test { args } { } set result -1 - set errmess "" if ![string match $command ""] { - # trap the send so any problems don't crash things - catch "send \"$command\n\"" errmess - if [string match "write.spawn_id=\[0-9\]+.:" $errmess] then { - perror "sent \"$command\" got expect error \"$errmess\"" - catch "close" - gdb_start - return -1 - } + send "$command\n" } expect { @@ -298,11 +290,11 @@ proc gdb_test { args } { # Second one is string to match gdb result to # Third one is an optional message to be printed # -# This differs from gdb_test in a few ways: (1) no catch on the send (there is -# no reason for this to be different from gdb_test but I think the lack of -# catch is correct), (2) it tests for the " =" (that could easily be moved -# to the callers, (3) the pattern must be followed by \r\n and the prompt, -# not other garbage as in gdb_test (this feature seems kind of worthwhile). +# This differs from gdb_test in a few ways: (1) handling of empty +# sendthis (I suspect test_print_accept callers never use this), (2) +# it tests for the " =" (that could easily be moved to the callers, +# (3) the pattern must be followed by \r\n and the prompt, not other +# garbage as in gdb_test (this feature seems kind of worthwhile). proc test_print_accept { args } { global prompt