From bf3d2b7571e903f48cbcaefa5d0ec9c7257e4cb5 Mon Sep 17 00:00:00 2001 From: Mike Werner Date: Mon, 22 Feb 1993 16:20:25 +0000 Subject: [PATCH] * gdb/testsuite: made modifications to testcases, etc., to allow them to work properly given the reorganization of deja-gnu and the relocation of the testcases from deja-gnu to a "tool" subdirectory. --- gdb/ChangeLog | 6 ++ gdb/testsuite/.Sanitize | 113 ++++++++++++++++++++++ gdb/testsuite/.gdbinit | 1 + gdb/testsuite/ChangeLog | 6 ++ gdb/testsuite/Makefile.in | 208 +++++++++++++++++++++++++++++++++++++++++ gdb/testsuite/config/.Sanitize | 77 +++++++++++++++ gdb/testsuite/configure.in | 66 +++++++++++++ gdb/testsuite/lib/.Sanitize | 33 +++++++ 8 files changed, 510 insertions(+) create mode 100644 gdb/testsuite/.Sanitize create mode 100644 gdb/testsuite/.gdbinit create mode 100644 gdb/testsuite/Makefile.in create mode 100644 gdb/testsuite/config/.Sanitize create mode 100644 gdb/testsuite/configure.in create mode 100644 gdb/testsuite/lib/.Sanitize diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ba56da1..e514688 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 22 07:54:03 1993 Mike Werner (mtw@poseidon.cygnus.com) + + * gdb/testsuite: made modifications to testcases, etc., to allow + them to work properly given the reorganization of deja-gnu and the + relocation of the testcases from deja-gnu to a "tool" subdirectory. + Sun Feb 21 10:55:55 1993 Mike Werner (mtw@poseidon.cygnus.com) * gdb/testsuite: Initial creation of gdb/testsuite. diff --git a/gdb/testsuite/.Sanitize b/gdb/testsuite/.Sanitize new file mode 100644 index 0000000..7c309808 --- /dev/null +++ b/gdb/testsuite/.Sanitize @@ -0,0 +1,113 @@ +# .Sanitize for deja-gnu. + +# Each directory to survive it's way into a release will need a file +# like this one called "./.Sanitize". All keyword lines must exist, +# and must exist in the order specified by this file. Each directory +# in the tree will be processed, top down, in the following order. + +# Hash started lines like this one are comments and will be deleted +# before anything else is done. Blank lines will also be squashed +# out. + +# The lines between the "Do-first:" line and the "Things-to-keep:" +# line are executed as a /bin/sh shell script before anything else is +# done in this directory. + +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 +# called. Directories not listed will be removed in their entirety +# with rm -rf. + +Things-to-keep: + +# The lines between the "Do-last:" line and the end of the file + +.gdbinit +ChangeLog +Makefile.in +config +configure.in +gdb.t00 +gdb.t01 +gdb.t02 +gdb.t03 +gdb.t04 +gdb.t05 +gdb.t06 +gdb.t07 +gdb.t08 +gdb.t09 +gdb.t10 +gdb.t11 +gdb.t12 +gdb.t13 +gdb.t15 +gdb.t16 +gdb.t20 +gdb.t21 +gdb.t22 +gdb.t23 +lib + +# are executed as a /bin/sh shell script after everything else is +# 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 + 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/.gdbinit b/gdb/testsuite/.gdbinit new file mode 100644 index 0000000..62bcb74 --- /dev/null +++ b/gdb/testsuite/.gdbinit @@ -0,0 +1 @@ +set height 400 diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6259922..13435d1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +Mon Feb 22 07:54:03 1993 Mike Werner (mtw@poseidon.cygnus.com) + + * gdb/testsuite: made modifications to testcases, etc., to allow + them to work properly given the reorganization of deja-gnu and the + relocation of the testcases from deja-gnu to a "tool" subdirectory. + Sun Feb 21 10:55:55 1993 Mike Werner (mtw@poseidon.cygnus.com) * gdb/testsuite: Initial creation of gdb/testsuite. diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in new file mode 100644 index 0000000..757fba7 --- /dev/null +++ b/gdb/testsuite/Makefile.in @@ -0,0 +1,208 @@ +srcdir = . +prefix = /usr/local + +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) +CXX = gcc +CXXFLAGS = -g -O + +LINK= ln -s +SUBDIRS= + +CC_FOR_TARGET = ` \ + if [ -f $${rootme}../gcc/Makefile ] ; 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` + +GCC_FOR_TARGET = ` \ + if [ -f $${rootme}../gcc/Makefile ] ; 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` + +$(start-sanitize-chill) +CHILL_FOR_TARGET = ` \ + if [ -f $${rootme}../gcc/Makefile ] ; 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` +$(end-sanitize-chill) + +CXX_FOR_TARGET = ` \ + if [ -f $${rootme}../gcc/Makefile ] ; 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` + +GDB = `if [ -f $${rootme}../gdb/gdb ] ; \ + then echo $${rootme}../gdb/gdb ; \ + else echo gdb; fi` +GDBFLAGS = + +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 = \ + "AR=$(AR)" \ + "AR_FLAGS=$(AR_FLAGS)" \ + "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ + "CXX=$(CXX)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ + "CC=$(CC)" \ + "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ + "CFLAGS=$(CFLAGS)" \ + $(start-sanitize-chill)\ + "CHILLFLAGS=$(CHILLFLAGS)" \ + "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \ + "CHILL_LIB=$(CHILL_LIB)" \ + $(end-sanitize-chill)\ + "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LINK=$(LINK)" \ + "LEX=$(LEX)" \ + "LOADLIBES=$(LOADLIBES)" \ + "MAKEINFO=$(MAKEINFO)" \ + "RANLIB=$(RANLIB)" \ + "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \ + "exec_prefix=$(exec_prefix)" \ + "prefix=$(prefix)" + +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) + +install: + -parent=`echo $(bindir)|sed -e 's@/[^/]*$$@@'`; \ + if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi + -if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; fi + -if [ -d $(bindir) ] ; then true ; else mkdir $(bindir) ; fi + -if [ -d $(libdir) ] ; then true ; else mkdir $(libdir) ; fi + -if [ -d $(datadir) ] ; then true ; else mkdir $(datadir) ; 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) + +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/gdb/testsuite/config/.Sanitize b/gdb/testsuite/config/.Sanitize new file mode 100644 index 0000000..ae16056 --- /dev/null +++ b/gdb/testsuite/config/.Sanitize @@ -0,0 +1,77 @@ +# .Sanitize for deja-gnu. + +# Each directory to survive it's way into a release will need a file +# like this one called "./.Sanitize". All keyword lines must exist, +# and must exist in the order specified by this file. Each directory +# in the tree will be processed, top down, in the following order. + +# Hash started lines like this one are comments and will be deleted +# before anything else is done. Blank lines will also be squashed +# out. + +# The lines between the "Do-first:" line and the "Things-to-keep:" +# line are executed as a /bin/sh shell script before anything else is +# done in this directory. + +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 +# called. Directories not listed will be removed in their entirety +# with rm -rf. + +Things-to-keep: + +aout-gdb.exp +coff-gdb.exp +udi-gdb.exp +unix-gdb.exp +vx-gdb.exp + +# The lines between the "Do-last:" line and the end of the file +# are executed as a /bin/sh shell script after everything else is +# 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 + echo Thawing the \"chill\" out of mt-unix... + cp mt-unix new + sed -e ' + /CHILL =/d + /CHILLFLAGS =/d + ' < mt-unix > new + if [ -n "${safe}" -a ! -f .Recover/mt-unix ] ; then + echo Caching mt-unix in .Recover... + mv mt-unix .Recover + fi + mv new mt-unix +fi + +# eof diff --git a/gdb/testsuite/configure.in b/gdb/testsuite/configure.in new file mode 100644 index 0000000..7f9e209 --- /dev/null +++ b/gdb/testsuite/configure.in @@ -0,0 +1,66 @@ +# 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="gdb.t00" +srcname="DejaGnu" + +configdirs="gdb.t00 gdb.t01 gdb.t02 gdb.t03 gdb.t04 gdb.t05 gdb.t06 \ + gdb.t07 gdb.t08 gdb.t09 gdb.t10 gdb.t11 gdb.t12 gdb.t13 gdb.t15 \ + gdb.t16 gdb.t20 gdb.t21 gdb.t22 gddb.t23 gdb.t30 gdb.t31" + +# per-host: + +# per-target: + + # everything defaults to unix for a target +target_abbrev=unix +target_makefile_frag=config/mt-unix + + # this section is for all targets +case "${target}" in +i386-*-aout) target_abbrev=aout ; + target_makefile_frag=config/mt-i386-aout ;; +m68*-abug-aout) target_abbrev=abug ; + target_makefile_frag=config/mt-m68k-abug-aout ;; +m68*-abug-coff) target_abbrev=abug ; + target_makefile_frag=config/mt-m68k-abug-coff ;; +m68*-*-abug) target_abbrev=abug ; + target_makefile_frag=config/mt-m68k-abug-aout ;; +m68k-*-coff) target_abbrev=coff ; + target_makefile_frag=config/mt-m68k-coff ;; +m68k-*-aout) target_abbrev=aout ; + target_makefile_frag=config/mt-m68k-aout ;; +i960-*-nindy) target_abbrev=nind ; + target_makefile_frag=config/mt-i960-nindy ;; +m68k-*-vxworks) target_abbrev=vx ; + target_makefile_frag=config/mt-m68k-vx ;; +i960-*-vxworks) target_abbrev=vx ; + target_makefile_frag=config/mt-i960-vx ;; +a29k-*-udi) target_abbrev=udi ; + target_makefile_frag=config/mt-a29k-udi ;; +a29k-isstip-*) target_abbrev=itip ; + target_makefile_frag=config/mt-a29k-isstip ;; +esac + + # link in the lib directory if needed +if [ ! -d lib ] ; then + files="lib" + links="lib" +fi + + # make list of files and links based on tool name +tool_list="${tool_list} gdb" +for i in ${tool_list}; +do + if [ -f ${srcdir}/config/${target_abbrev}-$i.exp ] ; then + files="$files config/${target_abbrev}-$i.exp" + links="$links $i-init.exp" + fi +done + +# post-target: + + # make local configuration file, using MAKE if one is specified. +if [ ! -n "$MAKE" ]; then MAKE=make; fi diff --git a/gdb/testsuite/lib/.Sanitize b/gdb/testsuite/lib/.Sanitize new file mode 100644 index 0000000..e5a0216 --- /dev/null +++ b/gdb/testsuite/lib/.Sanitize @@ -0,0 +1,33 @@ +# .Sanitize for deja-gnu. + +# Each directory to survive it's way into a release will need a file +# like this one called "./.Sanitize". All keyword lines must exist, +# and must exist in the order specified by this file. Each directory +# in the tree will be processed, top down, in the following order. + +# Hash started lines like this one are comments and will be deleted +# before anything else is done. Blank lines will also be squashed +# out. + +# The lines between the "Do-first:" line and the "Things-to-keep:" +# line are executed as a /bin/sh shell script before anything else is +# done in this directory. + +Do-first: + +# 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 +# called. Directories not listed will be removed in their entirety +# with rm -rf. + +Things-to-keep: + +gdb.exp + +# The lines between the "Do-last:" line and the end of the file +# are executed as a /bin/sh shell script after everything else is +# done. + +Do-last: +# eof -- 2.7.4