diff options
author | Bill Cox <bill@cygnus> | 1994-04-11 23:17:18 +0000 |
---|---|---|
committer | Bill Cox <bill@cygnus> | 1994-04-11 23:17:18 +0000 |
commit | 099c286e7440447b4c7d9e1ced7b86ffaa255c29 (patch) | |
tree | 60a2b627693df63e457b3b79fe6905e2a341d35a /gdb/testsuite | |
parent | bf08d1e26655066aa16637662bb4eb2a2e3a3aad (diff) | |
download | gdb-099c286e7440447b4c7d9e1ced7b86ffaa255c29.zip gdb-099c286e7440447b4c7d9e1ced7b86ffaa255c29.tar.gz gdb-099c286e7440447b4c7d9e1ced7b86ffaa255c29.tar.bz2 |
* Makefile.in (check): Set TCL_LIBRARY for runtest.
Diffstat (limited to 'gdb/testsuite')
-rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
-rw-r--r-- | gdb/testsuite/Makefile.in | 140 |
2 files changed, 107 insertions, 37 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 383b31b..9417eb6 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 d79b14f..f117c6d 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}; \ |