From 4d2ad0a87b6d12b7e83c5cd4e525ebc7f0b1bb11 Mon Sep 17 00:00:00 2001 From: Bill Cox Date: Thu, 12 May 1994 21:08:47 +0000 Subject: [PATCH] * .Sanitize: Drop the gdb.t30 and gdb.t31 directories unless keep-chill was specified on the command line. * Makefile.in: Add comment lines to Sanitize out CHILL references unless keep-chill was specified. --- gdb/testsuite/.Sanitize | 8 ++++++-- gdb/testsuite/ChangeLog | 11 +++++++++++ gdb/testsuite/Makefile.in | 11 +++++++---- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/.Sanitize b/gdb/testsuite/.Sanitize index d5914c0092a..86e8e516787 100644 --- a/gdb/testsuite/.Sanitize +++ b/gdb/testsuite/.Sanitize @@ -15,6 +15,12 @@ Do-first: +if ( echo $* | grep keep\-chill > /dev/null ) ; then + keep_these_too="gdb.t30 gdb.t31" +else + lose_these_too="gdb.t30 gdb.t31" +fi + # All files listed between the "Things-to-keep:" line and the # "Do-last:" line will be kept. All other files will be removed. # Directories listed in this section will have their own Sanitize @@ -53,8 +59,6 @@ gdb.t21 gdb.t22 gdb.t23 gdb.t24 -gdb.t30 -gdb.t31 lib Things-to-lose: diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1f66a4d60d7..9071bc75db4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,14 @@ +Thu May 12 14:06:34 1994 Bill Cox (bill@rtl.cygnus.com) + + * .Sanitize: Drop the gdb.t30 and gdb.t31 directories + unless keep-chill was specified on the command line. + * Makefile.in: Add comment lines to Sanitize out CHILL + references unless keep-chill was specified. + +Tue May 3 16:08:09 1994 Kung Hsu (kung@mexican.cygnus.com) + + * gdb.t22/virtfunc.exp: Fix g++ ptype expected outputs. + Fri Apr 29 14:26:35 1994 Stan Shebs (shebs@andros.cygnus.com) * Makefile.in (RUNTEST): Default to just "runtest". diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index 642c1dc6b23..41d4035f12f 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -50,8 +50,10 @@ INSTALL_PROGRAM = $(INSTALL) INSTALL_DATA = $(INSTALL) CFLAGS = -g +# start-sanitize-chill CHILLFLAGS = $(CFLAGS) CHILL_LIB = -lchill +# end-sanitize-chill # 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. @@ -59,16 +61,13 @@ CXXFLAGS = -g -O LINK= ln -s SUBDIRS= +RUNTEST = runtest RUNTESTFLAGS = EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \ echo $${rootme}/../../expect/expect ; \ else echo expect ; fi` -RUNTEST = `if [ -f $${srcdir}/../../dejagnu/runtest ] ; then \ - echo $${srcdir}/../../dejagnu/runtest ; \ - else echo runtest ; fi` - RUNTEST_FOR_TARGET = ` \ if [ -f $${rootme}/../../dejagnu/site.exp ] ; then \ echo $${rootme}/../../dejagnu/runtest ; \ @@ -103,6 +102,7 @@ CXX_FOR_TARGET = ` \ fi; \ fi` +# start-sanitize-chill CHILLFLAGS = $(CFLAGS) CHILL = gcc CHILL_FOR_TARGET = ` \ @@ -128,6 +128,7 @@ CHILL = ` \ t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ fi; \ fi` +# end-sanitize-chill GDB = ` \ if [ -f $${rootme}/../gdb ] ; \ @@ -148,10 +149,12 @@ TARGET_FLAGS_TO_PASS = \ 'CC=$$(CC_FOR_TARGET)' \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ "CFLAGS=$(CFLAGS)" \ +# start-sanitize-chill "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)" \ -- 2.30.2