* gdb.base/a1-selftest.exp: Change "i*86-*-sysv4" xfail for

	"backtrace through signal handler" to "i*86-*-sysv4*".
	* gdb.base/signals.exp: Add xfail for "'next' behaved as
	continue" case.  Add "known SVR4 bug" to fail message.
	Add "i*86-*-bsdi2.0" xfail for "handle all print".
	Add "i*86-*-bsdi2.0" xfail for "backtrace in signals_tests_1".
	* gdb.base/ptype.exp: Add "i*86-*-sysv4*" xfail for
	"whatis unnamed typedef'd enum..." and "ptype t_char_array".
	* gdb.base/langs.exp: Add "i*86-*-sysv4*" xfail for
	"up to foo in langs.exp", "show language at foo in
	langs.exp", "up to cppsub_ in langs.exp", "show
	language at cppsub_ in langs.exp", "up to fsub in
	langs.exp", and "show language at fsub in langs.exp".
	* gdb.base/corefile.exp: Add "i*86-*-sysv4*" to xfail for
	"bactrace in corefile.exp".
	* gdb.base/callfuncs.exp: Change xfail to "i*86-*-*" for
	"call inferior function with struct - returns float" and
	"call inferior function with struct - returns double".

1 files changed, 32 insertions, 45 deletions

diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 0647860df6e..5d774fd2a0f 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for regression testing 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.
 
@@ -14,8 +14,8 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; see the file COPYING.  If not, write to
-# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 srcdir = .
 prefix = /usr/local
@@ -49,10 +49,12 @@ INSTALL = install -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 
-CFLAGS = -g
-# start-sanitize-chill
-CHILLFLAGS = $(CFLAGS)
-# end-sanitize-chill
+# Do not use CFLAGS, that is set in the top-level config/mh-hp300 to not
+# contain -g.  In general, the flags to be used for building the tools and
+# the flags to be used to build the testsuite probably don't have much to
+# do with each other.
+TESTSUITE_CFLAGS = -g
+CHILLFLAGS = $(TESTSUITE_CFLAGS)
 # This should probably be consistent with the top-level Makefile.in,
 # gdb/Makefile.in, and gdb/testsuite/gdb.t2*/Makefile.in, so that "make check"
 # has the same effect no matter where it is run.
@@ -111,20 +113,18 @@ CXX_FOR_TARGET = ` \
     fi; \
   fi`
 
-# start-sanitize-chill
-CHILLFLAGS = $(CFLAGS)
+CHILLFLAGS = $(TESTSUITE_CFLAGS)
 CHILL = gcc
 CHILL_FOR_TARGET = ` \
-  if [ -f $${rootme}/../../gcc/Makefile ] ; then \
+  if [ -f $${rootme}/../../gcc/xgcc ] ; then \
     echo $${rootme}/../../gcc/xgcc -B$${rootme}../../gcc/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo gcc; \
+      echo $(CHILL); \
     else \
       t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
     fi; \
   fi`
-CHILL = $(CHILL_FOR_TARGET)
 
 CHILL_LIB = ` \
   if [ -f $${rootme}/../../gcc/ch/runtime/libchill.a ] ; then \
@@ -133,20 +133,6 @@ CHILL_LIB = ` \
   else \
       echo -lchill; \
   fi`
-# end-sanitize-chill
-
-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.
 
@@ -159,13 +145,11 @@ TARGET_FLAGS_TO_PASS = \
         "against=$(against)" \
         'CC=$$(CC_FOR_TARGET)' \
         "CC_FOR_TARGET=$(CC_FOR_TARGET)" \
-        "CFLAGS=$(CFLAGS)" \
-	$(start-sanitize-chill) \
+        "CFLAGS=$(TESTSUITE_CFLAGS)" \
         "CHILLFLAGS=$(CHILLFLAGS)" \
         'CHILL=$$(CHILL_FOR_TARGET)' \
         "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
         "CHILL_LIB=$(CHILL_LIB)" \
-	$(end-sanitize-chill) \
         'CXX=$$(CXX_FOR_TARGET)' \
         "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
         "CXXFLAGS=$(CXXFLAGS)" \
@@ -199,7 +183,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_alias $(host_alias)" >> ./tmp0
 	@echo "set host_triplet ${host_canonical}" >> ./tmp0
 	@echo "set target_alias $(target_alias)" >> ./tmp0
@@ -223,7 +206,7 @@ just-check:
 	if [ -f $${rootme}/../../expect/expect ] ; then  \
 	  TCL_LIBRARY=$${srcdir}/../../tcl/library ; \
 	  export TCL_LIBRARY ; fi ; \
-	$(RUNTEST) $(RUNTESTFLAGS) GDB=$(GDB)
+	$(RUNTEST) $(RUNTESTFLAGS) 
 
 subdir_do: force
 	@for i in $(DODIRS); do \
@@ -252,25 +235,29 @@ subdirs:
 
 clean mostlyclean:
 	-rm -f *~ core *.o a.out xgdb *.x
-	for dir in ${SUBDIRS}; \
-	do \
-		echo "$$dir:"; \
-		if [ -d $$dir ]; then \
-			(cd $$dir; $(MAKE) clean); \
-		fi; \
-	done
+	if [ x"${SUBDIRS}" != x ] ; then \
+	    for dir in ${SUBDIRS}; \
+	    do \
+		    echo "$$dir:"; \
+		    if [ -d $$dir ]; then \
+			    (cd $$dir; $(MAKE) clean); \
+		    fi; \
+	    done ; \
+	else true; fi
 
 distclean realclean: clean
 	-rm -f *~ core *.log *.plog *.sum *.psum site.*
 	-rm -f Makefile config.status *-init.exp
 	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-	for dir in ${SUBDIRS}; \
-	do \
-		echo "$$dir:"; \
-		if [ -d $$dir ]; then \
-			(cd $$dir; $(MAKE) distclean); \
-		fi; \
-	done
+	if [ x"${SUBDIRS}" != x ] ; then \
+	    for dir in ${SUBDIRS}; \
+	    do \
+		    echo "$$dir:"; \
+		    if [ -d $$dir ]; then \
+			    (cd $$dir; $(MAKE) distclean); \
+		    fi; \
+	    done ; \
+	else true; fi
 
 Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in $(host_makefile_frag) $(target_makefile_frag)
 	$(SHELL) ./config.status