diff options
80 files changed, 461 insertions, 212 deletions
@@ -1,3 +1,27 @@ +2003-03-16 Rob Savoye <rob@direwolf.welcomehome.org> + + * lib/unix.exp: Preservce the value of LD_LIBRARY_PATH, rather + than stomp on it. This is based on a patch from Brendan Conoboy + <blc@redhat.com>. + * Most files: Update copyright dates. + +2003-03-13 Mike Stump <mrs@apple.com> + + * lib/dg.exp(dg-test): Add compiler flags to testcase name, to + help ensure uniqueness. + +2003-03-05 Alexandre Oliva <aoliva@redhat.com> + + * lib/remote.exp (standard_download, standard_upload): Support + nfsdir and nfsroot_server. + +2001-11-12 Andrew Cagney <ac131313@redhat.com> + + * lib/remote.exp (local_exec, standard_close): Use SHELL + background instead of tcl background to background the kill + processes. Work around problem found by Nick Duffek in older + CYGWINs. (migrated from Redhat's sources kind late, sorry) + 2003-02-19 DJ Delorie <dj@redhat.com> * config/sim.exp: Support both sid and rawsid protocols. @@ -15,7 +39,7 @@ example. 2002-11-21 Matt Bemis <bemis@iol.unh.edu> - *modified xml_output to handle null input and output + * modified xml_output to handle null input and output 2002-10-21 Adam Nemet <anemet@lnxw.com> * libgloss.exp (get_multilibs): Don't use the first argument @@ -93,6 +117,9 @@ * baseboards/frv-tiger.exp: New board description. * baseboards/frv-tomcat.exp: New board description. +Wed Jun 5 14:52:15 PDT 2002 Joey Ekstrom <joey@ekstrom.org> + * dejagnu.h: modfied C functions to behave like printf. + 2001-01-15 Ben Elliston <bje@redhat.com> * lib/framework.exp (record_test): Invoke a user-defined procedure @@ -596,7 +623,7 @@ Thu Aug 30 19:31:44 2001 J"orn Rennecke <amylaar@redhat.com> (all-local): Add at least `calc' building back. * example/Makefile.in: Regenerated. -Fri Jul 21 16:01:43 2000 Andrew Cagney <cagney@b1.cygnus.com> +ri Jul 21 16:01:43 2000 Andrew Cagney <cagney@b1.cygnus.com> From 2000-04-25 Felix Lee <flee@cygnus.com>: * baseboards/tx39-sim.exp: Use idt, not dve linker script. Delete @@ -5672,11 +5699,11 @@ Mon Oct 19 10:59:19 1992 Rob Savoye (rob at darkstar.cygnus.com) * gcc.execute/execute.exp: Runs all the test from the c-torture test's execute directory. * gcc.execute: New directory - * gcc.code_quality/code_quality.exp: Runs all the test from the c-torture test's - code_quality directory. + * gcc.code_quality/code_quality.exp: Runs all the test from the + c-torture test's code_quality directory. * gcc.code_quality: New directory - * gcc.noncompile/noncompile.exp: Runs all the test from the c-torture test's - noncompile directory. + * gcc.noncompile/noncompile.exp: Runs all the test from the + c-torture test's noncompile directory. * gcc.noncompile: New directory * gdb.*/*.exp: Removed all references to $det_file. * nm.all/nm.exp: Removed all references to $det_file. @@ -6004,6 +6031,3 @@ Thu May 21 17:20:23 1992 Rob Savoye (rob@darkstar.cygnus.com) * Hacking in better detailed reports. -Wed Jun 5 14:52:15 PDT 2002 Joey Ekstrom <joey@ekstrom.org> - * dejagnu.h: modfied C functions to behave like printf. - @@ -1,4 +1,4 @@ -#!/usr/local/bin/tclsh +#!/usr/bin/tclsh # Clean.tcl # This script is used to remove all unwanted files from a diff --git a/Makefile.am b/Makefile.am index dbb12ab..a7522ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,7 +126,7 @@ hpdepot: # $(srcdir)/depot/dejagnu.psf $(srcdir)/configure -v --prefix $(PKGDIR)/dejagnu; \ make install ; \ fi - swpackage -s /home/projects/dejagnu/depot/dejagnu.psf -x target_type=directory -d /tmp + swpackage -s $(srcdir)/depot/dejagnu.psf -x target_type=directory -d /tmp here=`pwd`; \ cd /tmp; \ tar cf $$here/dejagnu-${VERSION}.hpux11.depot dejagnu; \ diff --git a/Makefile.in b/Makefile.in index a76f1bb..7f4a67e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -48,6 +48,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -143,6 +144,9 @@ DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: + +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile @@ -156,66 +160,63 @@ $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +binSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/$$f; \ - elif test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/$$f; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \ + $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done uninstall-binSCRIPTS: @$(NORMAL_UNINSTALL) @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ rm -f $(DESTDIR)$(bindir)/$$f; \ done +libexecSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-libexecSCRIPTS: $(libexec_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libexecdir) @list='$(libexec_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(libexecdir)/$$f"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(libexecdir)/$$f; \ - elif test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(libexecdir)/$$f"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(libexecdir)/$$f; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(libexecSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(libexecdir)/$$f"; \ + $(libexecSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(libexecdir)/$$f; \ else :; fi; \ done uninstall-libexecSCRIPTS: @$(NORMAL_UNINSTALL) @list='$(libexec_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \ rm -f $(DESTDIR)$(libexecdir)/$$f; \ done +pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT) install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(pkgdatadir)/$$f"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(pkgdatadir)/$$f; \ - elif test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(pkgdatadir)/$$f; \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(pkgdataSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \ + $(pkgdataSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \ else :; fi; \ done uninstall-pkgdataSCRIPTS: @$(NORMAL_UNINSTALL) @list='$(pkgdata_SCRIPTS)'; for p in $$list; do \ - f="`echo $$p|sed '$(transform)'`"; \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \ rm -f $(DESTDIR)$(pkgdatadir)/$$f; \ done @@ -228,7 +229,7 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -248,7 +249,7 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -319,6 +320,9 @@ distclean-tags: RUNTESTFLAGS = DEJATOOL = $(PACKAGE) EXPECT = expect + +distclean-DEJAGNU: + -rm -f site.exp site.bak DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = . @@ -335,7 +339,7 @@ distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - @for file in $(DISTFILES); do \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -345,8 +349,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -449,7 +455,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -459,8 +465,9 @@ clean: clean-recursive clean-am: clean-generic clean-local mostlyclean-am distclean: distclean-recursive - -rm -f config.status config.cache config.log -distclean-am: clean-am distclean-generic distclean-tags + -rm -f $(am__CONFIG_DISTCLEAN_FILES) +distclean-am: clean-am distclean-DEJAGNU distclean-generic \ + distclean-tags dvi: dvi-recursive @@ -481,7 +488,8 @@ install-man: installcheck-am: maintainer-clean: maintainer-clean-recursive - + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf autom4te.cache maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -496,19 +504,20 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-DEJAGNU \ check-am clean clean-generic clean-local clean-recursive dist \ - dist-all dist-gzip distcheck distclean distclean-generic \ - distclean-recursive distclean-tags distcleancheck distdir dvi \ - dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-binSCRIPTS install-data install-data-am \ - install-data-local install-data-recursive install-exec \ - install-exec-am install-exec-recursive install-info \ - install-info-am install-info-recursive install-libexecSCRIPTS \ - install-man install-pkgdataSCRIPTS install-recursive \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive mostlyclean \ - mostlyclean-generic mostlyclean-recursive tags tags-recursive \ - uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \ + dist-all dist-gzip distcheck distclean distclean-DEJAGNU \ + distclean-generic distclean-recursive distclean-tags \ + distcleancheck distdir dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-binSCRIPTS \ + install-data install-data-am install-data-local \ + install-data-recursive install-exec install-exec-am \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-libexecSCRIPTS install-man \ + install-pkgdataSCRIPTS install-recursive install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + installdirs-recursive maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive tags tags-recursive uninstall \ + uninstall-am uninstall-binSCRIPTS uninstall-info-am \ uninstall-info-recursive uninstall-libexecSCRIPTS \ uninstall-local uninstall-pkgdataSCRIPTS uninstall-recursive @@ -610,7 +619,7 @@ hpdepot: # $(srcdir)/depot/dejagnu.psf $(srcdir)/configure -v --prefix $(PKGDIR)/dejagnu; \ make install ; \ fi - swpackage -s /home/projects/dejagnu/depot/dejagnu.psf -x target_type=directory -d /tmp + swpackage -s $(srcdir)/depot/dejagnu.psf -x target_type=directory -d /tmp here=`pwd`; \ cd /tmp; \ tar cf $$here/dejagnu-${VERSION}.hpux11.depot dejagnu; \ @@ -1,4 +1,4 @@ -# aclocal.m4 generated automatically by aclocal 1.6 -*- Autoconf -*- +# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -198,9 +198,9 @@ _AM_IF_OPTION([no-define],, # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, "aclocal-${am__api_version}") +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, "automake-${am__api_version}") +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) AM_MISSING_PROG(AMTAR, tar) @@ -250,7 +250,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.6])]) + [AM_AUTOMAKE_VERSION([1.6.3])]) # Helper functions for option handling. -*- Autoconf -*- @@ -582,7 +582,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -707,7 +707,13 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` - if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue diff --git a/baseboards/unix.exp b/baseboards/unix.exp index bca9339..48c6e99 100644 --- a/baseboards/unix.exp +++ b/baseboards/unix.exp @@ -7,6 +7,10 @@ set_board_info compiler "[find_gcc]"; set_board_info bmk,use_alarm 1; +# Set host_library_path to pick up libs such as libstdc++ + +#set_board_info host_library_path "[file dirname [file dirname [file dirname [file dirname [file dirname [exec [find_gcc] --print-prog-name=cc1]]]]]]/lib"; + # Do not use -lm on Cygwin if { [istarget "*-*-cygwin*"] } { set_board_info mathlib ""; @@ -16,3 +20,4 @@ if { [istarget "*-*-cygwin*"] } { if { [istarget "alpha*-*"] } { set_board_info ieee_multilib_flags "-mieee"; } + diff --git a/config/arc.exp b/config/arc.exp index e38e8e2..e9c3862 100644 --- a/config/arc.exp +++ b/config/arc.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/arm-ice.exp b/config/arm-ice.exp index e38e8e2..bd36fce 100644 --- a/config/arm-ice.exp +++ b/config/arm-ice.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/base-config.exp b/config/base-config.exp index 8e16dcf..53f98c9 100644 --- a/config/base-config.exp +++ b/config/base-config.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/base68k.exp b/config/base68k.exp index ca0afb2..a9b322c 100644 --- a/config/base68k.exp +++ b/config/base68k.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1994 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1994 - 2002, 2003 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 diff --git a/config/bug.exp b/config/bug.exp index 5155978..c175c80 100644 --- a/config/bug.exp +++ b/config/bug.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/cfdbug.exp b/config/cfdbug.exp index 182f023..7948146 100644 --- a/config/cfdbug.exp +++ b/config/cfdbug.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1999 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1999 - 2002, 2003 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 diff --git a/config/cygmon.exp b/config/cygmon.exp index 321fce7..faf8dd8 100644 --- a/config/cygmon.exp +++ b/config/cygmon.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/d10v.exp b/config/d10v.exp index e38e8e2..bd36fce 100644 --- a/config/d10v.exp +++ b/config/d10v.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/ddb-ether.exp b/config/ddb-ether.exp index 3a8716b..91e0af0 100644 --- a/config/ddb-ether.exp +++ b/config/ddb-ether.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/ddb.exp b/config/ddb.exp index f2ecf86..2c1aa21 100644 --- a/config/ddb.exp +++ b/config/ddb.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/default.exp b/config/default.exp index 7d0b98c..11177cb 100644 --- a/config/default.exp +++ b/config/default.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2001 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/config/dos.exp b/config/dos.exp index f455acb..9158c2b 100644 --- a/config/dos.exp +++ b/config/dos.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/dve.exp b/config/dve.exp index 668f078..35f8c3f 100644 --- a/config/dve.exp +++ b/config/dve.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1998 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1998 - 2002, 2003 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 diff --git a/config/gdb-comm.exp b/config/gdb-comm.exp index 1f3fda7..0255335 100644 --- a/config/gdb-comm.exp +++ b/config/gdb-comm.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1996 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1996 - 2002, 2003 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 diff --git a/config/gdb_stub.exp b/config/gdb_stub.exp index f1e7fc5..a31fc87 100644 --- a/config/gdb_stub.exp +++ b/config/gdb_stub.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/h8300.exp b/config/h8300.exp index e38e8e2..bd36fce 100644 --- a/config/h8300.exp +++ b/config/h8300.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/i386-bozo.exp b/config/i386-bozo.exp index 9175d69..f25ac72 100644 --- a/config/i386-bozo.exp +++ b/config/i386-bozo.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/i960.exp b/config/i960.exp index 07f1982..e6f8bd3 100644 --- a/config/i960.exp +++ b/config/i960.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/m32r-stub.exp b/config/m32r-stub.exp index 7952f4a..d5bbeb1 100644 --- a/config/m32r-stub.exp +++ b/config/m32r-stub.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/m32r.exp b/config/m32r.exp index e38e8e2..bd36fce 100644 --- a/config/m32r.exp +++ b/config/m32r.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/m68hc11.exp b/config/m68hc11.exp index b64dbe3..6c1fa65 100644 --- a/config/m68hc11.exp +++ b/config/m68hc11.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2001 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/config/m68k-emc.exp b/config/m68k-emc.exp index 852453c..6b13dc1 100644 --- a/config/m68k-emc.exp +++ b/config/m68k-emc.exp @@ -1,3 +1,22 @@ +# Copyright (C) 1992 - 2002, 2003 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Please email any bugs, comments, and/or additions to this file to: +# bug-dejagnu@gnu.org + proc ${board}_init { dest } { global doing_emc_init; diff --git a/config/mips-idt.exp b/config/mips-idt.exp index 8c566b8..f5427e9 100644 --- a/config/mips-idt.exp +++ b/config/mips-idt.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/mn10200-eval.exp b/config/mn10200-eval.exp index 1f9c444..54bb269 100644 --- a/config/mn10200-eval.exp +++ b/config/mn10200-eval.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1998 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1998 - 2002, 2003 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 diff --git a/config/mn10300-eval.exp b/config/mn10300-eval.exp index 45b0e2a..1e3e42c 100644 --- a/config/mn10300-eval.exp +++ b/config/mn10300-eval.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1998 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1998 - 2002, 2003 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 diff --git a/config/netware.exp b/config/netware.exp index ef47838..5658de2 100644 --- a/config/netware.exp +++ b/config/netware.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1994 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1994 - 2002, 2003 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 diff --git a/config/powerpc-bug.exp b/config/powerpc-bug.exp index e38e8e2..bd36fce 100644 --- a/config/powerpc-bug.exp +++ b/config/powerpc-bug.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/proelf.exp b/config/proelf.exp index 4d822c5..e816a49 100644 --- a/config/proelf.exp +++ b/config/proelf.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/rom68k.exp b/config/rom68k.exp index 88257cd..f8a8143 100644 --- a/config/rom68k.exp +++ b/config/rom68k.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1995 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1995 - 2002, 2003 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 diff --git a/config/sh.exp b/config/sh.exp index e38e8e2..bd36fce 100644 --- a/config/sh.exp +++ b/config/sh.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/sid.exp b/config/sid.exp index 8ace57f..0805b40 100644 --- a/config/sid.exp +++ b/config/sid.exp @@ -1,3 +1,22 @@ +# Copyright (C) 1992 - 2002, 2003 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Please email any bugs, comments, and/or additions to this file to: +# bug-dejagnu@gnu.org + # Routines for loading and running programs on a SID simulator. # Written by Ben Elliston <bje@cygnus.com>. diff --git a/config/slite.exp b/config/slite.exp index 52e9807..081666b 100644 --- a/config/slite.exp +++ b/config/slite.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1996 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1996 - 2002, 2003 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 diff --git a/config/sparclet.exp b/config/sparclet.exp index c0b7296..9d478ce 100644 --- a/config/sparclet.exp +++ b/config/sparclet.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1996 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1996 - 2002, 2003 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 diff --git a/config/tic80.exp b/config/tic80.exp index ef12778..817fa64 100644 --- a/config/tic80.exp +++ b/config/tic80.exp @@ -1,3 +1,22 @@ +# Copyright (C) 1992 - 2002, 2003 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Please email any bugs, comments, and/or additions to this file to: +# bug-dejagnu@gnu.org + # # Nasty ugly stuff. # diff --git a/config/udi.exp b/config/udi.exp index 298ee83..4719d45 100644 --- a/config/udi.exp +++ b/config/udi.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1994 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1994 - 2002, 2003 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 diff --git a/config/unix.exp b/config/unix.exp index 170ae94..971ed2a 100644 --- a/config/unix.exp +++ b/config/unix.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 @@ -35,7 +35,8 @@ load_lib remote.exp proc unix_load { dest prog args } { global ld_library_path - set output ""; + set output "" + set orig_ld_library_path "" if { [llength $args] > 0 } { set parg [lindex $args 0]; @@ -63,11 +64,15 @@ proc unix_load { dest prog args } { set command "$prog $parg"; } - if [info exists ld_library_path] { - setenv LD_LIBRARY_PATH $ld_library_path - setenv SHLIB_PATH $ld_library_path + if ![info exists ld_library_path] { + set ld_library_path "" } - + + set orig_ld_library_path "[getenv LD_LIBRARY_PATH]" + setenv LD_LIBRARY_PATH "$ld_library_path:$orig_ld_library_path" + setenv SHLIB_PATH "$ld_library_path:$orig_ld_library_path" + verbose -log "Setting LD_LIBRARY_PATH to $ld_library_path:$orig_ld_library_path" 2 + set id [remote_spawn $dest "$command" "readonly"]; if { $id < 0 } { set output "remote_spawn failed" @@ -82,8 +87,8 @@ proc unix_load { dest prog args } { # fix in the first place; this just tries to minimize the resulting # crap.) if [info exists ld_library_path] { - unsetenv LD_LIBRARY_PATH - unsetenv SHLIB_PATH + setenv LD_LIBRARY_PATH $orig_ld_library_path + setenv SHLIB_PATH $orig_ld_library_path } } else { set remotefile "/tmp/[file tail $prog].[pid]" @@ -118,6 +123,9 @@ proc unix_load { dest prog args } { set output [lindex $status 1] set status [lindex $status 0] } + + setenv LD_LIBRARY_PATH $orig_ld_library_path + setenv SHLIB_PATH $orig_ld_library_path verbose "Executed $prog, status $status" 2 if ![string match "" $output] { diff --git a/config/vr4100.exp b/config/vr4100.exp index 49943ac..00b96eb 100644 --- a/config/vr4100.exp +++ b/config/vr4100.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/vr4300.exp b/config/vr4300.exp index 49943ac..00b96eb 100644 --- a/config/vr4300.exp +++ b/config/vr4300.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/vr5000.exp b/config/vr5000.exp index d52f1f8..f95d597 100644 --- a/config/vr5000.exp +++ b/config/vr5000.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/config/vrtx.exp b/config/vrtx.exp index ff0cd4a..95288b6 100644 --- a/config/vrtx.exp +++ b/config/vrtx.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1994 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1994 - 2002, 2003 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 diff --git a/config/vxworks.exp b/config/vxworks.exp index 2b04e24..81af297 100644 --- a/config/vxworks.exp +++ b/config/vxworks.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/depot/dejagnu.psf b/depot/dejagnu.psf index f75125d..a3a8849 100644 --- a/depot/dejagnu.psf +++ b/depot/dejagnu.psf @@ -29,7 +29,7 @@ product # architecture S700/S800_HPUX_11 machine_type 9000/[78]* - swcopy os_name HP-UX +# swcopy os_name HP-UX os_release ?.11.* os_version * # diff --git a/doc/Makefile.in b/doc/Makefile.in index 21ed404..853c833 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -51,6 +51,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -122,6 +123,10 @@ install-man1: $(man1_MANS) $(man_MANS) if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ else file=$$i; fi; \ ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ @@ -154,7 +159,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -164,8 +169,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -198,7 +205,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/doc/user.sgml b/doc/user.sgml index 61e6212..1ed0313 100644 --- a/doc/user.sgml +++ b/doc/user.sgml @@ -18,7 +18,7 @@ dgt:~$ mkdir ~/dejagnu.test dgt:~$ cd ~/dejagnu.test </programlisting> -<para>Now you are ready to test DejaGnu's main program called ruuntest. The expecteted output is shown</para> +<para>Now you are ready to test DejaGnu's main program called runtest. The expecteted output is shown</para> <example> <title>Runtest output in a empty directory @@ -550,7 +550,7 @@ This can be done by adding the following lines to our file remote_echo.exp.</par <title>A first (local) remote "Hello world" test</title> <programlisting> set test "Remote_send Hello World" -set status [remote_send $target "echo \"Hello World\"\n" ] +set status [remote_send $target "echo \"Hello\" \"World\"\n" ] pass "$test" set test "Remote_expect Hello World" remote_expect $target 5 { @@ -1609,7 +1609,7 @@ powerpc-linux-gcc -g -O2 -o calc calc.o <title>Global Config File</title> <para>The master config file is where all the target specific - config variables get set for a whole site get set. The idea is + config variables for a whole site get set. The idea is that for a centralized testing lab where people have to share a target between multiple developers. There are settings for both remote targets and remote hosts. Here's an example of a Master diff --git a/example/Makefile.in b/example/Makefile.in index f64466d..d080af4 100644 --- a/example/Makefile.in +++ b/example/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -49,6 +49,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -113,7 +114,7 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -133,7 +134,7 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -231,13 +232,16 @@ site.exp: Makefile @-rm -f site.bak @test ! -f site.exp || mv site.exp site.bak @mv site.tmp site.exp + +distclean-DEJAGNU: + -rm -f site.exp site.bak DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -247,8 +251,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -294,7 +300,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -305,7 +311,8 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-DEJAGNU distclean-generic \ + distclean-tags dvi: dvi-recursive @@ -339,18 +346,18 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-DEJAGNU \ check-am clean clean-generic clean-recursive distclean \ - distclean-generic distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive tags tags-recursive uninstall \ - uninstall-am uninstall-info-am uninstall-info-recursive \ - uninstall-recursive + distclean-DEJAGNU distclean-generic distclean-recursive \ + distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-data install-data-am \ + install-data-recursive install-exec install-exec-am \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-generic mostlyclean-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-info-am \ + uninstall-info-recursive uninstall-recursive check-recursive: diff --git a/lib/debugger.exp b/lib/debugger.exp index edf8543..b9fc27f 100644 --- a/lib/debugger.exp +++ b/lib/debugger.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/lib/dejagnu.exp b/lib/dejagnu.exp index c85b54e..680716e 100755 --- a/lib/dejagnu.exp +++ b/lib/dejagnu.exp @@ -1,3 +1,24 @@ +# Copyright (C) 1992 - 2001, 2002, 2003 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@gnu.org + +# This file was written by Rob Savoye. (rob@welcomehome.org) + # a hairy pattern to recognize text set text "\[- A-Za-z0-9\.\;\"\_\:\'\`\(\)\!\#\=\+\?\&\*]" @@ -1,5 +1,5 @@ # `dg' general purpose testcase driver. -# Copyright (C) 1994 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1994 - 2002, 2003 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 @@ -653,8 +653,14 @@ proc dg-test { args } { set name "[file tail [file dirname $prog]]/[file tail $prog]" } + # We append the compilation flags, if any, to ensure that the test case + # names are unique. + if { "$tool_flags" != "" } { + set name "$name $tool_flags" + } + # Process any embedded dg options in the testcase. - + # Use "" for the second element of dg-do-what so we can tell if it's been # explicitly set to "S". set dg-do-what [list ${dg-do-what-default} "" P] diff --git a/lib/framework.exp b/lib/framework.exp index 4aaf0ae..8aa0641 100644 --- a/lib/framework.exp +++ b/lib/framework.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/lib/ftp.exp b/lib/ftp.exp index c59c3df..c9f5629 100644 --- a/lib/ftp.exp +++ b/lib/ftp.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/lib/kermit.exp b/lib/kermit.exp index 8cc1024..cd4e9d9 100644 --- a/lib/kermit.exp +++ b/lib/kermit.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/lib/libgloss.exp b/lib/libgloss.exp index c2957c2..9497f0d 100644 --- a/lib/libgloss.exp +++ b/lib/libgloss.exp @@ -1,6 +1,5 @@ -# Copyright (C) 1992 - 2001, 2002 -# Free Software Foundation, Inc. - +# Copyright (C) 1992 - 2002, 2003 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 @@ -18,7 +17,8 @@ # 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) (now rob@welcomehome.org) +# This file was written by Rob Savoye. (rob@cygnus.com) +# (now rob@welcomehome.org) # this contains a list of gcc options and their respective directories. @@ -433,10 +433,14 @@ proc get_multilibs { args } { return ""; } - if { [board_info $target_board exists multilib_flags] } { - set mopts [board_info $target_board multilib_flags]; + if { [llength $args] > 0 } { + set mopts [lindex $args 0]; } else { - set mopts "" + if { [board_info $target_board exists multilib_flags] } { + set mopts [board_info $target_board multilib_flags]; + } else { + set mopts "" + } } set default_multilib [exec $compiler --print-multi-lib] diff --git a/lib/mondfe.exp b/lib/mondfe.exp index 023f87e..add4597 100644 --- a/lib/mondfe.exp +++ b/lib/mondfe.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/lib/remote.exp b/lib/remote.exp index 1f07512..7a1db84 100644 --- a/lib/remote.exp +++ b/lib/remote.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 @@ -179,7 +179,10 @@ proc local_exec { commandline inp outp timeout } { # command in order to execute the execution. (English. Gotta love it.) if { ! $got_eof } { verbose "killing $pid $pgid"; - exec sh -c "exec > /dev/null 2>&1 && (kill -2 $pgid || kill -2 $pid) && sleep 5 && (kill -15 $pgid || kill $pid) && sleep 5 && (kill -9 $pgid || kill -9 $pid)" &; + # This is very, very nasty. SH, instead of EXPECT, is used to + # run this in the background since, on older CYGWINs, a + # strange file I/O error occures. + exec sh -c "exec > /dev/null 2>&1 && (kill -2 $pgid || kill -2 $pid) && sleep 5 && (kill -15 $pgid || kill $pid) && sleep 5 && (kill -9 $pgid || kill -9 $pid) &"; } # This will hang if the kill doesn't work. Nothin' to do, and it's not ok. catch "close -i $spawn_id"; @@ -212,7 +215,7 @@ proc local_exec { commandline inp outp timeout } { } verbose "output is $output"; if { $outp == "" } { - return [list $status $output]; + return [list $status $output]; } else { return [list $status ""]; } @@ -314,10 +317,11 @@ proc standard_close { host } { } if { $pid > 0 } { verbose "doing kill, pid is $pid"; - # This is very, very nasty. Then again, if after did something - # reasonable... + # This is very, very nasty. SH, instead of EXPECT, is used + # to run this in the background since, on older CYGWINs, a + # strange file I/O error occures. set pgid "-[join $pid { -}]"; - exec sh -c "exec > /dev/null 2>&1 && (kill -2 $pgid || kill -2 $pid) && sleep 5 && (kill $pgid || kill $pid) && sleep 5 && (kill -9 $pgid || kill -9 $pid)" &; + exec sh -c "exec > /dev/null 2>&1 && (kill -2 $pgid || kill -2 $pid) && sleep 5 && (kill $pgid || kill $pid) && sleep 5 && (kill -9 $pgid || kill -9 $pid) &"; } verbose "pid is $pid"; catch "close -i $shell_id"; @@ -407,7 +411,42 @@ proc remote_download { dest file args } { # proc standard_download {dest file destfile} { - return [rsh_download $dest $file $destfile]; + set orig_destfile $destfile + + if [board_info $dest exists nfsdir] { + set destdir [board_info $dest nfsdir] + if [board_info $dest exists nfsroot_server] { + set dest [board_info $dest nfsroot_server]; + } else { + set dest ""; + } + set destfile "$destdir/$destfile"; + } + + if { "$dest" != "" } { + set result [rsh_download $dest $file $destfile]; + if { $result == $destfile } { + return $orig_destfile; + } else { + return $result; + } + } + + set result [catch "exec cp -p $file $destfile" output]; + if [regexp "same file|are identical" $output] { + set result 0 + set output "" + } else { + # try to make sure we can read it + # and write it (in case we copy onto it again) + catch {exec chmod u+rw $destfile} + } + if { $result != 0 || $output != "" } { + perror "remote_download to $dest of $file to $destfile: $output" + return ""; + } else { + return $orig_destfile; + } } proc remote_upload {dest srcfile args} { @@ -429,6 +468,38 @@ proc remote_upload {dest srcfile args} { } proc standard_upload { dest srcfile destfile } { + set orig_srcfile $srcfile + + if [board_info $dest exists nfsdir] { + set destdir [board_info $dest nfsdir] + if [board_info $dest exists nfsroot_server] { + set dest [board_info $dest nfsroot_server]; + } else { + set dest ""; + } + set srcfile "$destdir/$srcfile"; + } + + if { "$dest" != "" } { + return [rsh_upload $dest $srcfile $destfile]; + } + + set result [catch "exec cp -p $srcfile $destfile" output]; + if [regexp "same file|are identical" $output] { + set result 0 + set output "" + } else { + # try to make sure we can read it + # and write it (in case we copy onto it again) + catch {exec chmod u+rw $destfile} + } + if { $result != 0 || $output != "" } { + perror "remote_upload to $dest of $file to $destfile: $output" + return ""; + } else { + return $destfile; + } + return [rsh_upload $dest $srcfile $destfile]; } @@ -442,7 +513,6 @@ proc call_remote { type proc dest args } { if [board_info $dest exists name] { set dest [board_info $dest name]; } -verbose "In call_remote with $dest, $args" if { $dest != "host" && $dest != "build" && $dest != "target" } { if { ![board_info $dest exists name] } { @@ -779,7 +849,7 @@ proc remote_raw_spawn { dest commandline } { # # The default spawn procedure. Uses rsh to connect to $dest. # -proc standard_spawn { dest commandline args } { +proc standard_spawn { dest commandline } { global board_info if ![board_info $dest exists rsh_prog] { @@ -795,7 +865,7 @@ proc standard_spawn { dest commandline args } { if ![board_info $dest exists username] { set rsh_useropts "" } else { - set rsh_useropts "-l [board_info $dest username]" + set rsh_useropts "-l $username" } if [board_info $dest exists hostname] { @@ -804,8 +874,7 @@ proc standard_spawn { dest commandline args } { set remote $dest; } -# spawn $RSH $rsh_useropts $remote $commandline; - spawn "/bin/sh" "-c" "$RSH $rsh_useropts $remote \"$commandline\""; + spawn $RSH $rsh_useropts $remote $commandline; set board_info($dest,fileid) $spawn_id; return $spawn_id; } @@ -1068,7 +1137,7 @@ proc standard_wait { dest timeout } { proc check_for_board_status { variable } { upvar $variable output; - + # If all programs of this board have a wrapper that always outputs a # status message, then the absence of it means that the program # crashed, regardless of status found elsewhere (e.g. simulator exit @@ -1083,7 +1152,6 @@ proc check_for_board_status { variable } { regsub "^.*\\*\\*\\* EXIT code " $output "" result; regsub "\[\r\n\].*$" $result "" result; regsub -all "(^|\[\r\n\]|\r\n)\\*\\*\\* EXIT code \[^\r\n\]*(\[\r\n\]\[\r\n\]?|$)" $output "" output; -### regsub -all "(^|\r?\n)\\*\\*\\* EXIT code \[^\r\n\]*(\r?\n|$)" $output "" output; regsub "^\[^0-9\]*" $result "" result regsub "\[^0-9\]*$" $result "" result verbose "got board status $result" 3 diff --git a/lib/rlogin.exp b/lib/rlogin.exp index c4c948b..b49cd5d 100644 --- a/lib/rlogin.exp +++ b/lib/rlogin.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/lib/rsh.exp b/lib/rsh.exp index ff28407..95de794 100644 --- a/lib/rsh.exp +++ b/lib/rsh.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/lib/standard.exp b/lib/standard.exp index c25a939..a197eaa 100644 --- a/lib/standard.exp +++ b/lib/standard.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/lib/target.exp b/lib/target.exp index a400e82..1152011 100644 --- a/lib/target.exp +++ b/lib/target.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/lib/targetdb.exp b/lib/targetdb.exp index 7a746b3..99b3f58 100644 --- a/lib/targetdb.exp +++ b/lib/targetdb.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/lib/telnet.exp b/lib/telnet.exp index 23a2408..061ea58 100644 --- a/lib/telnet.exp +++ b/lib/telnet.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/lib/tip.exp b/lib/tip.exp index 8f60724..e829595 100644 --- a/lib/tip.exp +++ b/lib/tip.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/lib/util-defs.exp b/lib/util-defs.exp index d758099..a35bf12 100644 --- a/lib/util-defs.exp +++ b/lib/util-defs.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/lib/utils.exp b/lib/utils.exp index 2febffe..fcac507 100644 --- a/lib/utils.exp +++ b/lib/utils.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/lib/xsh.exp b/lib/xsh.exp index a983e00..07d6911 100644 --- a/lib/xsh.exp +++ b/lib/xsh.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/runtest.exp b/runtest.exp index 31d08bf..de4de7f 100755 --- a/runtest.exp +++ b/runtest.exp @@ -1,5 +1,5 @@ # Test Framework Driver -# Copyright (C) 1992 - 2002 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 2409db6..cfd68cb 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -49,6 +49,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -122,7 +123,7 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -142,7 +143,7 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ + @set fnord $$MAKEFLAGS; amf=$$2; \ dot_seen=no; \ case "$@" in \ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ @@ -224,13 +225,16 @@ check-DEJAGNU: site.exp done; \ else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi + +distclean-DEJAGNU: + -rm -f site.exp site.bak DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -240,8 +244,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -288,7 +294,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -299,7 +305,8 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-DEJAGNU distclean-generic \ + distclean-tags dvi: dvi-recursive @@ -333,18 +340,18 @@ uninstall-info: uninstall-info-recursive .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-DEJAGNU \ check-am clean clean-generic clean-recursive distclean \ - distclean-generic distclean-recursive distclean-tags distdir \ - dvi dvi-am dvi-recursive info info-am info-recursive install \ - install-am install-data install-data-am install-data-recursive \ - install-exec install-exec-am install-exec-recursive \ - install-info install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive tags tags-recursive uninstall \ - uninstall-am uninstall-info-am uninstall-info-recursive \ - uninstall-recursive + distclean-DEJAGNU distclean-generic distclean-recursive \ + distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-am install-data install-data-am \ + install-data-recursive install-exec install-exec-am \ + install-exec-recursive install-info install-info-am \ + install-info-recursive install-man install-recursive \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am installdirs-recursive maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive mostlyclean \ + mostlyclean-generic mostlyclean-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-info-am \ + uninstall-info-recursive uninstall-recursive all all-am all-am-local all-local all-redirect-local all-redirect: force diff --git a/testsuite/config/default.exp b/testsuite/config/default.exp index 81f153d..fbec76b 100644 --- a/testsuite/config/default.exp +++ b/testsuite/config/default.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 diff --git a/testsuite/lib/libsup.exp b/testsuite/lib/libsup.exp index 1717861..a2e3f79 100644 --- a/testsuite/lib/libsup.exp +++ b/testsuite/lib/libsup.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002, 2003 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 @@ -17,8 +17,6 @@ # Please email any bugs, comments, and/or additions to this file to: # bug-dejagnu@gnu.org -# This file was written by Rob Savoye. (rob@welcomehome.org) - # # Setup an environment so we can execute library procs without DejaGnu # diff --git a/testsuite/libdejagnu/Makefile.in b/testsuite/libdejagnu/Makefile.in index 88798b8..898bb9e 100644 --- a/testsuite/libdejagnu/Makefile.in +++ b/testsuite/libdejagnu/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.6 from Makefile.am. +# Makefile.in generated by automake 1.6.3 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 @@ -51,6 +51,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -150,7 +151,7 @@ distclean-depend: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ - $(CXXCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + $(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< .cc.obj: @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @@ -201,7 +202,7 @@ top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ + @list='$(DISTFILES)'; for file in $$list; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -211,8 +212,10 @@ distdir: $(DISTFILES) dir=''; \ fi; \ if test -d $$d/$$file; then \ - cp -pR $$d/$$file $(distdir)$$dir \ - || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ else \ test -f $(distdir)/$$file \ || cp -p $$d/$$file $(distdir)/$$file \ @@ -244,7 +247,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" diff --git a/testsuite/libdejagnu/tunit.exp b/testsuite/libdejagnu/tunit.exp index 40e2797..55788af 100644 --- a/testsuite/libdejagnu/tunit.exp +++ b/testsuite/libdejagnu/tunit.exp @@ -1,3 +1,22 @@ +# Copyright (C) 1992 - 2002, 2003 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# Please email any bugs, comments, and/or additions to this file to: +# bug-dejagnu@gnu.org + load_lib "dejagnu.exp" # Uncomment these for debugging help diff --git a/testsuite/runtest.all/libs.exp b/testsuite/runtest.all/libs.exp index a03d9e2..61dfb6f 100644 --- a/testsuite/runtest.all/libs.exp +++ b/testsuite/runtest.all/libs.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/testsuite/runtest.all/options.exp b/testsuite/runtest.all/options.exp index 2af9c88..63fbc97 100644 --- a/testsuite/runtest.all/options.exp +++ b/testsuite/runtest.all/options.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1992 - 2002,2003 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 diff --git a/testsuite/runtest.all/stats-sub.exp b/testsuite/runtest.all/stats-sub.exp index 1f122e2..09c38be 100644 --- a/testsuite/runtest.all/stats-sub.exp +++ b/testsuite/runtest.all/stats-sub.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1997 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1997 - 2002, 2003 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 diff --git a/testsuite/runtest.all/stats.exp b/testsuite/runtest.all/stats.exp index 94ed492..eae2d23 100644 --- a/testsuite/runtest.all/stats.exp +++ b/testsuite/runtest.all/stats.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1995 - 2001 Free Software Foundation, Inc. +# Copyright (C) 1995 - 2002, 2003 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 |