From 3aba335daf402c5c9e68bbd7b798e2e8c55e00ce Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@airs.com>
Date: Fri, 14 Oct 1994 18:56:29 +0000
Subject: [PATCH] 	Rewrite testsuite. 	* configure.in, Makefile.in:
 Remove. 	* binutils-all/configure.in, binutils-all/Makefile.in: Remove.
 	* binutils-all/bintest.c: Remove. 	* binutils-all/bintest.s: New
 file. 	* binutils-all/nm.exp, binutils-all/objdump.exp: Rewrite. 	*
 binutils-all/size.exp: Rewrite. 	* config/default.exp: Load
 utils-lib.exp.  Set AS and ASFLAGS. 	Don't go up one directory from
 $base_dir.  Create tmpdir. 	(binutils_run, binutils-assemble): New
 procedures. 	* config/unix.exp: Remove. 	* config/mt-a29k-udi,
 config/mt-i386-aout: Remove. 	* config/mt-i960-nindy, config/mt-lynx,
 config/mt-m68k: Remove. 	* config/mt-mips-ecoff, config/mt-slite:
 Remove. 	* config/mt-sparc-aout, config/mt-vxworks: Remove. 	*
 lib/utils-lib.exp (binutil_version): Don't redirect standard 	input when
 getting version.  Don't unset errorInfo. 	(default_binutils_run): New
 procedure. 	(default_binutils_assemble): New procedure.

---
 binutils/testsuite/.Sanitize                 |   2 -
 binutils/testsuite/Makefile.in               | 188 -------------------
 binutils/testsuite/binutils-all/.Sanitize    |   4 +-
 binutils/testsuite/binutils-all/Makefile.in  |  44 -----
 binutils/testsuite/binutils-all/bintest.c    |  30 ---
 binutils/testsuite/binutils-all/bintest.s    |   8 +
 binutils/testsuite/binutils-all/configure.in |  30 ---
 binutils/testsuite/config/.Sanitize          |  10 -
 binutils/testsuite/config/mt-a29k-udi        |   1 -
 binutils/testsuite/config/mt-i386-aout       |   1 -
 binutils/testsuite/config/mt-i960-nindy      |   1 -
 binutils/testsuite/config/mt-lynx            |   1 -
 binutils/testsuite/config/mt-m68k            |   1 -
 binutils/testsuite/config/mt-mips-ecoff      |   1 -
 binutils/testsuite/config/mt-slite           |   1 -
 binutils/testsuite/config/mt-sparc-aout      |   1 -
 binutils/testsuite/config/mt-vxworks         |   1 -
 binutils/testsuite/config/unix.exp           |  59 ------
 binutils/testsuite/configure.in              |  31 ---
 19 files changed, 9 insertions(+), 406 deletions(-)
 delete mode 100644 binutils/testsuite/Makefile.in
 delete mode 100644 binutils/testsuite/binutils-all/Makefile.in
 delete mode 100644 binutils/testsuite/binutils-all/bintest.c
 create mode 100644 binutils/testsuite/binutils-all/bintest.s
 delete mode 100644 binutils/testsuite/binutils-all/configure.in
 delete mode 100644 binutils/testsuite/config/mt-a29k-udi
 delete mode 100644 binutils/testsuite/config/mt-i386-aout
 delete mode 100644 binutils/testsuite/config/mt-i960-nindy
 delete mode 100644 binutils/testsuite/config/mt-lynx
 delete mode 100644 binutils/testsuite/config/mt-m68k
 delete mode 100644 binutils/testsuite/config/mt-mips-ecoff
 delete mode 100644 binutils/testsuite/config/mt-slite
 delete mode 100644 binutils/testsuite/config/mt-sparc-aout
 delete mode 100644 binutils/testsuite/config/mt-vxworks
 delete mode 100644 binutils/testsuite/config/unix.exp
 delete mode 100644 binutils/testsuite/configure.in

diff --git a/binutils/testsuite/.Sanitize b/binutils/testsuite/.Sanitize
index 1c2eb8c272d..07757cea32b 100644
--- a/binutils/testsuite/.Sanitize
+++ b/binutils/testsuite/.Sanitize
@@ -24,10 +24,8 @@ Do-first:
 Things-to-keep:
 
 ChangeLog
-Makefile.in
 binutils-all
 config
-configure.in
 lib
 
 Things-to-lose:
diff --git a/binutils/testsuite/Makefile.in b/binutils/testsuite/Makefile.in
deleted file mode 100644
index 16189a56279..00000000000
--- a/binutils/testsuite/Makefile.in
+++ /dev/null
@@ -1,188 +0,0 @@
-# Makefile for regression testing the GNU binary utilities.
-# Copyright (C) 1993, 1994 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-srcdir = .
-prefix = /usr/local
-
-program_transform_name = 
-exec_prefix = $(prefix)
-bindir = $(exec_prefix)/bin
-libdir = $(exec_prefix)/lib
-tooldir = $(libdir)/$(target_alias)
-
-datadir = $(exec_prefix)/lib/deja-gnu
-mandir = $(prefix)/man
-man1dir = $(mandir)/man1
-man2dir = $(mandir)/man2
-man3dir = $(mandir)/man3
-man4dir = $(mandir)/man4
-man5dir = $(mandir)/man5
-man6dir = $(mandir)/man6
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-man9dir = $(mandir)/man9
-infodir = $(prefix)/info
-includedir = $(prefix)/include
-gxx_includedir = $(tooldir)/g++-include
-docdir = $(datadir)/doc
-targetdir = $(datadir)/$(target_alias)
-
-SHELL = /bin/sh
-
-INSTALL = install -c
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL)
-
-# start-sanitize-chill
-CFLAGS = -g
-CHILLFLAGS = $(CFLAGS)
-CHILL_LIB = -lchill
-# end-sanitize-chill
-
-CC_FOR_TARGET = ` \
-  if [ -f $${rootme}/../../gcc/xgcc ] ; then \
-    echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CC); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
-  fi`
-
-CXX = gcc
-CXX_FOR_TARGET = ` \
-  if [ -f $${rootme}/../../gcc/xgcc ] ; then \
-    echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CXX); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
-  fi`
-
-CXXFLAGS = -g -O
-
-EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; \
-        then echo $${rootme}/../../expect/expect ; \
-        else echo expect; fi`
-
-LINK=		ln -s
-SUBDIRS=
-
-RUNTEST = `if [ -f ${srcdir}/../../dejagnu/runtest ] ; \
-           then echo ${srcdir}/../../dejagnu/runtest ; \
-           else echo runtest ;  fi`
-RUNTESTFLAGS = 
-FLAGS_TO_PASS = \
-	"CC=$(CC)" \
-	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
-	"CFLAGS=$(CFLAGS)"
-
-#### host, target, and site specific Makefile frags come in here.
-
-all:		subdirs
-
-.NOEXPORT:
-INFODIRS=doc
-info:
-	@rootme=`pwd`/ ; export rootme ; \
-	rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
-	$(MAKE) subdir_do DO=info "DODIRS=$(INFODIRS)" $(FLAGS_TO_PASS)
-
-install-info:
-	@rootme=`pwd`/ ; export rootme ; \
-	$(MAKE) subdir_do DO=install-info "DODIRS=$(INFODIRS)" $(FLAGS_TO_PASS)
-
-check: site.exp all
-	rootme=`pwd`; export rootme; \
-	srcdir=${srcdir} ; export srcdir ; \
-	EXPECT=${EXPECT} ; export EXPECT ; \
-	if [ -f $${rootme}/../../expect/expect ] ; then  \
-	   TCL_LIBRARY=$${srcdir}/../../tcl/library ; \
-	   export TCL_LIBRARY ; fi ; \
-	$(RUNTEST) $(RUNTESTFLAGS)
-
-site.exp: ./config.status Makefile
-	@echo "Making a new config file..."
-	-@rm -f ./tmp?
-	@touch site.exp
-	-@mv site.exp site.bak
-	@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 host_triplet ${host_canonical}" >> ./tmp0
-	@echo "set target_triplet ${target_canonical}" >> ./tmp0
-	@echo "set tool binutils" >> ./tmp0
-	@echo "set srcdir ${srcdir}" >> ./tmp0
-	@echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0
-		@cat ./tmp0 > site.exp
-	@cat site.bak | sed \
-			-e '1,/^## All variables above are.*##/ d' >> site.exp
-	-@rm -f ./tmp?
-
-install:
-uninstall: force
-
-subdir_do: force
-	@for i in $(DODIRS); do \
-		if [ -d ./$$i ] ; then \
-			if (rootme=`pwd`/ ; export rootme ; \
-			    rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
-				cd ./$$i; \
-				$(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \
-			else exit 1 ; fi ; \
-		else true ; fi ; \
-	done
-force:
-
-
-subdirs:
-	for dir in ${SUBDIRS}; \
-	do \
-		echo "$$dir:"; \
-		if [ -d $$dir ]; then \
-			(rootme=`pwd`/ ; export rootme ; \
-			 rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
-			 cd $$dir; $(MAKE) $(FLAGS_TO_PASS)); \
-		fi; \
-	done
-
-clean:
-	-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
-
-distclean: clean
-	-rm -f *~ core
-	-rm -f Makefile config.status *-init.exp
-	-rm -fr *.log summary detail
-		for dir in ${SUBDIRS}; \
-		do \
-			echo "$$dir:"; \
-			(cd $$dir; $(MAKE) distclean); \
-		done
-
-Makefile : $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
-	$(SHELL) ./config.status
-
diff --git a/binutils/testsuite/binutils-all/.Sanitize b/binutils/testsuite/binutils-all/.Sanitize
index 3251e0b4d26..9450ce7df61 100644
--- a/binutils/testsuite/binutils-all/.Sanitize
+++ b/binutils/testsuite/binutils-all/.Sanitize
@@ -23,9 +23,7 @@ Do-first:
 
 Things-to-keep:
 
-Makefile.in
-bintest.c
-configure.in
+bintest.s
 nm.exp
 objdump.exp
 size.exp
diff --git a/binutils/testsuite/binutils-all/Makefile.in b/binutils/testsuite/binutils-all/Makefile.in
deleted file mode 100644
index 0aa10682a4d..00000000000
--- a/binutils/testsuite/binutils-all/Makefile.in
+++ /dev/null
@@ -1,44 +0,0 @@
-CFLAGS_FOR_TARGET = 
-
-CC_FOR_TARGET = ` \
-  if [ -f $${rootme}/../../gcc/xgcc ] ; then \
-    echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CC); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
-  fi`
-
-CXX = gcc
-CXX_FOR_TARGET = ` \
-  if [ -f $${rootme}/../../gcc/xgcc ] ; then \
-    echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CXX); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
-  fi`
-
-#### host, target, and site specific Makefile frags come in here.
-
-srcdir = .
-
-all: bintest
-
-bintest:        $(srcdir)/bintest.c
-	$(CC_FOR_TARGET) $(CFLAGS_FOR_TARGET) $(CFLAGS) -g -o bintest $(srcdir)/bintest.c $(LDFLAGS)
-
-clean:
-	-rm -f *.o bintest *.diff *~ *.bad core m68k.gld
-
-distclean:	clean
-	-rm -f Makefile config.status nmtest.c
-
-Makefile : $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
-	$(SHELL) ./config.status
-
-force:
diff --git a/binutils/testsuite/binutils-all/bintest.c b/binutils/testsuite/binutils-all/bintest.c
deleted file mode 100644
index e63d589a1ef..00000000000
--- a/binutils/testsuite/binutils-all/bintest.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * nmtest.c -- this is the C code portion of tests for the GNU binutils
- */
-
-main(argc, argv)
-int argc;
-char *argv[];
-{
-  char two();
-  int one();
-
-  one();
-  two();
-}
-
-int
-one ()
-{
-  int i, j;
-  j = i++;
-}
-
-char
-two ()
-{
-  int i, j;
-  i = j++;
-
-}
-
diff --git a/binutils/testsuite/binutils-all/bintest.s b/binutils/testsuite/binutils-all/bintest.s
new file mode 100644
index 00000000000..81dc89b010c
--- /dev/null
+++ b/binutils/testsuite/binutils-all/bintest.s
@@ -0,0 +1,8 @@
+	.text
+text_symbol:	
+	.long	1
+	.long	external_symbol
+	.data
+data_symbol:
+	.long	2
+	.comm common_symbol,4
diff --git a/binutils/testsuite/binutils-all/configure.in b/binutils/testsuite/binutils-all/configure.in
deleted file mode 100644
index 3f3da280c74..00000000000
--- a/binutils/testsuite/binutils-all/configure.in
+++ /dev/null
@@ -1,30 +0,0 @@
-# necessary to tailor a template configure script into the configure
-# script appropriate for this directory.  For more information, check
-# any existing configure script.
-
-srctrigger=nm.exp
-srcname="DejaGnu"
-
-# per-host:
-
-# per-target:
-
-# per-target:
-
-	# everything defaults to unix for a target
-target_makefile_frag=../config/mt-unix
-
-	# this section is for all targets
-case "${target}" in
-	i[345]86-*-aout) target_makefile_frag=../config/mt-i386-aout ;;
-	*-*-lynx*)	target_makefile_frag=../config/mt-lynx ;;
-	*-*-vxworks)	target_makefile_frag=../config/mt-vxworks ;;
-	m68k-*-*)	target_makefile_frag=../config/mt-m68k ;;
-	i960-*-nindy)	target_makefile_frag=../config/mt-i960-nindy ;;
-	a29k-*-udi)	target_makefile_frag=../config/mt-a29k-udi ;;
-	sparclite-*-*)	target_makefile_frag=../config/mt-slite ;;
-	sparc-*-aout)	target_makefile_frag=../config/mt-sparc-aout ;;
-	mips-*-ecoff)	target_makefile_frag=../config/mt-mips-ecoff ;;
-esac
-
-# post-target:
diff --git a/binutils/testsuite/config/.Sanitize b/binutils/testsuite/config/.Sanitize
index c0ab9c347b4..6434174df67 100644
--- a/binutils/testsuite/config/.Sanitize
+++ b/binutils/testsuite/config/.Sanitize
@@ -25,16 +25,6 @@ Do-first:
 Things-to-keep:
 
 default.exp
-unix.exp
-mt-a29k-udi
-mt-i386-aout
-mt-i960-nindy
-mt-lynx
-mt-m68k
-mt-mips-ecoff
-mt-slite
-mt-sparc-aout
-mt-vxworks
 
 Things-to-lose:
 
diff --git a/binutils/testsuite/config/mt-a29k-udi b/binutils/testsuite/config/mt-a29k-udi
deleted file mode 100644
index f88f2085c27..00000000000
--- a/binutils/testsuite/config/mt-a29k-udi
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS_FOR_TARGET = 
diff --git a/binutils/testsuite/config/mt-i386-aout b/binutils/testsuite/config/mt-i386-aout
deleted file mode 100644
index f88f2085c27..00000000000
--- a/binutils/testsuite/config/mt-i386-aout
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS_FOR_TARGET = 
diff --git a/binutils/testsuite/config/mt-i960-nindy b/binutils/testsuite/config/mt-i960-nindy
deleted file mode 100644
index a6ae4b615d9..00000000000
--- a/binutils/testsuite/config/mt-i960-nindy
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS_FOR_TARGET = -nostartfiles
diff --git a/binutils/testsuite/config/mt-lynx b/binutils/testsuite/config/mt-lynx
deleted file mode 100644
index f88f2085c27..00000000000
--- a/binutils/testsuite/config/mt-lynx
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS_FOR_TARGET = 
diff --git a/binutils/testsuite/config/mt-m68k b/binutils/testsuite/config/mt-m68k
deleted file mode 100644
index 493d702da31..00000000000
--- a/binutils/testsuite/config/mt-m68k
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS_FOR_TARGET = -Tidp.ld -nostartfiles
diff --git a/binutils/testsuite/config/mt-mips-ecoff b/binutils/testsuite/config/mt-mips-ecoff
deleted file mode 100644
index 3427754c47d..00000000000
--- a/binutils/testsuite/config/mt-mips-ecoff
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS_FOR_TARGET = -Tidp.ld
diff --git a/binutils/testsuite/config/mt-slite b/binutils/testsuite/config/mt-slite
deleted file mode 100644
index 2cae3ec01a1..00000000000
--- a/binutils/testsuite/config/mt-slite
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS_FOR_TARGET = -Tex93x.ld -nostartfiles -N
diff --git a/binutils/testsuite/config/mt-sparc-aout b/binutils/testsuite/config/mt-sparc-aout
deleted file mode 100644
index f88f2085c27..00000000000
--- a/binutils/testsuite/config/mt-sparc-aout
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS_FOR_TARGET = 
diff --git a/binutils/testsuite/config/mt-vxworks b/binutils/testsuite/config/mt-vxworks
deleted file mode 100644
index 23bb8bcd287..00000000000
--- a/binutils/testsuite/config/mt-vxworks
+++ /dev/null
@@ -1 +0,0 @@
-CFLAGS_FOR_TARGET = -r
diff --git a/binutils/testsuite/config/unix.exp b/binutils/testsuite/config/unix.exp
deleted file mode 100644
index 8bb7ac1f171..00000000000
--- a/binutils/testsuite/config/unix.exp
+++ /dev/null
@@ -1,59 +0,0 @@
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@prep.ai.mit.edu
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-load_lib util-defs.exp
-
-global NM
-if ![info exists NM] then {
-    set NM [findfile $base_dir/../nm.new $base_dir/../nm.new [transform nm]]
-}
-global NMFLAGS
-if ![info exists NMFLAGS] then {
-    set NMFLAGS ""
-}
-global SIZE
-if ![info exists SIZE] then {
-    set SIZE [findfile $base_dir/../size]
-}
-global SIZEFLAGS
-if ![info exists SIZEFLAGS] then {
-    set SIZEFLAGS ""
-}
-global OBJDUMP
-if ![info exists OBJDUMP] then {
-    set OBJDUMP [findfile $base_dir/../objdump]
-}
-global OBJDUMPFLAGS
-if ![info exists OBJDUMPFLAGS] then {
-    set OBJDUMPFLAGS ""
-}
-
-#
-# add some basic error trapping. These mostly catch programming error's
-# within the tests themselves
-#
-expect_before {
-    buffer_full		   { perror "internal buffer is full." }
-    "can't open '*'" { perror "Can't open test file." }
-}
-
-
-
diff --git a/binutils/testsuite/configure.in b/binutils/testsuite/configure.in
deleted file mode 100644
index e38c3324e5a..00000000000
--- a/binutils/testsuite/configure.in
+++ /dev/null
@@ -1,31 +0,0 @@
-# This file is a shell script fragment that supplies the information
-# necessary to tailor a template configure script into the configure
-# script appropriate for this directory.  For more information, check
-# any existing configure script.
-
-srctrigger="Makefile.in"
-srcname="DejaGnu"
-
-configdirs="binutils-all"
-
-# per-host:
-
-# per-target:
-
-	# this section is for all targets
-case "${target}" in
-       i[345]86-*-aout) target_makefile_frag=config/mt-i386-aout ;;
-       *-*-lynx*)      target_makefile_frag=config/mt-lynx ;;
-       *-*-vxworks)    target_makefile_frag=config/mt-vxworks ;;
-       m68k*-*-aout*)  target_makefile_frag=config/mt-m68k ;;
-       m68k*-*-coff*)  target_makefile_frag=config/mt-m68k ;;
-       i960-*-nindy)   target_makefile_frag=config/mt-i960-nindy ;;
-       a29k-*-udi)     target_makefile_frag=config/mt-a29k-udi ;;
-       sparclite*-*-*) target_makefile_frag=config/mt-slite ;;
-       sparc-*-aout)   target_makefile_frag=config/mt-sparc-aout ;;
-       mips-*-ecoff)   target_makefile_frag=config/mt-mips-ecoff ;;
-esac
-
-# post-target:
-
-	# make local configuration file, using MAKE if one is specified.
-- 
2.30.2