From 4306dace39d6628ca4105c672b1497c3c75ee745 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 17 Mar 2003 02:25:05 +0000 Subject: 2003-03-16 Rob Savoye * lib/unix.exp: Preservce the value of LD_LIBRARY_PATH, rather than stomp on it. This is based on a patch from Brendan Conoboy . * Most files: Update copyright dates. 2003-03-13 Mike Stump * lib/dg.exp(dg-test): Add compiler flags to testcase name, to help ensure uniqueness. 2003-03-05 Alexandre Oliva * lib/remote.exp (standard_download, standard_upload): Support nfsdir and nfsroot_server. 2001-11-12 Andrew Cagney * 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) --- config/arc.exp | 2 +- config/arm-ice.exp | 2 +- config/base-config.exp | 2 +- config/base68k.exp | 2 +- config/bug.exp | 2 +- config/cfdbug.exp | 2 +- config/cygmon.exp | 2 +- config/d10v.exp | 2 +- config/ddb-ether.exp | 2 +- config/ddb.exp | 2 +- config/default.exp | 2 +- config/dos.exp | 2 +- config/dve.exp | 2 +- config/gdb-comm.exp | 2 +- config/gdb_stub.exp | 2 +- config/h8300.exp | 2 +- config/i386-bozo.exp | 2 +- config/i960.exp | 2 +- config/m32r-stub.exp | 2 +- config/m32r.exp | 2 +- config/m68hc11.exp | 2 +- config/m68k-emc.exp | 19 +++++++++++++++++++ config/mips-idt.exp | 2 +- config/mn10200-eval.exp | 2 +- config/mn10300-eval.exp | 2 +- config/netware.exp | 2 +- config/powerpc-bug.exp | 2 +- config/proelf.exp | 2 +- config/rom68k.exp | 2 +- config/sh.exp | 2 +- config/sid.exp | 19 +++++++++++++++++++ config/slite.exp | 2 +- config/sparclet.exp | 2 +- config/tic80.exp | 19 +++++++++++++++++++ config/udi.exp | 2 +- config/unix.exp | 24 ++++++++++++++++-------- config/vr4100.exp | 2 +- config/vr4300.exp | 2 +- config/vr5000.exp | 2 +- config/vrtx.exp | 2 +- config/vxworks.exp | 2 +- 41 files changed, 110 insertions(+), 45 deletions(-) (limited to 'config') 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 . 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 -- cgit v1.1