OK to apply this bunch of testsuite trivia (as one patch maybe)?
Rationale, where applicable (and one question):
- tst_aclocaldir is used in addition to _lt_pkgdatadir, so we don't
interfere with the setting for the libtoolize script.
- The use of AC_LIBTOOL_DLOPEN is a workaround: without it, the tests
fail on AIX (tested without -brtl). Fixing that is not too important,
I guess; real-world would always use it.
- The AIX linker barfs upon creation of a module without any exported
symbols. Not very likely to happen in real-life. :)
- I needed an AT_TESTED emulation that does not fail. This one XFAILs
for the autotools used, rather than SKIPs -- should I change that?
With this in place, and the aforementioned lt~obsolete.m4 workaround in
place, for the automake-1.7 installed on an AIX system, and no -brtl, I
get one failure (test 12; due to broken gcj installation) and three
skips (subproject tests, due to newer automake needed). No changes in
the old testsuite (mdemo-exec failures for non-brtl but not for brtl).
There are probably more bits coming later..
Cheers,
Ralf
* tests/deplibs-ident.at [ aix ]: No unexpected failure here.
* Makefile.am (BUILDCHECK_ENVIRONMENT, INSTALLCHECK_ENVIRONMENT)
Pass tst_aclocaldir for installcheck.
* tests/libtoolize.at: Use it.
* tests/libtoolize.at: Fix for distcheck (readonly sources).
* tests/nonrecursive.at: Set foo_la_SOURCES, for automake-1.7.
* tests/nonrecursive.at, tests/recursive.at, tests/subproject.at
(foo.c): Actually export a symbol, for AIX.
* tests/old-m4-iface.at: Use AC_LIBTOOL_DLOPEN, for AIX.
* tests/subproject.at: Require automake-1.9, we use indirect
subdirs.
* tests/testsuite.at (LT_AT_AUTOMAKE): Skip if we detect failure
due to old version.
(PREPARE_TESTS): Set autotool variables to `no' if not present.
(LT_AT_ACLOCAL, LT_AT_AUTOCONF, LT_AT_AUTOMAKE)
(LT_AT_AUTOHEADER, LT_AT_AUTORECONF): Use to XFAIL tests.
Reported by Tim Rice [EMAIL PROTECTED].
(LT_AT_MAKE): Do not use `make -e'.
(_LTDL_PROJECT_FILES): Adjust sub-make call.
Reported by Charles Wilson [EMAIL PROTECTED].
Index: tests/deplibs-ident.at
===
RCS file: /cvsroot/libtool/libtool/tests/deplibs-ident.at,v
retrieving revision 1.1
diff -u -r1.1 deplibs-ident.at
--- tests/deplibs-ident.at 30 Sep 2005 16:00:23 - 1.1
+++ tests/deplibs-ident.at 8 Nov 2005 22:03:48 -
@@ -58,7 +58,8 @@
AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o b b.$OBJEXT
../liba1.la ../liba2.la ../liba3.la ../../c/libcee.la -rpath /nowhere],
[0],[stdout],[ignore])
AT_CHECK([$EGREP 'cee.*cee' stdout], 1, [ignore], [ignore])
- AT_XFAIL_IF(:) dnl This is currently broken in libtool
+ AT_XFAIL_IF([case $host_os in aix*) false;; *):;; esac])
+ dnl This is currently broken in libtool
)
AT_CLEANUP
Index: Makefile.am
===
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.177
diff -u -r1.177 Makefile.am
--- Makefile.am 7 Nov 2005 14:16:14 - 1.177
+++ Makefile.am 8 Nov 2005 22:03:43 -
@@ -387,11 +387,14 @@
FC=$(FC) FCFLAGS=$(FCFLAGS) \
GCJ=$(GCJ) GCJFLAGS=$(GCJFLAGS)
-BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir=$(abs_top_srcdir) \
+BUILDCHECK_ENVIRONMENT = \
+ _lt_pkgdatadir=$(abs_top_srcdir) \
+ tst_aclocaldir=$(abs_top_srcdir)/$(m4dir) \
LIBTOOLIZE=$(abs_top_builddir)/libtoolize \
LIBTOOL=$(abs_top_builddir)/libtool
INSTALLCHECK_ENVIRONMENT = \
+ tst_aclocaldir=$(aclocaldir) \
LIBTOOLIZE=$(bindir)/`echo libtoolize | sed
'$(program_transform_name)'` \
LIBTOOL=$(bindir)/`echo libtool | sed '$(program_transform_name)'`
Index: tests/libtoolize.at
===
RCS file: /cvsroot/libtool/libtool/tests/libtoolize.at,v
retrieving revision 1.5
diff -u -r1.5 libtoolize.at
--- tests/libtoolize.at 1 Nov 2005 14:28:20 - 1.5
+++ tests/libtoolize.at 8 Nov 2005 22:03:48 -
@@ -38,6 +38,8 @@
test -d m4 || { rm -f m4 mkdir m4; }
+rm -f m4/libtool.m4 m4/ltoptions.m4 config/ltmain.sh
+
# This file should be upgraded.
AT_DATA([m4/libtool.m4], [[
# serial 25 LT_INIT
@@ -369,10 +371,10 @@
libtoolize: putting files in AC_CONFIG_AUX_DIR, \`config'.
libtoolize: copying file \`config/ltmain.sh'
libtoolize: You should add the contents of the following files to
\`aclocal.m4':
-libtoolize: \`$_lt_pkgdatadir/libltdl/m4/libtool.m4'
-libtoolize: \`$_lt_pkgdatadir/libltdl/m4/ltoptions.m4'
-libtoolize: \`$_lt_pkgdatadir/libltdl/m4/ltversion.m4'
-libtoolize: \`$_lt_pkgdatadir/libltdl/m4/ltsugar.m4'
+libtoolize: \`$tst_aclocaldir/libtool.m4'
+libtoolize: \`$tst_aclocaldir/ltoptions.m4'
+libtoolize:
