[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
HEAD: cross-compile test new testsuite
From: |
Ralf Wildenhues |
Subject: |
HEAD: cross-compile test new testsuite |
Date: |
Mon, 26 Sep 2005 21:18:08 +0200 |
User-agent: |
Mutt/1.5.9i |
This gets the new test suite from several failures to no failures (but
of course a number of skips) for a gnu-linux -> mingw cross-compile.
(The old test suite also show a couple of recent regressions, sigh;
more about that in another mail.)
OK to apply to HEAD?
Cheers,
Ralf
* tests/testsuite.at (PREPARE_TESTS): Extract host_alias.
Set configure_options appropriately.
(LT_AT_CONFIGURE): New macro.
(LT_AT_BOOTSTRAP): Use it.
* tests/early-libtool.at, tests/standalone.at: Likewise.
Index: tests/testsuite.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/testsuite.at,v
retrieving revision 1.19
diff -u -r1.19 testsuite.at
--- tests/testsuite.at 16 Sep 2005 08:33:24 -0000 1.19
+++ tests/testsuite.at 26 Sep 2005 13:13:53 -0000
@@ -25,9 +25,14 @@
: ${AUTOCONF=autoconf}
export LIBTOOLIZE LIBTOOL ACLOCAL AUTOCONF
eval `$LIBTOOL --config | grep ^EGREP=`
-eval `$LIBTOOL --config | $EGREP '^(host|host_os|build)='`
+eval `$LIBTOOL --config | $EGREP '^(host|host_os|host_alias|build)='`
+configure_options=
+if test -n "$host_alias"; then
+ configure_options="--host $host_alias"
+fi
m4_divert_pop([PREPARE_TESTS])dnl
+
# LT_AT_LIBTOOLIZE([ARGS])
# ------------------------
m4_define([LT_AT_LIBTOOLIZE],
@@ -43,6 +48,13 @@
])
+# LT_AT_CONFIGURE([OPTIONS])
+# --------------------------
+m4_define([LT_AT_CONFIGURE],
+[./configure $configure_options $1 || exit 1
+])
+
+
# LT_AT_BOOTSTRAP
# ---------------
m4_define([LT_AT_BOOTSTRAP],
@@ -50,7 +63,7 @@
test -f ./ltmain.sh || LT_AT_LIBTOOLIZE([--copy])
test -f ./configure || _lt_pkgdatadir="$abs_top_srcdir" autoreconf --force
--verbose --install || exit 1
test -f ./configure || exit 1
-./configure
+LT_AT_CONFIGURE
])
Index: tests/early-libtool.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/early-libtool.at,v
retrieving revision 1.4
diff -u -r1.4 early-libtool.at
--- tests/early-libtool.at 8 Sep 2005 07:17:58 -0000 1.4
+++ tests/early-libtool.at 26 Sep 2005 13:13:53 -0000
@@ -104,7 +104,7 @@
test -f ltmain.sh || LT_AT_LIBTOOLIZE([--copy --verbose --install])
test -f aclocal.m4 || $ACLOCAL -I m4 || exit 1
test -f configure || $AUTOCONF --force || exit 1
-test -f Makefile || ./configure || exit 1
+test -f Makefile || LT_AT_CONFIGURE
${MAKE-make}
LT_AT_EXEC_CHECK([./hell], [0], [expout])
@@ -207,7 +207,7 @@
test -f ltmain.sh || LT_AT_LIBTOOLIZE([--copy --verbose --install])
test -f aclocal.m4 || $ACLOCAL -I m4 || exit 1
test -f configure || $AUTOCONF --force || exit 1
-test -f Makefile || ./configure || exit 1
+test -f Makefile || LT_AT_CONFIGURE
${MAKE-make}
LT_AT_EXEC_CHECK([./hell], [0], [expout])
Index: tests/standalone.at
===================================================================
RCS file: /cvsroot/libtool/libtool/tests/standalone.at,v
retrieving revision 1.3
diff -u -r1.3 standalone.at
--- tests/standalone.at 26 Aug 2005 10:00:18 -0000 1.3
+++ tests/standalone.at 26 Sep 2005 13:13:53 -0000
@@ -26,7 +26,7 @@
AT_SETUP([compiling softlinked libltdl])
LT_AT_LIBTOOLIZE([--ltdl=.])
-./configure
+LT_AT_CONFIGURE
${MAKE-make}
AT_CHECK([test -f libltdlc.la])
@@ -41,7 +41,7 @@
AT_SETUP([compiling copied libltdl])
LT_AT_LIBTOOLIZE([--copy --ltdl=.])
-./configure
+LT_AT_CONFIGURE
${MAKE-make}
AT_CHECK([test -f libltdlc.la])
@@ -58,7 +58,7 @@
prefix=`pwd`/_inst
LT_AT_LIBTOOLIZE([--copy --ltdl=.])
-./configure --enable-ltdl-install --prefix=$prefix
+LT_AT_CONFIGURE([--enable-ltdl-install --prefix=$prefix])
${MAKE-make} all install
AT_CHECK([test -f $prefix/lib/libltdl.la])
@@ -135,7 +135,7 @@
all: $(TARGETS)
$(LIBTOOL) libltdl/libltdlc.la:
- cd libltdl && ./configure && $(MAKE)
+ cd libltdl && ./configure $(CONFIGURE_OPTIONS) && $(MAKE)
ltdldemo$(EXEEXT): $(LIBTOOL) module.la libltdl/libltdlc.la main.lo
$(LTLINK) -o ltdldemo main.lo -dlopen module.la ./libltdl/libltdlc.la
@@ -152,7 +152,8 @@
LT_AT_LIBTOOLIZE([--copy --ltdl])
${MAKE-make} CC="$CC" LIBTOOLFLAGS="$LIBTOOLFLAGS" CPPFLAGS="$CPPFLAGS" \
- CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
+ CONFIGURE_OPTIONS="$configure_options"
LT_AT_EXEC_CHECK([./ltdldemo], 0, [ignore])
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- HEAD: cross-compile test new testsuite,
Ralf Wildenhues <=