From 099c286e7440447b4c7d9e1ced7b86ffaa255c29 Mon Sep 17 00:00:00 2001 From: Bill Cox Date: Mon, 11 Apr 1994 23:17:18 +0000 Subject: [PATCH] * Makefile.in (check): Set TCL_LIBRARY for runtest. --- binutils/testsuite/ChangeLog | 14 ++++ binutils/testsuite/Makefile.in | 27 ++++++- gas/testsuite/ChangeLog | 4 + gas/testsuite/Makefile.in | 33 +++++++- gdb/testsuite/ChangeLog | 4 + gdb/testsuite/Makefile.in | 140 ++++++++++++++++++++++++--------- ld/ChangeLog | 4 + ld/Makefile.in | 36 ++++++++- 8 files changed, 219 insertions(+), 43 deletions(-) diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 231d82a6d7b..ce0a21002d3 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,17 @@ +Mon Apr 11 10:31:00 1994 Bill Cox (bill@rtl.cygnus.com) + + * Makefile.in (check): Set TCL_LIBRARY for runtest. + +Mon Feb 14 19:34:03 1994 Rob Savoye (rob@darkstar.cygnus.com) + + * Makefile.in: Use new config features of DejaGnu in site.exp + file. "Make check" should now work for all crosses. + +Fri Jan 28 18:00:29 1994 Ken Raeburn (raeburn@cujo.cygnus.com) + + * binutils.all/objdump.exp: In usage message, accept + "section-name" as well as "section_name". + Mon Jan 17 16:57:02 1994 Ken Raeburn (raeburn@cujo.cygnus.com) * binutils.all/objdump.exp: Trim list of format names expected, diff --git a/binutils/testsuite/Makefile.in b/binutils/testsuite/Makefile.in index 098a4908925..55a135f743e 100644 --- a/binutils/testsuite/Makefile.in +++ b/binutils/testsuite/Makefile.in @@ -1,3 +1,20 @@ +# 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 @@ -68,7 +85,9 @@ EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; \ LINK= ln -s SUBDIRS= -RUNTEST = runtest +RUNTEST = `if [ -f ${srcdir}/../../dejagnu/runtest ] ; \ + then echo ${srcdir}/../../dejagnu/runtest ; \ + else echo runtest ; fi` RUNTESTFLAGS = FLAGS_TO_PASS = \ "CC=$(CC)" \ @@ -91,6 +110,12 @@ install-info: $(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 diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index a3fe72bb643..fe343098583 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,7 @@ +Mon Apr 11 10:31:00 1994 Bill Cox (bill@rtl.cygnus.com) + + * Makefile.in (check): Set TCL_LIBRARY for runtest. + Mon Apr 11 07:54:10 1994 Jeffrey A. Law (law@snake.cs.utah.edu) * gas/hppa/more.parse/callinfobug.s: Add missing name for diff --git a/gas/testsuite/Makefile.in b/gas/testsuite/Makefile.in index ffbef0ebc19..63a870548fe 100644 --- a/gas/testsuite/Makefile.in +++ b/gas/testsuite/Makefile.in @@ -1,3 +1,22 @@ +# Makefile for regression testing the GNU assemblers. +# Copyright (C) 1987, 88, 90, 91, 92, 93, 1994 Free Software Foundation, Inc. + +#This file is part of the GNU Assembler (gas). + +#gas 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, or (at your option) +#any later version. + +#gas 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 GNU CC; see the file COPYING. If not, write to +#the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + srcdir = . prefix = /usr/local @@ -34,7 +53,13 @@ GCCFLAGS = -g -O LINK= ln -s -RUNTEST = runtest +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` RUNTESTFLAGS = # The ugliness in the program_transform_name version seems necessary @@ -99,6 +124,12 @@ site.exp: ./Makefile @mv -f ./tmp0 site.exp check: site.exp + 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) --tool gas AS=$(AS_FOR_TARGET) ASFLAGS="$(ASFLAGS)" force: diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 383b31bb2a1..9417eb6585d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +Mon Apr 11 10:31:00 1994 Bill Cox (bill@rtl.cygnus.com) + + * Makefile.in (check): Set TCL_LIBRARY for runtest. + Mon Apr 11 09:15:30 1994 Jeffrey A. Law (law@snake.cs.utah.edu) * From Peter Schauer with minor modifications. diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index d79b14feffc..f117c6d8ea8 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -1,5 +1,25 @@ +# Makefile for regression testing the GNU debugger. +# Copyright (C) 1987, 88, 90, 91, 92, 93, 1994 Free Software Foundation, Inc. + +#This file is part of GDB. + +#GDB 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, or (at your option) +#any later version. + +#GDB 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 GNU CC; see the file COPYING. If not, write to +#the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + srcdir = . prefix = /usr/local +program_transform_name = exec_prefix = $(prefix) bindir = $(exec_prefix)/bin @@ -32,38 +52,75 @@ INSTALL_DATA = $(INSTALL) CFLAGS = -g CHILLFLAGS = $(CFLAGS) CHILL_LIB = -lchill -CXXFLAGS = -g +# 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. +CXXFLAGS = -g -O LINK= ln -s SUBDIRS= -RUNTEST = runtest RUNTESTFLAGS = -CC = ` \ - if [ -f $${rootme}/../../gcc/Makefile ] ; then \ - echo $${rootme}/../../gcc/xgcc -B$${rootme}../../gcc/; \ +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 ; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ - echo cc; \ + echo $(RUNTEST); \ + else \ + t='$(program_transform_name)'; echo runtest | sed -e '' $$t; \ + fi; \ + fi` + +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` -CHILL = ` \ - if [ -f $${rootme}/../../gcc/Makefile ] ; then \ - echo $${rootme}/../../gcc/xgcc -B$${rootme}../../gcc/ -L$${rootme}../../chillrt/; \ +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 gcc; \ + echo $(CXX); \ else \ t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ fi; \ fi` -CXX = ` \ +CHILLFLAGS = $(CFLAGS) +CHILL = gcc +CHILL_FOR_TARGET = ` \ + if [ -f $${rootme}/../../gcc/xgcc ] ; then \ + echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/ -L$${rootme}/../../chillrt/; \ + else \ + if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ + echo $(CC); \ + else \ + t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ + fi; \ + fi` + +CHILL_LIB = -lchill + +CHILL = ` \ if [ -f $${rootme}/../../gcc/Makefile ] ; then \ - echo $${rootme}/../../gcc/xgcc -B$${rootme}../../gcc/; \ + echo $${rootme}/../../gcc/xgcc -B$${rootme}../../gcc/ -L$${rootme}../../chillrt/; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo gcc; \ @@ -80,29 +137,33 @@ GDB = ` \ GDBFLAGS = -nx -EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; \ - then echo $${rootme}/../../expect/expect ; \ - else echo expect; fi` - #### host, target, and site specific Makefile frags come in here. -FLAGS_TO_PASS = \ - "CXX=$(CXX)" \ - "CXXFLAGS=$(CXXFLAGS)" \ - "CC=$(CC)" \ - "CFLAGS=$(CFLAGS)" \ - "CHILLFLAGS=$(CHILLFLAGS)" \ - "CHILL=$(CHILL)" \ - "CHILL_LIB=$(CHILL_LIB)" \ - "INSTALL=$(INSTALL)" \ - "INSTALL_DATA=$(INSTALL_DATA)" \ - "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ - "LDFLAGS=$(LDFLAGS)" \ - "LINK=$(LINK)" \ - "LOADLIBES=$(LOADLIBES)" \ - "MAKEINFO=$(MAKEINFO)" \ - "exec_prefix=$(exec_prefix)" \ - "prefix=$(prefix)" +# The use of $$(x_FOR_TARGET) reduces the command line length by not +# duplicating the lengthy definition. +TARGET_FLAGS_TO_PASS = \ + "prefix=$(prefix)" \ + "exec_prefix=$(exec_prefix)" \ + "against=$(against)" \ + 'CC=$$(CC_FOR_TARGET)' \ + "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ + "CFLAGS=$(CFLAGS)" \ + "CHILLFLAGS=$(CHILLFLAGS)" \ + 'CHILL=$$(CHILL_FOR_TARGET)' \ + "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \ + "CHILL_LIB=$(CHILL_LIB)" \ + 'CXX=$$(CXX_FOR_TARGET)' \ + "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "MAKEINFO=$(MAKEINFO)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBS=$(LIBS)" \ + "RUNTEST=$(RUNTEST)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "BISON=$(BISON)" all: subdirs @@ -148,7 +209,12 @@ installcheck: check: site.exp all just-check just-check: rootme=`pwd`; export rootme; \ - $(RUNTEST) $(RUNTESTFLAGS) --tool gdb GDB=$(GDB) --srcdir $(srcdir) + srcdir=${srcdir} ; export srcdir ; \ + EXPECT=${EXPECT} ; export EXPECT ; \ + if [ -f $${rootme}/../../expect/expect ] ; then \ + TCL_LIBRARY=$${srcdir}/../../tcl/library ; \ + export TCL_LIBRARY ; fi ; \ + $(RUNTEST_FOR_TARGET) $(RUNTESTFLAGS) --tool gdb GDB=$(GDB) --srcdir $(srcdir) subdir_do: force @for i in $(DODIRS); do \ @@ -156,7 +222,7 @@ subdir_do: force if (rootme=`pwd`/ ; export rootme ; \ rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \ cd ./$$i; \ - $(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(DO)) ; then true ; \ else exit 1 ; fi ; \ else true ; fi ; \ done @@ -171,7 +237,7 @@ subdirs: if [ -d $$dir ]; then \ (rootme=`pwd`/ ; export rootme ; \ rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \ - cd $$dir; $(MAKE) $(FLAGS_TO_PASS)); \ + cd $$dir; $(MAKE) $(TARGET_FLAGS_TO_PASS)); \ fi; \ done @@ -186,7 +252,7 @@ clean mostlyclean: done distclean realclean: clean - -rm -f *~ core + -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}; \ diff --git a/ld/ChangeLog b/ld/ChangeLog index 1de42280b4e..cbb32874386 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -6,6 +6,10 @@ Mon Apr 11 12:32:57 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) exist, get crtbegin based on gcc -print-libgcc-file-name. (HOSTING_LIBS): Similar change for ../gcc/crtend.o. +Mon Apr 11 10:31:00 1994 Bill Cox (bill@rtl.cygnus.com) + + * Makefile.in (check): Set TCL_LIBRARY for runtest. + Wed Apr 6 00:09:37 1994 Jeffrey A. Law (law@snake.cs.utah.edu) * configure.in (hppa*-*-*elf*): Don't require "-hp-" for the diff --git a/ld/Makefile.in b/ld/Makefile.in index 306455eeb66..b43006fbbf8 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -117,7 +117,13 @@ CXXFLAGS = -fgnu-linker CXX = g++ # Setup the testing framework, if you have one -RUNTEST = runtest +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` RUNTESTFLAGS = RUNTEST_CC = `if [ -f ../gcc/xgcc ] ; then \ echo ../gcc/xgcc -B../gcc/; \ @@ -378,7 +384,7 @@ em_coff_sparc.c: $(srcdir)/emulparams/coff_sparc.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sparccoff.sc ${GEN_DEPENDS} ${GENSCRIPTS} coff_sparc em_elf32ppc.c: $(srcdir)/emulparams/elf32ppc.sh \ - $(srcdir)/emultempl/ppc.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32ppc $(LD_PROG): $(OFILES) $(BFDLIB) $(LIBIBERTY) @@ -442,6 +448,12 @@ site.exp: ./config.status Makefile check: ld.new site.exp @if [ $(host_canonical) = $(target_canonical) ]; then \ + 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) --tool ld \ --srcdir $(srcdir)/testsuite $(RUNTESTFLAGS) \ CC="$(RUNTEST_CC)" CFLAGS="$(RUNTEST_CFLAGS)" \ @@ -481,9 +493,25 @@ cdtest: cdtest-main.o cdtest-func.o cdtest-foo.o ld.new ./ld.new $(HOSTING_EMU) -o cdtest $(HOSTING_CRT0) \ cdtest-main.o cdtest-func.o cdtest-foo.o $(HOSTING_LIBS) -check-cdtest: cdtest $(srcdir)/cdtest.exp - ./cdtest >cdtest.out +cdtest.out: cdtest + ./cdtest > cdtest.tmp + mv cdtest.tmp cdtest.out + +cdtest-ur.o: cdtest-main.o cdtest-func.o cdtest-foo.o ld.new + ./ld.new $(HOSTING_EMU) -o cdtest-ur.o -Ur cdtest-main.o \ + cdtest-func.o cdtest-foo.o + +cdtest-ur: cdtest-ur.o + ./ld.new $(HOSTING_EMU) -o cdtest-ur $(HOSTING_CRT0) cdtest-ur.o \ + $(HOSTING_LIBS) + +cdtest-ur.out: cdtest-ur + ./cdtest-ur > cdtest-ur.tmp + mv cdtest-ur.tmp cdtest-ur.out + +check-cdtest: cdtest.out cdtest-ur.out $(srcdir)/cdtest.exp diff $(srcdir)/cdtest.exp cdtest.out + diff $(srcdir)/cdtest.exp cdtest-ur.out .PHONY: check-cdtest -- 2.30.2