Remove chill sanitizations, which are no longer necessary.

4 files changed, 6 insertions, 121 deletions

diff --git a/gdb/testsuite/.Sanitize b/gdb/testsuite/.Sanitize
index 40bb221..7e59bff 100644
--- a/gdb/testsuite/.Sanitize
+++ b/gdb/testsuite/.Sanitize
@@ -15,10 +15,6 @@
 
 Do-first:
 
-if ( echo $* | grep keep\-chill > /dev/null ) ; then
-	keep_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
@@ -55,6 +51,9 @@ gdb.t20
 gdb.t21
 gdb.t22
 gdb.t23
+gdb.t30
+gdb.t31
+
 lib
 
 # are executed as a /bin/sh shell script after everything else is
@@ -62,53 +61,6 @@ lib
 
 Do-last:
 
-echo Thawing away the \"chill\"...
-
-# Don't try to clean directories here, as the 'mv' command will fail.
-# Also, grep fails on NFS mounted directories.
-if ( echo $* | grep keep\-chill > /dev/null ) ; then
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
-			echo Keeping chill stuff in $i
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
-			echo Thawing the \"chill\" out of $i...
-			cp $i new
-			sed '/start\-sanitize\-chill/,/end-\sanitize\-chill/d' < $i > new
-			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-				echo Caching $i in .Recover...
-				mv $i .Recover
-			fi
-			mv new $i
-		fi
-	done
-	echo Thawing the \"chill\" out of configure.in...
-	cp configure.in new
-	sed -e '
-	  s/gdb.t30//g
-	  s/gdb.t31//g
-	' < configure.in > new
-	if [ -n "${safe}" -a ! -f .Recover/configure.in ] ; then
-		echo Caching configure.in in .Recover...
-		mv configure.in .Recover
-	fi
-	mv new configure.in
-	echo Thawing the \"chill\" out of Makefile.in...
-	cp Makefile.in new
-	sed -e '
-	  /CHILL=/d
-	  /CHILLFLAGS=/d
-	  s/gdb.t30//g
-	  s/gdb.t31//g
-	' < Makefile.in > new
-	if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then
-		echo Caching Makefile.in in .Recover...
-		mv Makefile.in .Recover
-	fi
-	mv new Makefile.in
 fi
 
 # eof
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ccb503f..429d6a6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -115,21 +115,17 @@ Wed Mar 24 14:43:38 1993  david d `zoo' zuhn  (zoo at poseidon.cygnus.com)
 
 Wed Mar 24 09:48:03 1993  Fred Fish  (fnf@cygnus.com)
 
-	**** start-sanitize-chill ****
 	* gdb.t31/gdbme.ch:  Re-enable code that previously caused
 	compiler to coredump.
 	* gdb.t31/chillvars.exp:  Re-enable tests that depend on that
 	code.
-	**** end-sanitize-chill ****
 
 Tue Mar 23 08:53:42 1993  Fred Fish  (fnf@cygnus.com)
 
-	**** start-sanitize-chill ****
 	* gdb.t31/gdbme.ch:  Comment out code that causes chill compiler
 	coredump.
 	* gdb.t31/chillvars.exp:  Comment out tests that depend on that
 	code.
-	**** end-sanitize-chill ****
 
 Sun Mar 21 17:56:47 1993  Rob Savoye  (rob at darkstar.cygnus.com)
 
@@ -159,12 +155,9 @@ Tue Mar 16 15:37:11 1993  Fred Fish  (fnf@cygnus.com)
 	setting sevenbit-strings.
 	* gdb.t04/setvar.exp, gdb.t13/bitfields.exp:  Make commands
 	to set sevenbit-strings consistent across tests.
-	**** start-sanitize-chill ****
 	gdb.t30/chexp.exp, gdb.t31/chillvars.exp:  Make commands to
 	set sevenbit-strings consistent across tests.
-	**** end-sanitize-chill ****
 
->>>>>>> 1.16
 Fri Mar 12 08:47:20 1993  Fred Fish  (fnf@cygnus.com)
 
 	* gdb.t21/demangle.exp (proc demangle):  Adjust quotes in an
@@ -253,7 +246,6 @@ Wed Feb 24 08:05:38 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 Wed Feb 24 08:03:38 1993  Fred Fish  (fnf@cygnus.com)
 
-	**** start-sanitize-chill ****
 	* gdb.t31/chillvars.exp (test_structs):  New proc to test printing
 	of Chill STRUCT types and STRUCT values.
 	* gdb.t31/chillvars.exp (test_strings):  Expect "CHAR" now, rather
@@ -261,7 +253,6 @@ Wed Feb 24 08:03:38 1993  Fred Fish  (fnf@cygnus.com)
 	* gdb.t31/in-gdbme.ch (simple_struct, nested_struct, struct1,
 	struct2):  New struct definitions and initializations to test 
 	simple Chill STRUCT types.
-	**** end-sanitize-chill ****
 
 Tue Feb 23 11:55:06 1993  Fred Fish  (fnf@cygnus.com)
 
@@ -282,11 +273,9 @@ Tue Feb 23 11:55:06 1993  Fred Fish  (fnf@cygnus.com)
 	* gdb.t21/demangle.exp:  Add many new test strings to demangle,
 	and fix a whole bunch that had incorrect expected output but were
 	passing anyway because of the bug in "proc demangle".
-	**** start-sanitize-chill ****
 	* gdb.t31/chillvars.exp:  Remove setup_xfail for printing string
 	type.
 	* gdb.t31/in-gdbme.ch:  Uncomment string4, now compiles.
-	**** end-sanitize-chill ****
 
 Mon Feb 22 07:54:03 1993  Mike Werner  (mtw@poseidon.cygnus.com)
 
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 29aa2ae..dc7db23 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -30,11 +30,9 @@ INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 
 CFLAGS = -g
-$(start-sanitize-chill)
 CHILLFLAGS = $(CFLAGS)
 CHILL_LIB = -lchill
-$(end-sanitize-chill)
-CXXFLAGS = -g -O
+CXXFLAGS = -g
 
 LINK=		ln -s
 SUBDIRS=
@@ -52,7 +50,6 @@ CC = ` \
     fi; \
   fi`
 
-$(start-sanitize-chill)
 CHILL = ` \
   if [ -f $${rootme}../../gcc/Makefile ] ; then \
     echo $${rootme}../../gcc/xgcc -B$${rootme}../../gcc/ -L$${rootme}../../chillrt/; \
@@ -63,7 +60,6 @@ CHILL = ` \
       t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
     fi; \
   fi`
-$(end-sanitize-chill)
 
 CXX = ` \
   if [ -f $${rootme}../../gcc/Makefile ] ; then \
@@ -96,11 +92,9 @@ FLAGS_TO_PASS = \
 	"CXXFLAGS=$(CXXFLAGS)" \
 	"CC=$(CC)" \
 	"CFLAGS=$(CFLAGS)" \
-	$(start-sanitize-chill)\
 	"CHILLFLAGS=$(CHILLFLAGS)" \
 	"CHILL=$(CHILL)" \
 	"CHILL_LIB=$(CHILL_LIB)" \
-	$(end-sanitize-chill)\
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -120,24 +114,8 @@ install-info:
 dvi:
 
 install:
-	-parent=`echo $(datadir)|sed -e 's@/[^/]*$$@@'`; \
-	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
-	-if [ -d $(datadir) ] ; then true ; else mkdir $(datadir) ; fi
-	-parent=`echo $(targetdir)|sed -e 's@/[^/]*$$@@'`; \
-	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
-	-if [ -d $(targetdir) ] ; then true ; else mkdir $(targetdir) ; fi
-	-for file in ./lib/*.exp; \
-	do \
-		$(INSTALL_DATA) $$file $(datadir) ; \
-	done
-	-for file in ./*-init.exp; \
-	do \
-		$(INSTALL_DATA) $$file $(targetdir) ; \
-	done
 
 uninstall: force
-#	-rm -f $(datadir)/*.exp
-	-rm -fr $(targetdir)
 
 site.exp: ./config.status
 	@echo "Making a new config file..."
@@ -165,8 +143,8 @@ site.exp: ./config.status
 	@rm -f ./tmp1 ./tmp0
 
 installcheck:
-check: all site.exp
-	$(RUNTEST) $(RUNTESTFLAGS) --tool gdb GDB=$(GDB)
+check: all
+	$(RUNTEST) $(RUNTESTFLAGS) --tool gdb GDB=$(GDB) --srcdir $(srcdir)
 
 subdir_do: force
 	@for i in $(DODIRS); do \
diff --git a/gdb/testsuite/config/.Sanitize b/gdb/testsuite/config/.Sanitize
index 8a523ca..c2a365d 100644
--- a/gdb/testsuite/config/.Sanitize
+++ b/gdb/testsuite/config/.Sanitize
@@ -15,10 +15,6 @@
 
 Do-first:
 
-if ( echo $* | grep keep\-chill > /dev/null ) ; then
-	keep_these_too=""
-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
@@ -38,35 +34,5 @@ vx-gdb.exp
 # done.
 
 Do-last:
-echo Thawing away the \"chill\"...
-
-# Don't try to clean directories here, as the 'mv' command will fail.
-# Also, grep fails on NFS mounted directories.
-if ( echo $* | grep keep\-chill > /dev/null ) ; then
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
-			echo Keeping chill stuff in $i
-		fi
-	done
-else
-	for i in * ; do
-		if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then
-			echo Thawing the \"chill\" out of $i...
-			cp $i new
-			sed '/start\-sanitize\-chill/,/end-\sanitize\-chill/d' < $i > new
-			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
-				echo Caching $i in .Recover...
-				mv $i .Recover
-			fi
-			mv new $i
-		fi
-	done
-fi
 
 # eof
-CVS
-mips-gdb.exp
-nind-gdb.exp
-udi-gdb.exp
-unix-gdb.exp
-vx-gdb.exp