From: Gary V. Vaughan Date: Wed, 13 Apr 2005 12:24:35 +0000 (+0000) Subject: Since the bootstrap process requires that several of the rules for X-Git-Tag: release-2-1b~676 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c1e70c04a012bdf7633dd83399b44f8c4e249ff;p=thirdparty%2Flibtool.git Since the bootstrap process requires that several of the rules for files generated in doc and tests already lived in $top_srcdir/Makefile.am, along with proxy rules in sub-Makefiles, this changeset consolidates almost everything into the top Makefile.am, simplifying things considerably: * doc/Makefile.am, tests/Makefile.am: Removed. All rules moved... * Makefile.am: ...to here and adjusted to run from $top_builddir. Some reformatting to group rules and declarations by purpose, and simplify with respect to removing much of the make recursion. Add `doc/PLATFORMS', `doc/fdl.texi' and `doc/notes.texi'. `defs.in' and `defs.m4sh' are in directory `tests'. (uninstall-hook): Don't forget to uninstall libtoolize's libltdl source tree. * bootstrap: Simplified dirty makefile management, and bootstrap file creation in light of having only a single pertinent Makefile. * configure.ac (CONF_SUBDIRS): Add tests/ prefix to each subdir to compensate. (DIST_MAKEFILE_LIST): Adjust. (AC_CONFIG_FILES): Remove doc/Makefile and tests/Makefile. * tests/defs.m4sh (LIBTOOL, scripts): Adjust paths. * tests/cdemo-conf.test, tests/cdemo-exec.test, tests/cdemo-make.test, tests/cdemo-shared.test, tests/cdemo-static.test, tests/cdemo-undef.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/objectlist.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/tagdemo-undef.test, tests/tagtrace.test (func_cd, func_require): Adjust paths.. --- diff --git a/ChangeLog b/ChangeLog index e925d7a38..ed595fa0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,59 @@ +2005-04-13 Gary V. Vaughan + + Since the bootstrap process requires that several of the rules for + files generated in doc and tests already lived in + $top_srcdir/Makefile.am, along with proxy rules in sub-Makefiles, + this changeset consolidates almost everything into the top + Makefile.am, simplifying things considerably: + + * doc/Makefile.am, tests/Makefile.am: Removed. All rules moved... + * Makefile.am: ...to here and adjusted to run from $top_builddir. + Some reformatting to group rules and declarations by purpose, and + simplify with respect to removing much of the make recursion. + Add `doc/PLATFORMS', `doc/fdl.texi' and `doc/notes.texi'. + `defs.in' and `defs.m4sh' are in directory `tests'. + (uninstall-hook): Don't forget to uninstall libtoolize's libltdl + source tree. + * bootstrap: Simplified dirty makefile management, and bootstrap + file creation in light of having only a single pertinent + Makefile. + * configure.ac (CONF_SUBDIRS): Add tests/ prefix to each subdir to + compensate. + (DIST_MAKEFILE_LIST): Adjust. + (AC_CONFIG_FILES): Remove doc/Makefile and tests/Makefile. + * tests/defs.m4sh (LIBTOOL, scripts): Adjust paths. + * tests/cdemo-conf.test, tests/cdemo-exec.test, + tests/cdemo-make.test, tests/cdemo-shared.test, + tests/cdemo-static.test, tests/cdemo-undef.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/objectlist.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/tagdemo-undef.test, tests/tagtrace.test (func_cd, + func_require): Adjust paths.. + 2005-04-12 Ralf Wildenhues * config/general.m4sh, libtool.m4 (_LT_SETUP), tests/defs.m4sh, @@ -5,14 +61,17 @@ 2005-04-07 Ralf Wildenhues - Improved Portland support: prelinking of C++ templates and whole_archive. + Improved Portland support: prelinking of C++ templates and + whole_archive. * m4/libtool.m4 (_LT_COMPILER_PIC, _LT_LINKER_SHLIBS) [ linux ]: Reinstate formatted whole_archive_flag_spec for PGI compilers. - * config/ltmain.m4sh (func_mode_link), m4/libtool.m4 (_LT_LINKER_SHLIBS): - New tag prelink_cmds, to be executed before linking a program. + * config/ltmain.m4sh (func_mode_link), m4/libtool.m4 + (_LT_LINKER_SHLIBS): New tag prelink_cmds, to be executed before + linking a program. (_LT_LANG_CXX_CONFIG) [ linux ]: Use for pgCC. - (_LT_COMPILER_C_O): conftest might be nonempty, clean up more thoroughly. + (_LT_COMPILER_C_O): conftest might be nonempty, clean up more + thoroughly. * tests/testsuite.at (LT_AT_BOOTSTRAP): Temporary fix for testing in-tree libtoolize. @@ -29,7 +88,8 @@ * notes.texi: Platform-specific configuration notes. * doc/libtool.texi: Include as section. - * bootstrap, doc/Makefile.am: build also as notes.txt and distribute. + * bootstrap, doc/Makefile.am: build also as notes.txt and + distribute. 2005-04-04 Gary V. Vaughan diff --git a/Makefile.am b/Makefile.am index b748069cb..0a199b385 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,56 @@ ACLOCAL_AMFLAGS = -I m4 +BUILD_SUBDIRS = . libltdl +SUBDIRS = $(BUILD_SUBDIRS) +DIST_SUBDIRS = $(BUILD_SUBDIRS) +EXTRA_DIST = + + +## ---------------- ## +## Libtool scripts. ## +## ---------------- ## + +# The libtool distributor and the standalone libtool script. +bin_SCRIPTS = libtoolize libtool + +libtoolize: $(srcdir)/libtoolize.in + rm -f libtoolize.tmp libtoolize + $(timestamp); \ + input="libtoolize.m4sh"; \ + $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \ + -e 's,@nobase_pkgvdata_DATA\@,$(nobase_pkgvdata_DATA),g' \ + -e "s,@pkgvltdl_files\@,`echo $(ltdldatafiles)`,g" \ + $(srcdir)/libtoolize.in > libtoolize.tmp + chmod a+x libtoolize.tmp + chmod a-w libtoolize.tmp + mv -f libtoolize.tmp libtoolize + +# Use `$(srcdir)' for the benefit of non-GNU makes: this is +# how libtoolize.in appears in our dependencies. +EXTRA_DIST += libtoolize.m4sh +$(srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am + cd $(srcdir); \ + rm -f libtoolize.in; \ + $(M4SH) -B ./config libtoolize.m4sh > libtoolize.in + +libtool: $(top_builddir)/config.status $(srcdir)/config/ltmain.sh \ + $(srcdir)/stamp-vcl + cd $(top_builddir) && $(SHELL) ./config.status $@ + +.PHONY: configure-subdirs +configure-subdirs distdir: $(DIST_MAKEFILE_LIST) +@DIST_MAKEFILE_LIST@: + dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \ + test -d $$dir || mkdir $$dir || exit 1; \ + abs_srcdir=`cd $(srcdir) && pwd`; \ + (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1 + + +# ---------- # +# Bootstrap. # +# ---------- # + edit = sed \ -e 's,@EGREP\@,$(EGREP),g' \ -e 's,@FGREP\@,$(FGREP),g' \ @@ -45,39 +95,20 @@ edit = sed \ -e 's,@prefix\@,$(prefix),g' \ -e "s,@configure_input\@,Generated from $$input; do not edit by hand,g" -timestamp = set dummy `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; shift; \ +timestamp = set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \ case $(VERSION) in \ *[acegikmoqsuwy]) TIMESTAMP=" $$1 $$2 $$3" ;; \ *) TIMESTAMP="" ;; \ esac -BUILD_SUBDIRS = . libltdl doc tests -SUBDIRS = $(BUILD_SUBDIRS) -DIST_SUBDIRS = $(BUILD_SUBDIRS) - -sh_files = config/general.m4sh config/getopt.m4sh -EXTRA_DIST = bootstrap libtoolize.in config/ltmain.m4sh config/mkstamp \ - $(sh_files) stamp-vcl ChangeLog.1996 ChangeLog.1997 ChangeLog.1998 \ - ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 ChangeLog.2002 \ - ChangeLog.2003 -CLEANFILES = libtool libtoolize \ - libtoolize.tmp config/ltmain.tmp m4/ltversion.tmp - -## This properly belongs in tests/Makefile.am, but then we would have -## to pass $(edit) to the submake or, worse, keep two copies of $(edit) -## in synch, so instead we just build it from this Makefile.am: -.PHONY: update-package-m4 -update-package-m4: $(top_srcdir)/tests/package.m4 -$(top_srcdir)/tests/package.m4: $(top_srcdir)/configure.ac - cd $(top_srcdir); \ - { \ - echo '# Signature of the current package.'; \ - echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ - echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ - echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ - echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ - echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ - } | $(edit) > tests/package.m4 +sh_files = config/general.m4sh config/getopt.m4sh +EXTRA_DIST += bootstrap libtoolize.in config/ltmain.m4sh config/mkstamp \ + $(sh_files) stamp-vcl ChangeLog.1996 ChangeLog.1997 \ + ChangeLog.1998 ChangeLog.1999 ChangeLog.2000 ChangeLog.2001 \ + ChangeLog.2002 ChangeLog.2003 +CLEANFILES = libtool libtoolize \ + libtoolize.tmp config/ltmain.tmp m4/ltversion.tmp +DISTCLEANFILES = # These are required by libtoolize and must be executable when installed. # Since _SCRIPTS gets the program transform applied we make them @@ -90,18 +121,18 @@ nobase_dist_pkgvdata_DATA = config/config.guess config/config.sub \ nobase_pkgvdata_DATA = m4/argz.m4 m4/libtool.m4 m4/ltdl.m4 \ m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4 -## We know that $(top_srcdir)/ChangeLog has been edited if stamp-vcl -## needs updating, so we assume we have write access to $(top_srcdir). +## We know that $(srcdir)/ChangeLog has been edited if stamp-vcl +## needs updating, so we assume we have write access to $(srcdir). ## If we try to maintain ./stamp-vcl to avoid writing to a possibly -## read-only $(top_srcdir), then when the two stamp-vcls differ, distcheck +## read-only $(srcdir), then when the two stamp-vcls differ, distcheck ## will try to update the one in the read-only source tree it makes. -MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp -$(top_srcdir)/stamp-vcl: vcl-tmp clean-ltmain-sh ChangeLog +MKSTAMP = $(SHELL) $(srcdir)/config/mkstamp +$(srcdir)/stamp-vcl: vcl-tmp clean-ltmain-sh ChangeLog vcl-tmp: - @set dummy `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; shift; \ + @set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \ echo "$$1" > vcl.tmp; \ - cmp -s vcl.tmp $(top_srcdir)/stamp-vcl \ - || (echo "Updating stamp-vcl"; cp vcl.tmp $(top_srcdir)/stamp-vcl) + cmp -s vcl.tmp $(srcdir)/stamp-vcl \ + || (echo "Updating stamp-vcl"; cp vcl.tmp $(srcdir)/stamp-vcl) -@rm -f vcl.tmp ## We used to build ltmain.sh in the build tree, but now it is created @@ -109,7 +140,7 @@ vcl-tmp: ## previous builds left behind in the build tree, that would override the ## source tree version in current builds. clean-ltmain-sh: - @-test "$(top_srcdir)" = "$(top_builddir)" || \ + @-test "$(srcdir)" = "$(top_builddir)" || \ rm -f "$(top_builddir)/config/ltmain.sh" # We build ltversion.m4 here, instead of from config.status, @@ -117,12 +148,12 @@ clean-ltmain-sh: # dependencies change and ltversion.m4 happens to be a configure # dependency. configure and ltversion.m4 would be rebuilt in # a loop otherwise. -# Use `$(top_srcdir)/m4' for the benefit of non-GNU makes: this is +# Use `$(srcdir)/m4' for the benefit of non-GNU makes: this is # how ltversion.m4 appears in our dependencies. EXTRA_DIST += m4/ltversion.in m4/ltversion.m4 -$(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac $(top_srcdir)/stamp-vcl - set dummy `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; shift; \ - cd $(top_srcdir); \ +$(srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac $(srcdir)/stamp-vcl + set dummy `$(MKSTAMP) < $(srcdir)/ChangeLog`; shift; \ + cd $(srcdir); \ rm -f m4/ltversion.tmp; \ serial=`echo $$1 | sed 's,^1[.],,g'`; \ input="ltversion.in"; \ @@ -134,16 +165,16 @@ $(top_srcdir)/m4/ltversion.m4: m4/ltversion.in configure.ac $(top_srcdir)/stamp- ## And for similar reasons, ltmain.sh can't be built from config.status. ## !WARNING! If you edit this rule to change the contents of ltmain.sh, -## you must `touch $(top_srcdir)/config/ltmain.in' from the +## you must `touch $(srcdir)/config/ltmain.in' from the ## shell if you need ltmain.sh to be regenerated. Ideally, we ## should make this rule depend on Makefile but that will break ## distcheck (at least) by rebuilding ltmain.sh in the source ## tree whenever config.status regenerates the Makefile. EXTRA_DIST += config/ltmain.sh -$(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \ - $(top_srcdir)/stamp-vcl +$(srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \ + $(srcdir)/stamp-vcl $(timestamp); \ - cd $(top_srcdir); \ + cd $(srcdir); \ rm -f config/ltmain.in config/ltmain.tmp config/ltmain.sh; \ $(M4SH) -B ./config config/ltmain.m4sh > config/ltmain.in; \ input="ltmain.m4sh"; \ @@ -154,63 +185,25 @@ $(top_srcdir)/config/ltmain.sh: $(sh_files) config/ltmain.m4sh configure.ac \ chmod a-w config/ltmain.tmp; \ mv -f config/ltmain.tmp config/ltmain.sh -# The libtool distributor and the standalone libtool script. -bin_SCRIPTS = libtoolize libtool -libtoolize: $(top_srcdir)/libtoolize.in - rm -f libtoolize.tmp libtoolize - $(timestamp); \ - input="libtoolize.m4sh"; \ - $(edit) -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \ - -e 's,@nobase_pkgvdata_DATA\@,$(nobase_pkgvdata_DATA),g' \ - -e "s,@pkgvltdl_files\@,`echo $(ltdldatafiles)`,g" \ - $(top_srcdir)/libtoolize.in > libtoolize.tmp - chmod a+x libtoolize.tmp - chmod a-w libtoolize.tmp - mv -f libtoolize.tmp libtoolize +## -------------- ## +## Documentation. ## +## -------------- ## -# Use `$(top_srcdir)' for the benefit of non-GNU makes: this is -# how libtoolize.in appears in our dependencies. -EXTRA_DIST += libtoolize.m4sh -$(top_srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am - cd $(top_srcdir); \ - rm -f libtoolize.in; \ - $(M4SH) -B ./config libtoolize.m4sh > libtoolize.in +info_TEXINFOS = doc/libtool.texi +libtool_TEXINFOS = doc/PLATFORMS doc/fdl.texi doc/notes.texi +EXTRA_DIST += doc/notes.txt $(libtool_TEXINFOS) -# The defs script shouldn't be recreated whenever the Makefile is -# regenerated since the source tree can be read-only. -check-recursive: tests/defs $(top_srcdir)/tests/testsuite -tests/defs: $(top_srcdir)/tests/defs.in - rm -f tests/defs.tmp tests/defs; \ - input="defs.m4sh"; \ - $(edit) $(top_srcdir)/tests/defs.in > tests/defs.tmp; \ - mv -f tests/defs.tmp tests/defs +all-local: $(srcdir)/doc/notes.txt -# Use `$(top_srcdir)/tests' for the benefit of non-GNU makes: this is -# how defs.in appears in our dependencies. -# No need to EXTRA_DIST defs.m4sh here, that is handled in tests/Makefile.am. -$(top_srcdir)/tests/defs.in: config/general.m4sh tests/defs.m4sh Makefile.am - cd $(top_srcdir); \ - rm -f tests/defs.in; \ - $(M4SH) -B ./config tests/defs.m4sh > tests/defs.in +$(srcdir)/doc/notes.txt: $(srcdir)/doc/notes.texi + cd $(srcdir)/doc && \ + $(MAKEINFO) --plaintext $(MAKEINFOFLAGS) -o notes.txt notes.texi -$(top_srcdir)/tests/testsuite: - cd tests; \ - $(MAKE) $(AM_MAKEFLAGS) testsuite -# Automake doesn't want us to generate distributed files from config.status, -# but the alternative (see libtool-1.4.3) was even uglier! -libtool: $(top_builddir)/config.status $(top_srcdir)/config/ltmain.sh \ - $(top_srcdir)/stamp-vcl - cd $(top_builddir) && $(SHELL) ./config.status $@ - -.PHONY: configure-subdirs -configure-subdirs distdir: $(DIST_MAKEFILE_LIST) -@DIST_MAKEFILE_LIST@: - dir=`echo $@ | sed 's,^[^/]*$$,.,;s,/[^/]*$$,,'`; \ - test -d $$dir || mkdir $$dir || exit 1; \ - abs_srcdir=`cd $(top_srcdir) && pwd`; \ - (cd $$dir && $$abs_srcdir/$$dir/configure) || exit 1 +## ------------- ## +## Installation. ## +## ------------- ## ## These are installed as a subdirectory of pkgdatadir so that ## libtoolize --ltdl can find them later: @@ -262,6 +255,11 @@ install-data-hook: chmod +x $(DESTDIR)$(pkgvdatadir)/config/config.sub chmod +x $(DESTDIR)$(pkgvdatadir)/config/install-sh + +## ------------- ## +## Distribution. ## +## ------------- ## + ## Make versioned links. We only run the transform on the root name; ## then we make a versioned link with the transformed base name. This ## seemed like the most reasonable approach. @@ -281,6 +279,11 @@ uninstall-hook: fv="$$f-$(APIVERSION)"; \ rm -f $(DESTDIR)$(bindir)/$$fv; \ done + @for f in $(ltdldatafiles); do \ + echo " rm -rf '$(DESTDIR)$(ltdldatadir)/$$f'"; \ + rm -f "$(DESTDIR)$(ltdldatadir)/$$f"; \ + done + ## Ship README.alpha only in alpha release, but renamed to README dist-hook: @@ -289,3 +292,182 @@ dist-hook: *[a-z]) mv $(distdir)/README.alpha $(distdir)/README ;; \ *) rm -f $(distdir)/README.alpha ;; \ esac + + +## ----------- ## +## Test suite. ## +## ----------- ## + +TESTSUITE = tests/testsuite +TESTSUITE_AT = tests/testsuite.at \ + tests/am-subdir.at \ + tests/functests.at \ + tests/inherited_flags.at \ + tests/libtoolize.at \ + tests/stresstest.at \ + tests/template.at + +EXTRA_DIST += $(TESTSUITE) $(TESTSUITE_AT) tests/package.m4 + +# Be sure to reexport important environment variables: +TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \ + CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \ + LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \ + OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" CONFIG_SHELL="$(SHELL)" \ + CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \ + F77="$(F77)" FFLAGS="$(FFLAGS)" + +check-recursive: $(srcdir)/$(TESTSUITE) + +# Use `$(srcdir)' for the benefit of non-GNU makes: this is +# how `testsuite' appears in our dependencies. +$(srcdir)/$(TESTSUITE): tests/package.m4 $(TESTSUITE_AT) + cd $(srcdir)/tests; \ + $(AUTOTEST) testsuite.at -o testsuite + +$(srcdir)/tests/package.m4: $(srcdir)/configure.ac + { \ + echo '# Signature of the current package.'; \ + echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ + echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ + echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ + echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ + echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ + } | $(edit) > $(srcdir)/tests/package.m4 + +tests/atconfig: config.status + $(SHELL) ./config.status tests/atconfig +DISTCLEANFILES += tests/atconfig + +# Hook the test suite into the check rule +check-local: tests/atconfig $(srcdir)/$(TESTSUITE) + abs_srcdir=`cd $(srcdir); pwd`; \ + cd tests; \ + $(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS) + +# Run the test suite on the *installed* tree. +installcheck-local: + abs_srcdir=`cd $(srcdir); pwd`; \ + cd tests; \ + $(TESTS_ENVIRONMENT) $(SHELL) $$abs_srcdir/$(TESTSUITE) $(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin + +# We need to remove any file droppings left behind by testsuite +clean-local: clean-local-legacy + -abs_srcdir=`cd $(srcdir); pwd`; \ + cd tests; \ + test -f $$abs_srcdir/$(TESTSUITE) && \ + $(SHELL) $$abs_srcdir/$(TESTSUITE) --clean + + +## ------------- ## +## Legacy tests. ## +## ------------- ## + +# !WARNING! Don't add any new tests here, we are migrating to an +# Autotest driven framework, please add new test cases +# using the new framework above. When the migration is +# complete this section should be removed. + +CXX_TESTS = \ + tests/tagdemo-static.test tests/tagdemo-make.test \ + tests/tagdemo-exec.test tests/tagdemo-conf.test \ + tests/tagdemo-make.test tests/tagdemo-exec.test \ + tests/tagdemo-shared.test tests/tagdemo-make.test \ + tests/tagdemo-exec.test tests/tagdemo-undef.test \ + tests/tagdemo-make.test tests/tagdemo-exec.test + +F77_TESTS = \ + tests/f77demo-static.test tests/f77demo-make.test \ + tests/f77demo-exec.test tests/f77demo-conf.test \ + tests/f77demo-make.test tests/f77demo-exec.test \ + tests/f77demo-shared.test tests/f77demo-make.test \ + tests/f77demo-exec.test + +COMMON_TESTS = \ + tests/link.test tests/link-2.test tests/nomode.test \ + tests/objectlist.test tests/quote.test tests/sh.test \ + tests/suffix.test tests/tagtrace.test \ + tests/cdemo-static.test tests/cdemo-make.test tests/cdemo-exec.test \ + tests/demo-static.test tests/demo-make.test tests/demo-exec.test \ + tests/demo-inst.test tests/demo-unst.test \ + tests/depdemo-static.test tests/depdemo-make.test \ + tests/depdemo-exec.test tests/depdemo-inst.test \ + tests/depdemo-unst.test \ + tests/mdemo-static.test tests/mdemo-make.test tests/mdemo-exec.test \ + tests/mdemo-inst.test tests/mdemo-unst.test \ + tests/cdemo-conf.test tests/cdemo-make.test tests/cdemo-exec.test \ + tests/demo-conf.test tests/demo-make.test tests/demo-exec.test \ + tests/demo-inst.test tests/demo-unst.test tests/demo-deplibs.test \ + tests/depdemo-conf.test tests/depdemo-make.test \ + tests/depdemo-exec.test tests/depdemo-inst.test \ + tests/depdemo-unst.test \ + tests/mdemo-conf.test tests/mdemo-make.test tests/mdemo-exec.test \ + tests/mdemo-inst.test tests/mdemo-unst.test tests/mdemo-dryrun.test \ + tests/mdemo2-conf.test tests/mdemo2-make.test tests/mdemo2-exec.test \ + tests/pdemo-conf.test tests/pdemo-make.test tests/pdemo-exec.test \ + tests/pdemo-inst.test \ + tests/demo-nofast.test tests/demo-make.test tests/demo-exec.test \ + tests/demo-inst.test tests/demo-unst.test \ + tests/depdemo-nofast.test tests/depdemo-make.test \ + tests/depdemo-exec.test tests/depdemo-inst.test \ + tests/depdemo-unst.test \ + tests/demo-pic.test tests/demo-make.test tests/demo-exec.test \ + tests/demo-nopic.test tests/demo-make.test tests/demo-exec.test \ + tests/cdemo-shared.test tests/cdemo-make.test tests/cdemo-exec.test \ + tests/demo-shared.test tests/demo-make.test tests/demo-exec.test \ + tests/demo-inst.test tests/demo-hardcode.test tests/demo-relink.test \ + tests/demo-noinst-link.test tests/demo-unst.test \ + tests/depdemo-shared.test tests/depdemo-make.test \ + tests/depdemo-exec.test tests/depdemo-inst.test \ + tests/depdemo-relink.test tests/depdemo-unst.test \ + tests/mdemo-shared.test tests/mdemo-make.test tests/mdemo-exec.test \ + tests/mdemo-inst.test tests/mdemo-unst.test \ + tests/cdemo-undef.test tests/cdemo-make.test tests/cdemo-exec.test + +if HAVE_CXX +if HAVE_F77 +TESTS = $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS) +else +TESTS = $(COMMON_TESTS) $(CXX_TESTS) +endif +else +if HAVE_F77 +TESTS = $(COMMON_TESTS) $(F77_TESTS) +else +TESTS = $(COMMON_TESTS) +endif +endif + +tests/demo-conf.test: libtool + +EXTRA_DIST += tests/defs.in tests/defs.m4sh \ + $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS) +DIST_SUBDIRS += $(CONF_SUBDIRS) + +# 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: $(srcdir)/tests/defs.in + rm -f tests/defs.tmp tests/defs; \ + input="defs.m4sh"; \ + $(edit) $(srcdir)/tests/defs.in > tests/defs.tmp; \ + mv -f tests/defs.tmp tests/defs + +# Use `$(srcdir)/tests' for the benefit of non-GNU makes: this is +# how defs.in appears in our dependencies. +$(srcdir)/tests/defs.in: config/general.m4sh tests/defs.m4sh Makefile.am + cd $(srcdir); \ + rm -f tests/defs.in; \ + $(M4SH) -B ./config tests/defs.m4sh > tests/defs.in + +# We need to remove any files that the above tests created. +clean-local-legacy: + -cd tests; \ + for dir in cdemo demo depdemo f77demo mdemo mdemo2 pdemo tagdemo; \ + do \ + test -f $$dir/Makefile && ( cd $$dir && $(MAKE) distclean; ); \ + done + rm -rf _inst + +$(TESTS): tests/defs +DISTCLEANFILES += tests/defs diff --git a/bootstrap b/bootstrap index ae58fb292..089fd13c3 100755 --- a/bootstrap +++ b/bootstrap @@ -62,15 +62,9 @@ fi set dummy `$SED '/AC_INIT/{s/[][,()]/ /g; p;};d' configure.ac` shift -# Whip up some dirty Makefiles: -makefiles= -for dirty in ./Makefile ./tests/Makefile ./doc/Makefile -do - test -f $dirty || { - makefiles="$makefiles $dirty" - $SED '/^if /,/^endif$/d;/^else$/,/^endif$/d' $dirty.am > $dirty - } -done +# Whip up a dirty Makefile: +test -f Makefile \ + || $SED '/^if /,/^endif$/d;/^else$/,/^endif$/d' Makefile.am > Makefile # Building distributed files from configure is bad for automake, so we # generate them here, and have Makefile rules to keep them up to date. @@ -79,28 +73,17 @@ done # configure, and ltversion.m4 to generate configure in the first place: rm -f ./config/ltmain.sh ./m4/ltversion.m4 - -$MAKE ./config/ltmain.sh ./m4/ltversion.m4 ./libtoolize.in ./tests/defs.in \ +$MAKE ./config/ltmain.sh ./doc/notes.txt ./m4/ltversion.m4 ./libtoolize.in \ + ./tests/defs.in ./tests/package.m4 ./tests/testsuite \ srcdir=. top_srcdir=. PACKAGE="$2" VERSION="$3" \ - M4SH="$AUTOM4TE --language=m4sh" - -{ - $MAKE update-package-m4 srcdir=. top_srcdir=. \ - PACKAGE="$2" VERSION="$3" PACKAGE_BUGREPORT="bug-$2@gnu.org" - cd tests - $MAKE ./testsuite AUTOTEST="$AUTOM4TE --language=autotest" \ - srcdir=. top_srcdir=.. PACKAGE="$2" VERSION="$3" - cd .. - cd doc - $MAKE notes.txt srcdir=. top_srcdir=.. MAKEINFO="${MAKEINFO}" - cd .. -} + PACKAGE_BUGREPORT="bug-$2@gnu.org" M4SH="$AUTOM4TE --language=m4sh" \ + AUTOTEST="$AUTOM4TE --language=autotest" MAKEINFO="$MAKEINFO" test -f clcommit.m4sh && $MAKE -f Makefile.maint commit \ top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="$AUTOM4TE -l m4sh" \ - SED="$SED" GREP="$GREP" FGREP="$FGREP" EGREP="${EGREP}" LN_S="$LN_S" + SED="$SED" GREP="$GREP" FGREP="$FGREP" EGREP="$EGREP" LN_S="$LN_S" -test -z "$makefiles" || rm -f $makefiles +rm -f Makefile # Make a dummy libtoolize script for autoreconf: test -f clcommit.m4sh && cat > ./config/libtoolize <<'EOF' diff --git a/configure.ac b/configure.ac index 292fdac8e..26af26252 100644 --- a/configure.ac +++ b/configure.ac @@ -144,14 +144,14 @@ if test x"${enable_ltdl_install+set}" != xset; then fi # All subdirectories that are configured on demand, but that must be -# included in the distribution. This substitution is for tests/Makefile.am, -# so the directory names are relative to that directory. -CONF_SUBDIRS="cdemo demo depdemo f77demo mdemo mdemo2 pdemo tagdemo" +# included in the distribution. +CONF_SUBDIRS="tests/cdemo tests/demo tests/depdemo tests/f77demo tests/mdemo \ + tests/mdemo2 tests/pdemo tests/tagdemo" AC_SUBST([CONF_SUBDIRS]) DIST_MAKEFILE_LIST= for dir in $CONF_SUBDIRS; do - DIST_MAKEFILE_LIST="${DIST_MAKEFILE_LIST}tests/$dir/Makefile " + DIST_MAKEFILE_LIST="${DIST_MAKEFILE_LIST}$dir/Makefile " done AC_SUBST([DIST_MAKEFILE_LIST]) @@ -208,5 +208,5 @@ AM_CONDITIONAL(HAVE_RC, [test -n "[$]_LT_TAGVAR(compiler, RC)"]) ## -------- ## ## Outputs. ## ## -------- ## -AC_CONFIG_FILES([Makefile libltdl/Makefile doc/Makefile tests/Makefile]) +AC_CONFIG_FILES([Makefile libltdl/Makefile]) AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 1668a2096..000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## Process this file with automake to produce Makefile.in - -info_TEXINFOS = libtool.texi -libtool_TEXINFOS = PLATFORMS fdl.texi notes.texi -EXTRA_DIST = notes.txt - -all-local: notes.txt - -notes.txt: notes.texi - cd $(srcdir) && $(MAKEINFO) --plaintext $(MAKEINFOFLAGS) -o $@ notes.texi diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 55a255cca..000000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,163 +0,0 @@ -## Makefile.am -- Process this file with automake to produce Makefile.in -## -## Copyright (C) 2003, 2004, 2005 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. - -## ------------ ## -## Test suite. ## -## ------------ ## - -TESTSUITE = testsuite -TESTSUITE_AT = testsuite.at \ - am-subdir.at \ - functests.at \ - inherited_flags.at \ - libtoolize.at \ - stresstest.at \ - template.at - -EXTRA_DIST = $(TESTSUITE) $(TESTSUITE_AT) package.m4 - -# Be sure to reexport important environment variables: -TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \ - CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" LD="$(LD)" LDFLAGS="$(LDFLAGS)" \ - LIBS="$(LIBS)" LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \ - OBJEXT="$(OBJEXT)" EXEEXT="$(EXEEXT)" CONFIG_SHELL="$(SHELL)" \ - CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" CXXCPP="$(CXXCPP)" \ - F77="$(F77)" FFLAGS="$(FFLAGS)" - -# ../Makefile knows how to rebuild this file: -$(srcdir)/package.m4: - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) update-package-m4 - -$(srcdir)/$(TESTSUITE): $(srcdir)/package.m4 $(TESTSUITE_AT) - cd $(srcdir); \ - $(AUTOTEST) testsuite.at -o $(TESTSUITE) - -atconfig: $(top_builddir)/config.status - cd $(top_builddir); \ - ./config.status tests/atconfig - -# Hook the test suite into the check rule -check-local: atconfig $(srcdir)/$(TESTSUITE) - $(TESTS_ENVIRONMENT) $(SHELL) $(srcdir)/$(TESTSUITE) $(TESTSUITE_FLAGS) - -# Run the test suite on the *installed* tree. -installcheck-local: - $(TESTS_ENVIRONMENT) $(SHELL) $(srcdir)/$(TESTSUITE) $(TESTSUITE_FLAGS) AUTOTEST_PATH=$(exec_prefix)/bin - -# We need to remove any file droppings left behind by testsuite -clean-local: clean-local-legacy - -test -f $(srcdir)/$(TESTSUITE) && \ - $(SHELL) $(srcdir)/$(TESTSUITE) --clean - -DISTCLEANFILES = atconfig - -## ------------- ## -## Legacy tests. ## -## ------------- ## - -# !WARNING! Don't add any new tests here, we are migrating to an -# Autotest driven framework, please add new test cases -# using the new framework above. When the migration is -# complete this section should be removed. - -CXX_TESTS = \ - tagdemo-static.test tagdemo-make.test tagdemo-exec.test \ - tagdemo-conf.test tagdemo-make.test tagdemo-exec.test \ - tagdemo-shared.test tagdemo-make.test tagdemo-exec.test \ - tagdemo-undef.test tagdemo-make.test tagdemo-exec.test - -F77_TESTS = \ - f77demo-static.test f77demo-make.test f77demo-exec.test \ - f77demo-conf.test f77demo-make.test f77demo-exec.test \ - f77demo-shared.test f77demo-make.test f77demo-exec.test - -COMMON_TESTS = \ - link.test link-2.test nomode.test objectlist.test \ - quote.test sh.test suffix.test tagtrace.test \ - cdemo-static.test cdemo-make.test cdemo-exec.test \ - demo-static.test demo-make.test demo-exec.test \ - demo-inst.test demo-unst.test \ - depdemo-static.test depdemo-make.test depdemo-exec.test \ - depdemo-inst.test depdemo-unst.test \ - mdemo-static.test mdemo-make.test mdemo-exec.test \ - mdemo-inst.test mdemo-unst.test \ - cdemo-conf.test cdemo-make.test cdemo-exec.test \ - demo-conf.test demo-make.test demo-exec.test \ - demo-inst.test demo-unst.test demo-deplibs.test \ - depdemo-conf.test depdemo-make.test depdemo-exec.test \ - depdemo-inst.test depdemo-unst.test \ - mdemo-conf.test mdemo-make.test mdemo-exec.test \ - mdemo-inst.test mdemo-unst.test mdemo-dryrun.test \ - mdemo2-conf.test mdemo2-make.test mdemo2-exec.test \ - pdemo-conf.test pdemo-make.test pdemo-exec.test \ - pdemo-inst.test \ - demo-nofast.test demo-make.test demo-exec.test \ - demo-inst.test demo-unst.test \ - depdemo-nofast.test depdemo-make.test depdemo-exec.test \ - depdemo-inst.test depdemo-unst.test \ - demo-pic.test demo-make.test demo-exec.test \ - demo-nopic.test demo-make.test demo-exec.test \ - cdemo-shared.test cdemo-make.test cdemo-exec.test \ - demo-shared.test demo-make.test demo-exec.test demo-inst.test \ - demo-hardcode.test demo-relink.test demo-noinst-link.test \ - demo-unst.test \ - depdemo-shared.test depdemo-make.test depdemo-exec.test \ - depdemo-inst.test depdemo-relink.test depdemo-unst.test \ - mdemo-shared.test mdemo-make.test mdemo-exec.test \ - mdemo-inst.test mdemo-unst.test \ - cdemo-undef.test cdemo-make.test cdemo-exec.test - -if HAVE_CXX -if HAVE_F77 -TESTS = $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS) -else -TESTS = $(COMMON_TESTS) $(CXX_TESTS) -endif -else -if HAVE_F77 -TESTS = $(COMMON_TESTS) $(F77_TESTS) -else -TESTS = $(COMMON_TESTS) -endif -endif - -demo-conf.test: $(top_builddir)/libtool - -$(top_builddir)/libtool: - cd $(top_builddir) && $(MAKE) all - -EXTRA_DIST += defs.in defs.m4sh $(COMMON_TESTS) $(CXX_TESTS) $(F77_TESTS) -DIST_SUBDIRS = $(CONF_SUBDIRS) - -# FIXME: Automake-1.7b (at least) only honours DIST_SUBDIRS if SUBDIRS is -# also set. Remove this line when that bug is fixed. -SUBDIRS = . - -# We need to remove any files that the above tests created. -clean-local-legacy: - -for dir in cdemo demo depdemo f77demo mdemo mdemo2 pdemo tagdemo; \ - do \ - test -f $$dir/Makefile && ( cd $$dir && $(MAKE) distclean; ); \ - done - rm -rf _inst - -$(TESTS): defs -defs: defs.in $(top_srcdir)/Makefile.am - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) tests/defs -DISTCLEANFILES += defs diff --git a/tests/cdemo-conf.test b/tests/cdemo-conf.test index e697aca1f..6fc0e3d68 100755 --- a/tests/cdemo-conf.test +++ b/tests/cdemo-conf.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "cdemo" +func_cd "tests/cdemo" func_make_distclean func_configure func_check_static_shared "yes" "yes" diff --git a/tests/cdemo-exec.test b/tests/cdemo-exec.test index 6b8c1cff0..bef7af810 100755 --- a/tests/cdemo-exec.test +++ b/tests/cdemo-exec.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "cdemo-make" "cdemo/cdemo$EXEEXT" +func_require "cdemo-make" "tests/cdemo/cdemo$EXEEXT" func_rmprefixdir func_exec_init "uninstalled" -func_exec "cdemo/cdemo" +func_exec "tests/cdemo/cdemo" exit $exec_status diff --git a/tests/cdemo-make.test b/tests/cdemo-make.test index f4251634d..9ffa66b74 100755 --- a/tests/cdemo-make.test +++ b/tests/cdemo-make.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "cdemo-conf" "cdemo/Makefile" +func_require "cdemo-conf" "tests/cdemo/Makefile" func_rmprefixdir -func_cd "cdemo" +func_cd "tests/cdemo" func_make exit 0 diff --git a/tests/cdemo-shared.test b/tests/cdemo-shared.test index d8094990b..f9d05b18c 100755 --- a/tests/cdemo-shared.test +++ b/tests/cdemo-shared.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "cdemo" +func_cd "tests/cdemo" func_make_distclean func_configure "--disable-static" func_check_static_shared "no" "yes" diff --git a/tests/cdemo-static.test b/tests/cdemo-static.test index 0963d5c70..4d9dacdba 100755 --- a/tests/cdemo-static.test +++ b/tests/cdemo-static.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "cdemo" +func_cd "tests/cdemo" func_make_distclean func_configure "--disable-shared" func_check_static_shared "yes" "no" diff --git a/tests/cdemo-undef.test b/tests/cdemo-undef.test index 1c6894748..2ec631f09 100755 --- a/tests/cdemo-undef.test +++ b/tests/cdemo-undef.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "cdemo" +func_cd "tests/cdemo" func_make_distclean func_configure "--disable-static" diff --git a/tests/defs.m4sh b/tests/defs.m4sh index 53d04550f..5d99b9b6b 100644 --- a/tests/defs.m4sh +++ b/tests/defs.m4sh @@ -5,7 +5,7 @@ m4_divert_push([SCRIPT])# @configure_input@ # Gord Matzigkeit , 1996 # Gary V. Vaughan , 2003 -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 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. @@ -31,7 +31,7 @@ $as_unset CDPATH m4_include([general.m4sh]) : ${AUTOCONF="autoconf"} -: ${LIBTOOL="../libtool"} +: ${LIBTOOL="./libtool"} # Sed that helps us avoid accidentally triggering echo(1) options like -n. Xsed="$SED -e 1s/^X//" @@ -178,7 +178,7 @@ func_configure () $opt_debug my_args=${1+"$@"} my_dir=`pwd | $SED "$basename"` - my_testdir="$srcdir/$my_dir" + my_testdir="$srcdir/tests/$my_dir" test -n "$my_args" && my_args=" $my_args" my_args="--srcdir="\""$my_testdir"\"" --prefix="\""$prefix"\""$my_args" @@ -322,7 +322,7 @@ func_exec () # Shared global variables for test scripts prefix="./_inst" srcdir=`cd $srcdir && pwd` -scripts="$srcdir/../config/ltmain.sh ../libtoolize" +scripts="$srcdir/config/ltmain.sh ./libtoolize" func_msg "Running $progname" diff --git a/tests/demo-conf.test b/tests/demo-conf.test index 3fadc6bf8..e619d15b5 100755 --- a/tests/demo-conf.test +++ b/tests/demo-conf.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "demo" +func_cd "tests/demo" func_make_distclean func_configure func_check_static_shared "yes" "yes" diff --git a/tests/demo-deplibs.test b/tests/demo-deplibs.test index 9987e8c5e..a129b60fc 100755 --- a/tests/demo-deplibs.test +++ b/tests/demo-deplibs.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "demo-conf" "demo/libhello.la" +func_require "demo-conf" "tests/demo/libhello.la" func_mkprefixdir -func_cd "demo" +func_cd "tests/demo" echo "linking a shared library against a static library" func_make "deplibs-check" func_exec_init "uninstalled" diff --git a/tests/demo-exec.test b/tests/demo-exec.test index 380864206..67497ed49 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, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 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,14 +21,14 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "demo-make" "demo/hell$EXEEXT" +func_require "demo-make" "tests/demo/hell$EXEEXT" func_rmprefixdir func_exec_init "uninstalled" -func_exec "demo/hell_static" 'Welcome to GNU Hell' -func_exec "demo/hell" 'Welcome to GNU Hell' -func_exec "demo/helldl" '(Welcome to .*GNU Hell|unsupported)' +func_exec "tests/demo/hell_static" 'Welcome to GNU Hell' +func_exec "tests/demo/hell" 'Welcome to GNU Hell' +func_exec "tests/demo/helldl" '(Welcome to .*GNU Hell|unsupported)' exit $exec_status diff --git a/tests/demo-hardcode.test b/tests/demo-hardcode.test index 97e9c9877..2f22a83f7 100755 --- a/tests/demo-hardcode.test +++ b/tests/demo-hardcode.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_require "demo-inst" "$prefix/lib/libhello.la" func_mkprefixdir -func_cd "demo" +func_cd "tests/demo" # Check to make sure we have a dynamic library. func_get_config "library_names" "cat ./libhello.la" diff --git a/tests/demo-inst.test b/tests/demo-inst.test index 747e1be5e..1440d0f76 100755 --- a/tests/demo-inst.test +++ b/tests/demo-inst.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "demo-make" "demo/hell$EXEEXT" +func_require "demo-make" "tests/demo/hell$EXEEXT" func_mkprefixdir -func_cd "demo" +func_cd "tests/demo" func_make "install" func_exec_init "installed" func_exec "$prefix/bin/hell_static" 'Welcome to GNU Hell' diff --git a/tests/demo-make.test b/tests/demo-make.test index e9f0eff03..3e27df395 100755 --- a/tests/demo-make.test +++ b/tests/demo-make.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "demo-conf" "demo/Makefile" +func_require "demo-conf" "tests/demo/Makefile" func_rmprefixdir -func_cd "demo" +func_cd "tests/demo" func_make exit 0 diff --git a/tests/demo-nofast.test b/tests/demo-nofast.test index b8e6232cc..d44f430a0 100755 --- a/tests/demo-nofast.test +++ b/tests/demo-nofast.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "demo" +func_cd "tests/demo" func_make_distclean func_configure "--enable-fast-install=no" diff --git a/tests/demo-noinst-link.test b/tests/demo-noinst-link.test index b809d0e8c..a10bc0ad0 100755 --- a/tests/demo-noinst-link.test +++ b/tests/demo-noinst-link.test @@ -22,7 +22,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_restore_files () { @@ -42,7 +42,7 @@ func_save_files () func_require "demo-inst" "$prefix/lib/libhello.la" func_mkprefixdir -func_cd "demo" +func_cd "tests/demo" func_save_files func_msg "removing \`libhello.la' and \`hell' from demo" diff --git a/tests/demo-nopic.test b/tests/demo-nopic.test index 63b4bf79d..a9cc26cf0 100755 --- a/tests/demo-nopic.test +++ b/tests/demo-nopic.test @@ -21,7 +21,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 case "$host" in hppa*|x86_64*|s390*) @@ -33,7 +33,7 @@ hppa*|x86_64*|s390*) esac func_rmprefixdir -func_cd "demo" +func_cd "tests/demo" func_make_distclean func_configure "--with-pic=no" diff --git a/tests/demo-pic.test b/tests/demo-pic.test index 57ad33f70..314385cef 100755 --- a/tests/demo-pic.test +++ b/tests/demo-pic.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_rmprefixdir -func_cd "demo" +func_cd "tests/demo" func_make_distclean func_configure "--with-pic=yes" diff --git a/tests/demo-relink.test b/tests/demo-relink.test index 36ecd7233..a30480692 100755 --- a/tests/demo-relink.test +++ b/tests/demo-relink.test @@ -21,7 +21,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_restore_files () { @@ -38,10 +38,10 @@ func_save_files () trap "func_restore_files" 0 1 2 13 15 } -func_require "demo-inst" "$prefix/lib/libhello.la" "demo/libhello.la" +func_require "demo-inst" "$prefix/lib/libhello.la" "tests/demo/libhello.la" func_mkprefixdir -func_cd "demo" +func_cd "tests/demo" # Check to make sure we have a dynamic library. func_get_config "library_names" "cat libhello.la" diff --git a/tests/demo-shared.test b/tests/demo-shared.test index 58e0f7ec9..9b59c266c 100755 --- a/tests/demo-shared.test +++ b/tests/demo-shared.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "demo" +func_cd "tests/demo" func_make_distclean func_configure "--disable-static" func_check_static_shared "no" "yes" diff --git a/tests/demo-static.test b/tests/demo-static.test index dc8659a86..aff158038 100755 --- a/tests/demo-static.test +++ b/tests/demo-static.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "demo" +func_cd "tests/demo" func_make_distclean func_configure "--disable-shared" func_check_static_shared "yes" "no" diff --git a/tests/demo-unst.test b/tests/demo-unst.test index 61ee0e068..fe1307aa2 100755 --- a/tests/demo-unst.test +++ b/tests/demo-unst.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "demo-inst" "$prefix/bin/hell$EXEEXT" "demo/Makefile" +func_require "demo-inst" "$prefix/bin/hell$EXEEXT" "tests/demo/Makefile" func_mkprefixdir -func_cd "demo" +func_cd "tests/demo" func_make_uninstall exit 0 diff --git a/tests/depdemo-conf.test b/tests/depdemo-conf.test index 400dbc683..2e8f7692a 100755 --- a/tests/depdemo-conf.test +++ b/tests/depdemo-conf.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "depdemo" +func_cd "tests/depdemo" func_make_distclean func_configure func_check_static_shared "yes" "yes" diff --git a/tests/depdemo-exec.test b/tests/depdemo-exec.test index d59925021..12f17625b 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, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 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,13 +21,13 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "depdemo-make" "depdemo/depdemo$EXEEXT" +func_require "depdemo-make" "tests/depdemo/depdemo$EXEEXT" func_rmprefixdir func_exec_init "uninstalled" -func_exec "depdemo/depdemo_static" -func_exec "depdemo/depdemo" +func_exec "tests/depdemo/depdemo_static" +func_exec "tests/depdemo/depdemo" exit $exec_status diff --git a/tests/depdemo-inst.test b/tests/depdemo-inst.test index c0d732622..e19e1fc8a 100755 --- a/tests/depdemo-inst.test +++ b/tests/depdemo-inst.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "depdemo-make" "depdemo/depdemo$EXEEXT" +func_require "depdemo-make" "tests/depdemo/depdemo$EXEEXT" func_mkprefixdir -func_cd "depdemo" +func_cd "tests/depdemo" func_make "install" func_exec_init "installed" func_exec "$prefix/bin/depdemo_static" diff --git a/tests/depdemo-make.test b/tests/depdemo-make.test index 11f7dee89..649789a3e 100755 --- a/tests/depdemo-make.test +++ b/tests/depdemo-make.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "depdemo-conf" "depdemo/Makefile" +func_require "depdemo-conf" "tests/depdemo/Makefile" func_rmprefixdir -func_cd "depdemo" +func_cd "tests/depdemo" func_make exit 0 diff --git a/tests/depdemo-nofast.test b/tests/depdemo-nofast.test index 5bdd260ea..bec0e8c73 100755 --- a/tests/depdemo-nofast.test +++ b/tests/depdemo-nofast.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "depdemo" +func_cd "tests/depdemo" func_make_distclean func_configure "--enable-fast-install=no" diff --git a/tests/depdemo-relink.test b/tests/depdemo-relink.test index 3deb13041..98ae4feac 100755 --- a/tests/depdemo-relink.test +++ b/tests/depdemo-relink.test @@ -21,7 +21,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_restore_files () { @@ -48,10 +48,10 @@ func_save_files () trap "func_restore_files" 0 1 2 13 15 } -func_require "depdemo-inst" "$prefix/lib/libl3.la" "depdemo/l3/libl3.la" +func_require "depdemo-inst" "$prefix/lib/libl3.la" "tests/depdemo/l3/libl3.la" func_mkprefixdir -func_cd "depdemo" +func_cd "tests/depdemo" # Check to make sure we have a dynamic library. func_get_config "library_names" "cat l3/libl3.la" diff --git a/tests/depdemo-shared.test b/tests/depdemo-shared.test index e643d85e8..846d7fb6a 100755 --- a/tests/depdemo-shared.test +++ b/tests/depdemo-shared.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "depdemo" +func_cd "tests/depdemo" func_make_distclean func_configure "--disable-static" func_check_static_shared "no" "yes" diff --git a/tests/depdemo-static.test b/tests/depdemo-static.test index 9c36342b4..f98395459 100755 --- a/tests/depdemo-static.test +++ b/tests/depdemo-static.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "depdemo" +func_cd "tests/depdemo" func_make_distclean func_configure "--disable-shared" func_check_static_shared "yes" "no" diff --git a/tests/depdemo-unst.test b/tests/depdemo-unst.test index 0c552dc58..5490ac3e0 100755 --- a/tests/depdemo-unst.test +++ b/tests/depdemo-unst.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "depdemo-inst" "$prefix/bin/depdemo$EXEEXT" "depdemo/Makefile" +func_require "depdemo-inst" "$prefix/bin/depdemo$EXEEXT" "tests/depdemo/Makefile" func_mkprefixdir -func_cd "depdemo" +func_cd "tests/depdemo" func_make_uninstall exit 0 diff --git a/tests/f77demo-conf.test b/tests/f77demo-conf.test index c56ae6d36..4a2d46a6b 100755 --- a/tests/f77demo-conf.test +++ b/tests/f77demo-conf.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "f77demo" +func_cd "tests/f77demo" func_make_distclean func_configure func_check_static_shared "yes" "yes" diff --git a/tests/f77demo-exec.test b/tests/f77demo-exec.test index d560c1dcc..f4952d196 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, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 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,13 +21,13 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "f77demo-make" "f77demo/fprogram$EXEEXT" "f77demo/cprogram$EXEEXT" +func_require "f77demo-make" "tests/f77demo/fprogram$EXEEXT" "tests/f77demo/cprogram$EXEEXT" func_rmprefixdir func_exec_init "uninstalled" -func_exec "f77demo/fprogram" -func_exec "f77demo/cprogram" +func_exec "tests/f77demo/fprogram" +func_exec "tests/f77demo/cprogram" exit $exec_status diff --git a/tests/f77demo-make.test b/tests/f77demo-make.test index 24e7b1689..ca5574f77 100755 --- a/tests/f77demo-make.test +++ b/tests/f77demo-make.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "f77demo-conf" "f77demo/Makefile" +func_require "f77demo-conf" "tests/f77demo/Makefile" func_rmprefixdir -func_cd "f77demo" +func_cd "tests/f77demo" # May fail make on some platforms, simply "skip" in that case #func_make eval $MAKE || func_skip "The improved fortran tests catch a known failure mode" diff --git a/tests/f77demo-shared.test b/tests/f77demo-shared.test index cdf248502..7a20929e8 100755 --- a/tests/f77demo-shared.test +++ b/tests/f77demo-shared.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "f77demo" +func_cd "tests/f77demo" func_make_distclean func_configure "--disable-static" func_check_static_shared "no" "yes" diff --git a/tests/f77demo-static.test b/tests/f77demo-static.test index 9b7ef332b..636e6da13 100755 --- a/tests/f77demo-static.test +++ b/tests/f77demo-static.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "f77demo" +func_cd "tests/f77demo" func_make_distclean func_configure "--disable-shared" func_check_static_shared "yes" "no" diff --git a/tests/link-2.test b/tests/link-2.test index 9595907f3..22534ce0d 100755 --- a/tests/link-2.test +++ b/tests/link-2.test @@ -21,7 +21,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 rm -f hell.lo cat > hell.lo <&1 | grep '^Usage:' >/dev/null; then : diff --git a/tests/objectlist.test b/tests/objectlist.test index 9b471a885..662ec29ec 100755 --- a/tests/objectlist.test +++ b/tests/objectlist.test @@ -22,7 +22,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 # Try a sample link command. linkresult=`$LIBTOOL -n --mode=link $CC -objectlist nonexistant 2>&1` diff --git a/tests/pdemo-conf.test b/tests/pdemo-conf.test index 5089e4d11..56355ef51 100755 --- a/tests/pdemo-conf.test +++ b/tests/pdemo-conf.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "pdemo" +func_cd "tests/pdemo" func_make_distclean func_configure func_check_static_shared "yes" "yes" diff --git a/tests/pdemo-exec.test b/tests/pdemo-exec.test index d7c8f5814..f641e77b0 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, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 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,14 +21,14 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "pdemo-make" "pdemo/hell$EXEEXT" +func_require "pdemo-make" "tests/pdemo/hell$EXEEXT" func_rmprefixdir func_exec_init "uninstalled" -func_exec "pdemo/hell_static" 'Welcome to GNU Hell' -func_exec "pdemo/hell" 'Welcome to GNU Hell' -func_exec "pdemo/helldl" '(Welcome to .*GNU Hell|unsupported)' +func_exec "tests/pdemo/hell_static" 'Welcome to GNU Hell' +func_exec "tests/pdemo/hell" 'Welcome to GNU Hell' +func_exec "tests/pdemo/helldl" '(Welcome to .*GNU Hell|unsupported)' exit $exec_status diff --git a/tests/pdemo-inst.test b/tests/pdemo-inst.test index b54acf563..fa97204e0 100755 --- a/tests/pdemo-inst.test +++ b/tests/pdemo-inst.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "pdemo-make" "pdemo/hell$EXEEXT" +func_require "pdemo-make" "tests/pdemo/hell$EXEEXT" func_mkprefixdir -func_cd "pdemo" +func_cd "tests/pdemo" func_make "install" func_exec_init "installed" func_exec "$prefix/bin/hell_static" 'Welcome to GNU Hell' diff --git a/tests/pdemo-make.test b/tests/pdemo-make.test index caa826af6..5ff1f2554 100755 --- a/tests/pdemo-make.test +++ b/tests/pdemo-make.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "pdemo-conf" "pdemo/Makefile" +func_require "pdemo-conf" "tests/pdemo/Makefile" func_rmprefixdir -func_cd "pdemo" +func_cd "tests/pdemo" func_make exit 0 diff --git a/tests/quote.test b/tests/quote.test index 7663eb0c2..fb40ea9fb 100755 --- a/tests/quote.test +++ b/tests/quote.test @@ -1,7 +1,7 @@ #! /bin/sh # quote.test - make sure that shell metacharacters do not blow up libtool -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 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,7 +21,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 # Do the torture test. status=$EXIT_SUCCESS @@ -30,13 +30,13 @@ case $1 in --no-reexec) ;; *) - func_get_config "SHELL" "../libtool --config" + func_get_config "SHELL" "$LIBTOOL --config" exec $SHELL "$0" --no-reexec ${1+"$@"} ;; esac -func_get_config "ECHO" "../libtool --config" -func_get_config "wl" "../libtool --config" +func_get_config "ECHO" "$LIBTOOL --config" +func_get_config "wl" "$LIBTOOL --config" for mode in compile link install; do $ECHO "== $mode mode" diff --git a/tests/sh.test b/tests/sh.test index f8c9b7de6..2f457372a 100755 --- a/tests/sh.test +++ b/tests/sh.test @@ -1,7 +1,7 @@ #! /bin/sh # sh.test - check that we haven't forgotten a `test' command -# Copyright (C) 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 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,7 +21,7 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 # Check all the "portable" shell scripts. status=$EXIT_SUCCESS @@ -105,7 +105,7 @@ func_foo () fi done -for s in "$srcdir/../m4/libtool.m4" +for s in "$srcdir/m4/libtool.m4" do if $SED -n '/case \$cc_basename in/,/esac/ { /^[ ]*[a-zA-Z][a-zA-Z0-9+]*[^*][ ]*)/p diff --git a/tests/suffix.test b/tests/suffix.test index 0f91fef9f..1768086ec 100755 --- a/tests/suffix.test +++ b/tests/suffix.test @@ -26,7 +26,7 @@ extensions="C F S ada adb ads asm c c++ cc cpp cxx f f90 for m s" bad_names="foo." -. ./defs || exit 1 +. tests/defs || exit 1 status=$EXIT_SUCCESS for ext in $extensions; do diff --git a/tests/tagdemo-conf.test b/tests/tagdemo-conf.test index 08ab2b8d6..7bb359bff 100755 --- a/tests/tagdemo-conf.test +++ b/tests/tagdemo-conf.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "tagdemo" +func_cd "tests/tagdemo" func_make_distclean func_configure func_check_static_shared "yes" "yes" diff --git a/tests/tagdemo-exec.test b/tests/tagdemo-exec.test index 21d107f83..f7d617175 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, 2004 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005 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,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "tagdemo-make" "tagdemo/tagdemo$EXEEXT" +func_require "tagdemo-make" "tests/tagdemo/tagdemo$EXEEXT" func_rmprefixdir func_exec_init "uninstalled" -func_exec "tagdemo/tagdemo" +func_exec "tests/tagdemo/tagdemo" exit $exec_status diff --git a/tests/tagdemo-make.test b/tests/tagdemo-make.test index 19d35b646..eb16f0eb2 100755 --- a/tests/tagdemo-make.test +++ b/tests/tagdemo-make.test @@ -21,12 +21,12 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -func_require "tagdemo-conf" "tagdemo/Makefile" +func_require "tagdemo-conf" "tests/tagdemo/Makefile" func_rmprefixdir -func_cd "tagdemo" +func_cd "tests/tagdemo" func_make exit 0 diff --git a/tests/tagdemo-shared.test b/tests/tagdemo-shared.test index 41eedb240..599af246c 100755 --- a/tests/tagdemo-shared.test +++ b/tests/tagdemo-shared.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "tagdemo" +func_cd "tests/tagdemo" func_make_distclean func_configure "--disable-static" func_check_static_shared "no" "yes" diff --git a/tests/tagdemo-static.test b/tests/tagdemo-static.test index a1aa2231a..cb1d169da 100755 --- a/tests/tagdemo-static.test +++ b/tests/tagdemo-static.test @@ -21,10 +21,10 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "tagdemo" +func_cd "tests/tagdemo" func_make_distclean func_configure "--disable-shared" func_check_static_shared "yes" "no" diff --git a/tests/tagdemo-undef.test b/tests/tagdemo-undef.test index e9bea8746..f1cac2734 100755 --- a/tests/tagdemo-undef.test +++ b/tests/tagdemo-undef.test @@ -21,11 +21,11 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 func_mkprefixdir -func_cd "tagdemo" +func_cd "tests/tagdemo" func_make_distclean func_configure "--disable-static" diff --git a/tests/tagtrace.test b/tests/tagtrace.test index 7c4195f82..738bfa1c0 100755 --- a/tests/tagtrace.test +++ b/tests/tagtrace.test @@ -1,7 +1,7 @@ #! /bin/sh # tagtrace.test - check the LT_SUPPORTED_TAGS interface -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005 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,9 +21,9 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA. -. ./defs || exit 1 +. tests/defs || exit 1 -: ${fnord=$srcdir/../fnord$$} +: ${fnord=$srcdir/fnord$$} "$AUTOCONF" --version > /dev/null 2>&1 || func_skip "This test requires GNU Autoconf" if touch $fnord; then @@ -36,7 +36,7 @@ fi set -e # Retrieve the list of tags supported by our main libtool script. -traced_tags=`cd "$srcdir/.." && "$AUTOCONF" --trace 'LT_SUPPORTED_TAG:$1'` +traced_tags=`cd "$srcdir" && "$AUTOCONF" --trace 'LT_SUPPORTED_TAG:$1'` test -n "$traced_tags"