Since defs can change (path to grep for example) when it is made

for a different host, it can't be shipped.  That also means that
defs will always be generated in the build tree, so each test case
can have the srcdir discovery factored away into tests/defs.in:

* Makefile.am (EXTRA_DIST): s/defs/defs.in/g
* tests/Makefile.am (defs): New rule to remake defs from the
parent directory's Makefile.
* tests/cdemo-conf.test, tests/cdemo-exec.test,
tests/cdemo-make.test, tests/cdemo-shared.test,
tests/cdemo-static.test, tests/demo-conf.test,
tests/demo-deplibs.test, tests/demo-exec.test,
tests/demo-hardcode.test, tests/demo-inst.test,
tests/demo-make.test, tests/demo-nofast.test,
tests/demo-noinst-link.test, tests/demo-nopic.test,
tests/demo-pic.test, tests/demo-relink.test,
tests/demo-shared.test, tests/demo-static.test,
tests/demo-unst.test, tests/depdemo-conf.test,
tests/depdemo-exec.test, tests/depdemo-inst.test,
tests/depdemo-make.test, tests/depdemo-nofast.test,
tests/depdemo-relink.test, tests/depdemo-shared.test,
tests/depdemo-static.test, tests/depdemo-unst.test,
tests/f77demo-conf.test, tests/f77demo-exec.test,
tests/f77demo-make.test, tests/f77demo-shared.test,
tests/f77demo-static.test, tests/link-2.test, tests/link.test,
tests/mdemo-conf.test, tests/mdemo-dryrun.test,
tests/mdemo-exec.test, tests/mdemo-inst.test,
tests/mdemo-make.test, tests/mdemo-shared.test,
tests/mdemo-static.test, tests/mdemo-unst.test,
tests/mdemo2-conf.test, tests/mdemo2-exec.test,
tests/mdemo2-make.test, tests/nomode.test, tests/pdemo-conf.test,
tests/pdemo-exec.test, tests/pdemo-inst.test,
tests/pdemo-make.test, tests/quote.test, tests/sh.test,
tests/suffix.test, tests/tagdemo-conf.test,
tests/tagdemo-exec.test, tests/tagdemo-make.test,
tests/tagdemo-shared.test, tests/tagdemo-static.test,
tests/tagtrace.test: Removed srcdir discovery boilerplate...
* tests/defs.in: ...and put it here.

diff --git a/ChangeLog b/ChangeLog
index a53b8104048f55f1f17c40c5a7e12c0b6aab61dd..e07d61d9e7e12a2e469ce7fed38938725053cbdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+04-09-23  Gary V. Vaughan  <gary@gnu.org>
+
+       Since defs can change (path to grep for example) when it is made
+       for a different host, it can't be shipped.  That also means that
+       defs will always be generated in the build tree, so each test case
+       can have the srcdir discovery factored away into tests/defs.in:
+
+       * Makefile.am (EXTRA_DIST): s/defs/defs.in/g
+       * tests/Makefile.am (defs): New rule to remake defs from the
+       parent directory's Makefile.
+       * tests/cdemo-conf.test, tests/cdemo-exec.test,
+       tests/cdemo-make.test, tests/cdemo-shared.test,
+       tests/cdemo-static.test, tests/demo-conf.test,
+       tests/demo-deplibs.test, tests/demo-exec.test,
+       tests/demo-hardcode.test, tests/demo-inst.test,
+       tests/demo-make.test, tests/demo-nofast.test,
+       tests/demo-noinst-link.test, tests/demo-nopic.test,
+       tests/demo-pic.test, tests/demo-relink.test,
+       tests/demo-shared.test, tests/demo-static.test,
+       tests/demo-unst.test, tests/depdemo-conf.test,
+       tests/depdemo-exec.test, tests/depdemo-inst.test,
+       tests/depdemo-make.test, tests/depdemo-nofast.test,
+       tests/depdemo-relink.test, tests/depdemo-shared.test,
+       tests/depdemo-static.test, tests/depdemo-unst.test,
+       tests/f77demo-conf.test, tests/f77demo-exec.test,
+       tests/f77demo-make.test, tests/f77demo-shared.test,
+       tests/f77demo-static.test, tests/link-2.test, tests/link.test,
+       tests/mdemo-conf.test, tests/mdemo-dryrun.test,
+       tests/mdemo-exec.test, tests/mdemo-inst.test,
+       tests/mdemo-make.test, tests/mdemo-shared.test,
+       tests/mdemo-static.test, tests/mdemo-unst.test,
+       tests/mdemo2-conf.test, tests/mdemo2-exec.test,
+       tests/mdemo2-make.test, tests/nomode.test, tests/pdemo-conf.test,
+       tests/pdemo-exec.test, tests/pdemo-inst.test,
+       tests/pdemo-make.test, tests/quote.test, tests/sh.test,
+       tests/suffix.test, tests/tagdemo-conf.test,
+       tests/tagdemo-exec.test, tests/tagdemo-make.test,
+       tests/tagdemo-shared.test, tests/tagdemo-static.test,
+       tests/tagtrace.test: Removed srcdir discovery boilerplate...
+       * tests/defs.in: ...and put it here.
+
 2004-09-23  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): move symcode calculation
@@ -5,7 +46,7 @@
        * doc/libtool.texi (libtool script contents): update description
        of global_symbol_to_cdecl.
 
-04-09-23  Gary V. Vaughan  <gary@gnu.org>
+2004-09-23  Gary V. Vaughan  <gary@gnu.org>
 
        * configure.ac (M4SH): AC_SUBST m4sh expander.
        * config/general.m4sh, config/getopt.m4sh: New files with factored

diff --git a/Makefile.am b/Makefile.am
index daaceb84f87782a7ca5db4b3392149e71b56c1b9..2cceb2e7bbb4b2066604b27b3aa3ba2ef43a9d93 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,11 +144,13 @@ libtoolize: $(sh_files) libtoolize.in Makefile
        chmod a-w libtoolize.tmp
        mv -f libtoolize.tmp libtoolize
 
+# The defs script shouldn't be recreated whenever the Makefile is
+# regenerated since the source tree can be read-only.
 check-recursive: tests/defs
-tests/defs: tests/defs.in Makefile
-       cd $(top_srcdir); \
+tests/defs: tests/defs.in Makefile.am
        rm -f tests/defs.m4sh tests/defs.tmp tests/defs; \
-       $(M4SH) -B ./config tests/defs.in > tests/defs.m4sh; \
+       $(M4SH) -B $(top_srcdir)/config \
+               $(top_srcdir)/tests/defs.in > tests/defs.m4sh; \
        input="defs.in"; \
        $(edit) tests/defs.m4sh > tests/defs.tmp; \
        rm -f tests/defs.m4sh; \

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index f5229b2696356e0823157c6f4b63d06e19828b01..d2d87c1afcb5c2c1014310b765da08a0bf09cd2f 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2726,6 +2726,12 @@ case `$NM -V 2>&1` in
   symcode='[[ABCDGIRSTW]]' ;;
 esac
 
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symols differently,
 # so use this general approach.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 18342502998825ea0761020a99e8ba8402feee4e..81540deaeb64df2622ba583225cedfcc7e960486 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,23 @@
 ## Process this file with automake to produce Makefile.in
+##
+## Copyright (C) 2003, 2004 Free Software Foundation
+##
+## 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; see the file COPYING.  If not, write to
+## the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+## Boston, MA 02111-1307, USA.
+
+DISTCLEANFILES =
 
 CXX_TESTS = \
        tagdemo-static.test tagdemo-make.test tagdemo-exec.test \
@@ -71,7 +90,7 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \
        OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" F77="$(F77)" \
        FFLAGS="$(FFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CPP="$(CPP)"
 
-EXTRA_DIST = defs $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
+EXTRA_DIST = defs.in $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS)
 DIST_SUBDIRS = $(CONF_SUBDIRS)
 
 # FIXME: Automake-1.7b (at least) only honours DIST_SUBDIRS if SUBDIRS is
@@ -104,6 +123,11 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 ## Test suite.  ##
 ## ------------ ##
 
+$(TESTS): defs
+defs: defs.in ../Makefile.am
+       cd .. && $(MAKE) $(AM_MAKEFLAGS) tests/defs
+DISTCLEANFILES += defs
+
 TESTSUITE_AT = \
        testsuite.at \
        demo.at fortran.at tools.at

diff --git a/tests/cdemo-conf.test b/tests/cdemo-conf.test
index 6df86fd05f209ce0677a567f1bdd11b3cd289eef..b9cb6110b619c4b9321d55fb69e28c226e42aa71 100755 (executable)
--- a/tests/cdemo-conf.test
+++ b/tests/cdemo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # cdemo-conf.test - try configuring the cdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "cdemo"

diff --git a/tests/cdemo-exec.test b/tests/cdemo-exec.test
index 612162995aa12f465ff32923b5f01aa5e273cfe4..19ed0a45116f46e79e1e1533ac94f14b40c0765b 100755 (executable)
--- a/tests/cdemo-exec.test
+++ b/tests/cdemo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # cdemo-exec.test - check that programs in the cdemo subdirectory are viable
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "cdemo-make" "cdemo/cdemo$EXEEXT"
 

diff --git a/tests/cdemo-make.test b/tests/cdemo-make.test
index cb7d5dd4378f55e17c675f72274e513363716322..ae9e672210bce2b34a23c47b80cf9dd122627f65 100755 (executable)
--- a/tests/cdemo-make.test
+++ b/tests/cdemo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # cdemo-make.test - try building in the cdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "cdemo-conf" "cdemo/Makefile"
 

diff --git a/tests/cdemo-shared.test b/tests/cdemo-shared.test
index 87704da62c6861fa03e3aaff8b7f90b80a77abb4..9709436166138452d885acfda2d5e011e76355c5 100755 (executable)
--- a/tests/cdemo-shared.test
+++ b/tests/cdemo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # cdemo-shared.test - try configuring the cdemo subdirectory for shared libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "cdemo"

diff --git a/tests/cdemo-static.test b/tests/cdemo-static.test
index 447a4cb77add4046e56299e4bc06979beed75a2c..dda75f354827343c44d6f31d8f4eaf7952af5a09 100755 (executable)
--- a/tests/cdemo-static.test
+++ b/tests/cdemo-static.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # cdemo-static.test - try configuring the cdemo subdirectory for static libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "cdemo"

diff --git a/tests/defs.in b/tests/defs.in
index cf675e81b7a3b4e5e82c3162a7b8c4dc7cc16fc3..bfe4b561a34724ce8c633775cf20a56ce0ed776f 100644 (file)
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -49,6 +49,10 @@ NO | no | 0 | "")
   ;;
 esac
 
+if test -z "$srcdir"; then
+  srcdir=`$ECHO "$0" | $SED "$dirname"`
+  test "$srcdir" = "$0" && srcdir=.
+fi
 
 # func_msg arg...
 # Echo message with prefix.

diff --git a/tests/demo-conf.test b/tests/demo-conf.test
index 3ca4d475489360b2255a6fc80e3334526a1f56c0..34d200d59a6dbd4d1d8d61bf6020f3a8a02e88af 100755 (executable)
--- a/tests/demo-conf.test
+++ b/tests/demo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-conf.test - try configuring the demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "demo"

diff --git a/tests/demo-deplibs.test b/tests/demo-deplibs.test
index d0aec516dc62ccb4c4236114f0feb8a531ab4962..308c48cb24d9d42101c960cabaaa3ee415888dfc 100755 (executable)
--- a/tests/demo-deplibs.test
+++ b/tests/demo-deplibs.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-deplibs.test - check whether the shared library check method is OK
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-conf" "demo/libhello.la"
 

diff --git a/tests/demo-exec.test b/tests/demo-exec.test
index b262d96ca3738b66b7ce0e973658b63ffe9f192a..3b0c38ba3ff2a33a7393fbef19145a38611f1b7a 100755 (executable)
--- a/tests/demo-exec.test
+++ b/tests/demo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-exec.test - check that programs in the ../demo subdirectory are viable
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-make" "demo/hell$EXEEXT"
 

diff --git a/tests/demo-hardcode.test b/tests/demo-hardcode.test
index 4121938eda94112e79185d45707ded16aa706eb5..deecba1c2b3210d1c8ef19a2aa6989d01a1f9209 100755 (executable)
--- a/tests/demo-hardcode.test
+++ b/tests/demo-hardcode.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-hardcode.test - check to see what the system linker hardcodes
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-inst" "$prefix/lib/libhello.la"
 

diff --git a/tests/demo-inst.test b/tests/demo-inst.test
index 98e762aeaaf0c01648e5b728fcfd565965a84c92..da7a1256804c4d92a60424a73684f791390b8d6d 100755 (executable)
--- a/tests/demo-inst.test
+++ b/tests/demo-inst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-inst.test - try installing from the demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-make" "demo/hell$EXEEXT"
 

diff --git a/tests/demo-make.test b/tests/demo-make.test
index 7dedcbf6a49d6933684b65e0b4f711f5127e6cef..f85668601ed3aaab175741dab9f04764657d80b8 100755 (executable)
--- a/tests/demo-make.test
+++ b/tests/demo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-make.test - try building in the demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-conf" "demo/Makefile"
 

diff --git a/tests/demo-nofast.test b/tests/demo-nofast.test
index 01af9638920904014a933e3fcba845287e5d4d3b..e75c6d2fd3d5df76df97592780deffedfe80c47e 100755 (executable)
--- a/tests/demo-nofast.test
+++ b/tests/demo-nofast.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-nofast.test - try configuring the ../demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "demo"

diff --git a/tests/demo-noinst-link.test b/tests/demo-noinst-link.test
index f87f740f5f29e3017861e0d9bbcbf8b43bec1a95..8c39261957e224d91fc68c6f9262f33358612a40 100755 (executable)
--- a/tests/demo-noinst-link.test
+++ b/tests/demo-noinst-link.test
@@ -2,7 +2,7 @@
 # demo-noinst-link.test - make sure we do not link with an installed
 # library when an uninstalled one is to be used
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -22,11 +22,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_restore_files ()
 {

diff --git a/tests/demo-nopic.test b/tests/demo-nopic.test
index 6b1d1dbcf7faf9a67ab9b9d4737e41fe3c31c204..fa0541ed2728e4f94db3bf1bf0e9d64a628b863e 100755 (executable)
--- a/tests/demo-nopic.test
+++ b/tests/demo-nopic.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-nopic.test - try configuring the ../demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 case "$host" in
 hppa*|x86_64*|s390*)

diff --git a/tests/demo-pic.test b/tests/demo-pic.test
index cd4c4f91c458c52eceac8bc9377ea8696037a617..86a898ded0d66df093ada537633c0bcd6b99cf06 100755 (executable)
--- a/tests/demo-pic.test
+++ b/tests/demo-pic.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-pic.test - try configuring the ../demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_rmprefixdir
 func_cd "demo"

diff --git a/tests/demo-relink.test b/tests/demo-relink.test
index 5162069afc68e6ac48bc8d3697ef61b2b43d1e45..8db075fe6bdb6d8add8b41ebeb196aca0be3f383 100755 (executable)
--- a/tests/demo-relink.test
+++ b/tests/demo-relink.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-relink.test - check to see whether shlibpath overrides runpath
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_restore_files ()
 {

diff --git a/tests/demo-shared.test b/tests/demo-shared.test
index 248ecc5e54ec2a3db9df0e4016d7f12e2eadc44f..faded3a9bb8ef12e787eacd53df899067c587d5b 100755 (executable)
--- a/tests/demo-shared.test
+++ b/tests/demo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-shared.test - try configuring the demo subdirectory for shared libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "demo"

diff --git a/tests/demo-static.test b/tests/demo-static.test
index 94882224b2ba6c350033f183935932e1bd5f990e..14d4e60f480d5b0adf9b865b985a7b40b0bab1fa 100755 (executable)
--- a/tests/demo-static.test
+++ b/tests/demo-static.test
@@ -21,12 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-# Test script header.
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "demo"

diff --git a/tests/demo-unst.test b/tests/demo-unst.test
index 6aca6759040fde9bfb6b6e8fa328e581746014ba..849bb8ae3403a4b9c5284a896f14de4c3ede6056 100755 (executable)
--- a/tests/demo-unst.test
+++ b/tests/demo-unst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-unst.test - try uninstalling in the demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-inst" "$prefix/bin/hell$EXEEXT" "demo/Makefile"
 

diff --git a/tests/depdemo-conf.test b/tests/depdemo-conf.test
index 985e7028031b6f267936d5a9df5d0c2fb3e5e23b..819f2ab3d804bc1fe8a1dbb7e8e7d7d66ad99ac5 100755 (executable)
--- a/tests/depdemo-conf.test
+++ b/tests/depdemo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-conf.test - try configuring the depdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "depdemo"

diff --git a/tests/depdemo-exec.test b/tests/depdemo-exec.test
index 71c768b15919b6da1ee078a376b7f3cf3ec46954..6a26e193079229a33d639a0d8e0c0455261989a9 100755 (executable)
--- a/tests/depdemo-exec.test
+++ b/tests/depdemo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-exec.test - check that programs in the depdemo subdirectory are viable
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "depdemo-make" "depdemo/depdemo$EXEEXT"
 

diff --git a/tests/depdemo-inst.test b/tests/depdemo-inst.test
index 884534182fe7403a87d39e971b5b52340f59e5fd..f0987fedce9bb4574726e72b41a850fef0dee146 100755 (executable)
--- a/tests/depdemo-inst.test
+++ b/tests/depdemo-inst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-inst.test - try installing from the depdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "depdemo-make" "depdemo/depdemo$EXEEXT"
 

diff --git a/tests/depdemo-make.test b/tests/depdemo-make.test
index a9727d5a2752e5a9c6e9f956807539ef4221d980..acaf6fab8e78c8ae7460016e2dd0540e3425996d 100755 (executable)
--- a/tests/depdemo-make.test
+++ b/tests/depdemo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-make.test - try building in the depdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "depdemo-conf" "depdemo/Makefile"
 

diff --git a/tests/depdemo-nofast.test b/tests/depdemo-nofast.test
index ee04e9a6a127b326fd0b3205e1e5d7a23197cb24..a2a3803f95326e68f80b15d9b89d111f451bba64 100755 (executable)
--- a/tests/depdemo-nofast.test
+++ b/tests/depdemo-nofast.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-nofast.test - try configuring the ./depdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "depdemo"

diff --git a/tests/depdemo-relink.test b/tests/depdemo-relink.test
index fccb152ea185710e28f243e5e8c76ccf584dda6a..f4ed59f4d219abfa00e947b141cc8eadbb774a16 100755 (executable)
--- a/tests/depdemo-relink.test
+++ b/tests/depdemo-relink.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_restore_files ()
 {

diff --git a/tests/depdemo-shared.test b/tests/depdemo-shared.test
index a4269afb11fabcc1278ab10735f903c6188492bd..45c8f257fbdb2b759337e1e6e7b77f15f2507e1c 100755 (executable)
--- a/tests/depdemo-shared.test
+++ b/tests/depdemo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-shared.test - try configuring the depdemo subdirectory for shared libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "depdemo"

diff --git a/tests/depdemo-static.test b/tests/depdemo-static.test
index efbc2e7afd24f2cd5d75dbab08ce14b26c1360c4..bcf2cc8deeb5386ad6def83a59a02230a376ca62 100755 (executable)
--- a/tests/depdemo-static.test
+++ b/tests/depdemo-static.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-static.test - try configuring the depdemo subdirectory for static libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "depdemo"

diff --git a/tests/depdemo-unst.test b/tests/depdemo-unst.test
index ec13602b1fa9dc443f413f60c6a6c0ca74cf9887..858173296f9af6fe3641e1423d613ce7a21d37c6 100755 (executable)
--- a/tests/depdemo-unst.test
+++ b/tests/depdemo-unst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depdemo-unst.test - try uninstalling in the depdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "depdemo-inst" "$prefix/bin/depdemo$EXEEXT" "depdemo/Makefile"
 

diff --git a/tests/f77demo-conf.test b/tests/f77demo-conf.test
index 606dcf9a2bccef373d113260dd9c15732487d3bd..78d109366474481365c981787dc5514b797f28bb 100755 (executable)
--- a/tests/f77demo-conf.test
+++ b/tests/f77demo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-conf.test - try configuring the f77demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "f77demo"

diff --git a/tests/f77demo-exec.test b/tests/f77demo-exec.test
index 7a23f68a2896ea499e4276738b2aec70bf1d1b35..a1560e9c91e6e90f61a7a60d81b956ae46ad41ee 100755 (executable)
--- a/tests/f77demo-exec.test
+++ b/tests/f77demo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-exec.test - check that programs in the f77demo subdirectory are viable
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "f77demo-make" "f77demo/fprogram$EXEEXT" "f77demo/cprogram$EXEEXT"
 

diff --git a/tests/f77demo-make.test b/tests/f77demo-make.test
index 2078118bd79ad84b9a3b82e0825f1b986ef0b223..e6934239d1f2a96db8e43d41b204b1f7b06e9428 100755 (executable)
--- a/tests/f77demo-make.test
+++ b/tests/f77demo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-make.test - try building in the f77demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "f77demo-conf" "f77demo/Makefile"
 

diff --git a/tests/f77demo-shared.test b/tests/f77demo-shared.test
index 43fb4c12adfa5673c89c1fedfebe81849430d31d..22f263e25f515c543342dcb5c6041c6154946f9a 100755 (executable)
--- a/tests/f77demo-shared.test
+++ b/tests/f77demo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-shared.test - try configuring the f77demo subdirectory for shared libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "f77demo"

diff --git a/tests/f77demo-static.test b/tests/f77demo-static.test
index b16ccb9b3d853393feb5eaed7fccce1cd674be24..b0400caee1a43c15cbd8db2db34bfc43f4ff8a09 100755 (executable)
--- a/tests/f77demo-static.test
+++ b/tests/f77demo-static.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # f77demo-static.test - try configuring the f77demo subdirectory for static libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "f77demo"

diff --git a/tests/link-2.test b/tests/link-2.test
index 88ec1033bf0b3a0e01cb3a505ed285950dd35a1a..cca6e5eed4841359c4731b6dcb510451b4b93cc9 100755 (executable)
--- a/tests/link-2.test
+++ b/tests/link-2.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 rm -f hell.lo
 cat > hell.lo <<EOF

diff --git a/tests/link.test b/tests/link.test
index b04ba056c3c47e550841486fded485a496afee53..7bf6342f5e566199effcaac08bbea4e33bbddf3d 100755 (executable)
--- a/tests/link.test
+++ b/tests/link.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 # Try a sample link command.
 linkresult=`$LIBTOOL -n --mode=link $CC -o gettext ../lib/libnlsut.a`

diff --git a/tests/mdemo-conf.test b/tests/mdemo-conf.test
index 7a39d506cf425f20b4fb459603a198378ea87e70..53fe5594444a9db7ffab73b2ec0566bcdae10688 100755 (executable)
--- a/tests/mdemo-conf.test
+++ b/tests/mdemo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-conf.test - try configuring the mdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "mdemo"

diff --git a/tests/mdemo-dryrun.test b/tests/mdemo-dryrun.test
index 641e1e75a51fe79bff514c80c8897a8d6b615b23..cc297b470e6983962955b8a168b81745ece75e67 100755 (executable)
--- a/tests/mdemo-dryrun.test
+++ b/tests/mdemo-dryrun.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo-conf" "mdemo/Makefile"
 

diff --git a/tests/mdemo-exec.test b/tests/mdemo-exec.test
index e6ef81e1eed00ffbe1153674b45c636fee7cb0b0..ef60386de15246ead76384dc62228fbc3d04a47a 100755 (executable)
--- a/tests/mdemo-exec.test
+++ b/tests/mdemo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-exec.test - check that programs in the mdemo subdirectory are viable
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo-make" "mdemo/mdemo$EXEEXT"
 

diff --git a/tests/mdemo-inst.test b/tests/mdemo-inst.test
index 90c69a1972a91ae9afb9db6c19623dd02a4e70d0..a0a86f71a1334c224fb1e3ab6731907087084eb2 100755 (executable)
--- a/tests/mdemo-inst.test
+++ b/tests/mdemo-inst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-inst.test - try installing from the mdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo-make" "mdemo/mdemo$EXEEXT"
 

diff --git a/tests/mdemo-make.test b/tests/mdemo-make.test
index 25a7127fbef4dd6f927732afc84ec21fe43904ab..be5bac9f02523a3f2fb1d9ee9f00f69131769be5 100755 (executable)
--- a/tests/mdemo-make.test
+++ b/tests/mdemo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-make.test - try building in the mdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo-conf" "mdemo/Makefile"
 

diff --git a/tests/mdemo-shared.test b/tests/mdemo-shared.test
index 08507cf4220a8690575effca77c1d01a1be7482c..597d6db03a6059375a5c6485cf39ef88b6b36be6 100755 (executable)
--- a/tests/mdemo-shared.test
+++ b/tests/mdemo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-shared.test - try configuring the mdemo subdirectory for shared libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "mdemo"

diff --git a/tests/mdemo-static.test b/tests/mdemo-static.test
index bd4acd11d61dc0ab38778ded5f2e6b2dbea4f28d..336bde8c53c47e909d9333bdf95baf6de113ba05 100755 (executable)
--- a/tests/mdemo-static.test
+++ b/tests/mdemo-static.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-static.test - try configuring the mdemo subdirectory for static libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "mdemo"

diff --git a/tests/mdemo-unst.test b/tests/mdemo-unst.test
index 15b6a4925d233fe4ca0fd84e3a65b9c8fb493d67..06e5de7565f3525703323851199287c218271b52 100755 (executable)
--- a/tests/mdemo-unst.test
+++ b/tests/mdemo-unst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo-unst.test - try uninstalling in the mdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo-inst" "$prefix/bin/mdemo$EXEEXT" "mdemo/Makefile"
 

diff --git a/tests/mdemo2-conf.test b/tests/mdemo2-conf.test
index 5229db86816943ad5f2a8d5e986490c171a788bb..c2a5218286cd982e047bb5e5cf7e316b46ea66ee 100755 (executable)
--- a/tests/mdemo2-conf.test
+++ b/tests/mdemo2-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo2-conf.test - try configuring the mdemo2 subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "mdemo2"

diff --git a/tests/mdemo2-exec.test b/tests/mdemo2-exec.test
index 8b4eb2362062c9bcbc15654c3a7de2f1673c828b..1cc944edc5892793c3a9efb43c653f96aac4949f 100755 (executable)
--- a/tests/mdemo2-exec.test
+++ b/tests/mdemo2-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo2-exec.test - check that programs in the mdemo2 subdirectory are viable
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo2-make" "mdemo2/mdemo2$EXEEXT"
 

diff --git a/tests/mdemo2-make.test b/tests/mdemo2-make.test
index 650d7cf0f33ac9ffca51c5686e3fd4b9f12a2378..57f9114c960480a08bd72260b718c8d1d200407f 100755 (executable)
--- a/tests/mdemo2-make.test
+++ b/tests/mdemo2-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # mdemo2-make.test - try building in the mdemo2 subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "mdemo2-conf" "mdemo2/Makefile"
 func_require "mdemo-make" "mdemo/libmlib.la"

diff --git a/tests/nomode.test b/tests/nomode.test
index f88d3b830bc8f93d6a95e1980327d36932ef5e25..ae22c347558d131b1670fbb4bb34a2b82e3acbc6 100755 (executable)
--- a/tests/nomode.test
+++ b/tests/nomode.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 status=$EXIT_SUCCESS
 if $LIBTOOL --help 2>&1 | grep '^Usage:' >/dev/null; then :

diff --git a/tests/pdemo-conf.test b/tests/pdemo-conf.test
index 30a79add9a9aa439765f454176eed9019fe88885..969242ce3274afe84047984cb325c62c114298e6 100755 (executable)
--- a/tests/pdemo-conf.test
+++ b/tests/pdemo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # pdemo-conf.test - try configuring the pdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "pdemo"

diff --git a/tests/pdemo-exec.test b/tests/pdemo-exec.test
index b5bf7a4b0bfaea6c78876b2879b4576bdb7a31b6..29703ed670bbc2d4257a59794babd6358c63b10e 100755 (executable)
--- a/tests/pdemo-exec.test
+++ b/tests/pdemo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # pdemo-exec.test - check that programs in the pdemo subdirectory are viable
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "pdemo-make" "pdemo/hell$EXEEXT"
 

diff --git a/tests/pdemo-inst.test b/tests/pdemo-inst.test
index 98e762aeaaf0c01648e5b728fcfd565965a84c92..da7a1256804c4d92a60424a73684f791390b8d6d 100755 (executable)
--- a/tests/pdemo-inst.test
+++ b/tests/pdemo-inst.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # demo-inst.test - try installing from the demo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "demo-make" "demo/hell$EXEEXT"
 

diff --git a/tests/pdemo-make.test b/tests/pdemo-make.test
index 70a8b844c2d92338f35c63a106f452bd0eedaf75..2a59e4dff852255a0c7f53239b8c97302c587927 100755 (executable)
--- a/tests/pdemo-make.test
+++ b/tests/pdemo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # pdemo-make.test - try building in the pdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "pdemo-conf" "pdemo/Makefile"
 

diff --git a/tests/quote.test b/tests/quote.test
index efb76acfef712977ce2bbc991f9652e863d4fe7d..1b1d62b4cf9a10c28bad4decad20c25528ef7e20 100755 (executable)
--- a/tests/quote.test
+++ b/tests/quote.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 # Do the torture test.
 status=$EXIT_SUCCESS

diff --git a/tests/sh.test b/tests/sh.test
index ff8ee5895cb85d29e2385bab2f36565b70772a68..bcd28efe8eb8f45455eec28d48421ec050f767c1 100755 (executable)
--- a/tests/sh.test
+++ b/tests/sh.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 # Check all the "portable" shell scripts.
 status=$EXIT_SUCCESS

diff --git a/tests/suffix.test b/tests/suffix.test
index 606f495ba594caca5e7df28472dca1dd66b5f4fc..f88cc95d2fbda76e5ccc7ab3cd35eddb1c45cb5e 100755 (executable)
--- a/tests/suffix.test
+++ b/tests/suffix.test
@@ -26,11 +26,7 @@
 extensions="C F S ada adb ads asm c c++ cc cpp cxx f f90 for m s"
 bad_names="foo."
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 status=$EXIT_SUCCESS
 for ext in $extensions; do

diff --git a/tests/tagdemo-conf.test b/tests/tagdemo-conf.test
index eda394624e68c21241bc041f0f0330d91aac4e46..3916081b92c537382012a61395af22ca358b64f1 100755 (executable)
--- a/tests/tagdemo-conf.test
+++ b/tests/tagdemo-conf.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-conf.test - try configuring the tagdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "tagdemo"

diff --git a/tests/tagdemo-exec.test b/tests/tagdemo-exec.test
index 66ee6cf66a9fa50f8e0c659dcd6e86c4d49e221e..e9379813cb7d09ab7d1b019a58c460b103722cd2 100755 (executable)
--- a/tests/tagdemo-exec.test
+++ b/tests/tagdemo-exec.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-exec.test - check that programs in the tagdemo subdirectory are viable
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "tagdemo-make" "tagdemo/tagdemo$EXEEXT"
 

diff --git a/tests/tagdemo-make.test b/tests/tagdemo-make.test
index 476ca39a4c66e9757e5fb89cdb55562f6ff85f1e..6bb6c0956fc0d9712d0061347e77baf6bf74fff7 100755 (executable)
--- a/tests/tagdemo-make.test
+++ b/tests/tagdemo-make.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-make.test - try building in the tagdemo subdirectory
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_require "tagdemo-conf" "tagdemo/Makefile"
 

diff --git a/tests/tagdemo-shared.test b/tests/tagdemo-shared.test
index abe4e11f516ac177429be02ea85e6e6dea9d4f7c..078f55969a43ec302ecdc74f1aa81be72011ef06 100755 (executable)
--- a/tests/tagdemo-shared.test
+++ b/tests/tagdemo-shared.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-shared.test - try configuring the tagdemo subdirectory for shared libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "tagdemo"

diff --git a/tests/tagdemo-static.test b/tests/tagdemo-static.test
index 4d1ef4b4cb0e51c7dc3efad8084cd1e719c50c21..6b61d0a20a1e69713054e4f28c476b7e62555947 100755 (executable)
--- a/tests/tagdemo-static.test
+++ b/tests/tagdemo-static.test
@@ -1,7 +1,7 @@
 #! /bin/sh
 # tagdemo-static.test - try configuring tagdemo subdirectory for static libs
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 func_mkprefixdir
 func_cd "tagdemo"

diff --git a/tests/tagtrace.test b/tests/tagtrace.test
index 7a1643c18c2e06009e0ccb57147ff78f1aa64acb..1502ded1dc6e858afb6e5bcd7f0ef8491282b108 100755 (executable)
--- a/tests/tagtrace.test
+++ b/tests/tagtrace.test
@@ -21,11 +21,7 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
 
-if test -z "$srcdir"; then
-  srcdir=`echo "$0" | sed 's%/[^/]*$%%'`
-  test "$srcdir" = "$0" && srcdir=.
-fi
-. $srcdir/defs || exit 1
+. defs || exit 1
 
 : ${fnord=$srcdir/../fnord$$}