From 4055972b1cb63285ddf43652205a5e4bf36eb12e Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 7 Aug 2010 13:03:37 +0200 Subject: [PATCH] Allow running pic_flag test with different shell. * tests/testsuite.at (LT_AT_CONFIGURE): Accept optional second argument specifying the configure script to run. * tests/pic_flag.at (override pic_flag at configure time): Use LT_AT_CONFIGURE. Signed-off-by: Ralf Wildenhues --- ChangeLog | 6 ++++++ tests/pic_flag.at | 5 +++-- tests/testsuite.at | 8 +++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f6cb6524..4f2d217f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-08-07 Ralf Wildenhues + Allow running pic_flag test with different shell. + * tests/testsuite.at (LT_AT_CONFIGURE): Accept optional second + argument specifying the configure script to run. + * tests/pic_flag.at (override pic_flag at configure time): + Use LT_AT_CONFIGURE. + Ensure not to reverse preserving of --debug for relinking/finish. * libltdl/config/ltmain.m4sh (func_check_version_match): Only preserve '--debug' switch if $opt_debug is not equal to ':'. diff --git a/tests/pic_flag.at b/tests/pic_flag.at index e62e1b7a5..c045ed410 100644 --- a/tests/pic_flag.at +++ b/tests/pic_flag.at @@ -43,8 +43,9 @@ if $CXX $CPPFLAGS $CXXFLAGS $CXX_pic_flag -c foo.cpp; then :; else CXX_pic_flag= fi -AT_CHECK(["$abs_top_srcdir"/configure lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl - [lt_cv_prog_compiler_pic_CXX="$CXX_pic_flag"], [], [ignore], [ignore]) +LT_AT_CONFIGURE([lt_cv_prog_compiler_pic="$C_pic_flag" ]dnl + [lt_cv_prog_compiler_pic_CXX="$CXX_pic_flag"], + ["$abs_top_srcdir"/configure]) : ${MAKE=make} AT_CHECK([$MAKE], [], [stdout], [ignore]) AT_CHECK([if ./libtool --features | grep 'enable shared libraries'; then ]dnl diff --git a/tests/testsuite.at b/tests/testsuite.at index 393596269..35b920bdb 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -146,11 +146,13 @@ AT_KEYWORDS([autoconf automake]) ]) -# LT_AT_CONFIGURE([OPTIONS]) -# -------------------------- +# LT_AT_CONFIGURE([OPTIONS], [CONFIGURE-SCRIPT]) +# ---------------------------------------------- +# Configure CONFIGURE-SCRIPT, defaulting to ./configure, with +# additional OPTIONS. m4_define([LT_AT_CONFIGURE], [AT_CHECK([: ${CONFIG_SHELL=/bin/sh}; export CONFIG_SHELL; ]dnl - [$CONFIG_SHELL ./configure $configure_options $1], + [$CONFIG_SHELL m4_default([$2], [./configure]) $configure_options $1], [0], [ignore], [ignore]) ]) -- 2.47.2