From e9b2b3f264c15a8b1379f339c08e38f6a083c5ba Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Thu, 23 Sep 2004 13:07:15 +0000 Subject: [PATCH] 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. --- ChangeLog | 43 ++++++++++++++++++++++++++++++++++++- Makefile.am | 8 ++++--- m4/libtool.m4 | 6 ++++++ tests/Makefile.am | 26 +++++++++++++++++++++- tests/cdemo-conf.test | 8 ++----- tests/cdemo-exec.test | 8 ++----- tests/cdemo-make.test | 8 ++----- tests/cdemo-shared.test | 8 ++----- tests/cdemo-static.test | 8 ++----- tests/defs.in | 4 ++++ tests/demo-conf.test | 8 ++----- tests/demo-deplibs.test | 8 ++----- tests/demo-exec.test | 8 ++----- tests/demo-hardcode.test | 8 ++----- tests/demo-inst.test | 8 ++----- tests/demo-make.test | 8 ++----- tests/demo-nofast.test | 8 ++----- tests/demo-noinst-link.test | 8 ++----- tests/demo-nopic.test | 8 ++----- tests/demo-pic.test | 8 ++----- tests/demo-relink.test | 8 ++----- tests/demo-shared.test | 8 ++----- tests/demo-static.test | 7 +----- tests/demo-unst.test | 8 ++----- tests/depdemo-conf.test | 8 ++----- tests/depdemo-exec.test | 8 ++----- tests/depdemo-inst.test | 8 ++----- tests/depdemo-make.test | 8 ++----- tests/depdemo-nofast.test | 8 ++----- tests/depdemo-relink.test | 6 +----- tests/depdemo-shared.test | 8 ++----- tests/depdemo-static.test | 8 ++----- tests/depdemo-unst.test | 8 ++----- tests/f77demo-conf.test | 8 ++----- tests/f77demo-exec.test | 8 ++----- tests/f77demo-make.test | 8 ++----- tests/f77demo-shared.test | 8 ++----- tests/f77demo-static.test | 8 ++----- tests/link-2.test | 6 +----- tests/link.test | 6 +----- tests/mdemo-conf.test | 8 ++----- tests/mdemo-dryrun.test | 6 +----- tests/mdemo-exec.test | 8 ++----- tests/mdemo-inst.test | 8 ++----- tests/mdemo-make.test | 8 ++----- tests/mdemo-shared.test | 8 ++----- tests/mdemo-static.test | 8 ++----- tests/mdemo-unst.test | 8 ++----- tests/mdemo2-conf.test | 8 ++----- tests/mdemo2-exec.test | 8 ++----- tests/mdemo2-make.test | 8 ++----- tests/nomode.test | 6 +----- tests/pdemo-conf.test | 8 ++----- tests/pdemo-exec.test | 8 ++----- tests/pdemo-inst.test | 8 ++----- tests/pdemo-make.test | 8 ++----- tests/quote.test | 6 +----- tests/sh.test | 6 +----- tests/suffix.test | 6 +----- tests/tagdemo-conf.test | 8 ++----- tests/tagdemo-exec.test | 8 ++----- tests/tagdemo-make.test | 8 ++----- tests/tagdemo-shared.test | 8 ++----- tests/tagdemo-static.test | 8 ++----- tests/tagtrace.test | 6 +----- 65 files changed, 192 insertions(+), 356 deletions(-) diff --git a/ChangeLog b/ChangeLog index a53b81040..e07d61d9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,44 @@ +04-09-23 Gary V. Vaughan + + 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 * 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 +2004-09-23 Gary V. Vaughan * 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 daaceb84f..2cceb2e7b 100644 --- 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 f5229b269..d2d87c1af 100644 --- 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 183425029..81540deae 100644 --- 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 6df86fd05..b9cb6110b 100755 --- 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 612162995..19ed0a451 100755 --- 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 cb7d5dd43..ae9e67221 100755 --- 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 87704da62..970943616 100755 --- 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 447a4cb77..dda75f354 100755 --- 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 cf675e81b..bfe4b561a 100644 --- 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 3ca4d4754..34d200d59 100755 --- 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 d0aec516d..308c48cb2 100755 --- 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 b262d96ca..3b0c38ba3 100755 --- 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 4121938ed..deecba1c2 100755 --- 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 98e762aea..da7a12568 100755 --- 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 7dedcbf6a..f85668601 100755 --- 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 01af96389..e75c6d2fd 100755 --- 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 f87f740f5..8c3926195 100755 --- 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 6b1d1dbcf..fa0541ed2 100755 --- 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 cd4c4f91c..86a898ded 100755 --- 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 5162069af..8db075fe6 100755 --- 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 248ecc5e5..faded3a9b 100755 --- 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 94882224b..14d4e60f4 100755 --- 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 6aca67590..849bb8ae3 100755 --- 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 985e70280..819f2ab3d 100755 --- 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 71c768b15..6a26e1930 100755 --- 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 884534182..f0987fedc 100755 --- 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 a9727d5a2..acaf6fab8 100755 --- 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 ee04e9a6a..a2a3803f9 100755 --- 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 fccb152ea..f4ed59f4d 100755 --- 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 a4269afb1..45c8f257f 100755 --- 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 efbc2e7af..bcf2cc8de 100755 --- 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 ec13602b1..858173296 100755 --- 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 606dcf9a2..78d109366 100755 --- 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 7a23f68a2..a1560e9c9 100755 --- 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 2078118bd..e6934239d 100755 --- 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 43fb4c12a..22f263e25 100755 --- 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 b16ccb9b3..b0400caee 100755 --- 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 88ec1033b..cca6e5eed 100755 --- 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 <&1 | grep '^Usage:' >/dev/null; then : diff --git a/tests/pdemo-conf.test b/tests/pdemo-conf.test index 30a79add9..969242ce3 100755 --- 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 b5bf7a4b0..29703ed67 100755 --- 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 98e762aea..da7a12568 100755 --- 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 70a8b844c..2a59e4dff 100755 --- 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 efb76acfe..1b1d62b4c 100755 --- 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 ff8ee5895..bcd28efe8 100755 --- 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 606f495ba..f88cc95d2 100755 --- 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 eda394624..3916081b9 100755 --- 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 66ee6cf66..e9379813c 100755 --- 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 476ca39a4..6bb6c0956 100755 --- 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 abe4e11f5..078f55969 100755 --- 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 4d1ef4b4c..6b61d0a20 100755 --- 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 7a1643c18..1502ded1d 100755 --- 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$$} -- 2.47.2