mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-02-05 14:40:42 +08:00
libtool: Use wrapper function for AUTORECONF
Update tests to skip if required autotools are not installed for executing AUTORECONF and to have stdout saved for checks. * tests/bug_42313.at: Use LT_AT_AUTORECONF instead of AT_CHECK. * tests/testsuite.at: Save stdout for LT_AT_AUTORECONF.
This commit is contained in:
parent
ad4b513fca
commit
6b119a1c79
@ -32,7 +32,7 @@ AC_OUTPUT
|
||||
]])
|
||||
|
||||
LT_AT_LIBTOOLIZE([--install])
|
||||
AT_CHECK([$AUTORECONF --install], [0], [stdout], [stderr])
|
||||
LT_AT_AUTORECONF([--install])
|
||||
AT_CHECK([autoscan || exit 77], [0], [stdout], [stderr])
|
||||
AT_CHECK([$GREP -- 'AC_PROG_RANLIB' stderr], [1], [ignore])
|
||||
|
||||
@ -55,7 +55,7 @@ AC_OUTPUT
|
||||
]])
|
||||
|
||||
LT_AT_LIBTOOLIZE([--install])
|
||||
AT_CHECK([$AUTORECONF --install], [0], [stdout], [stderr])
|
||||
LT_AT_AUTORECONF([--install])
|
||||
AT_CHECK([$GREP -- 'obsolete' stdout], [0], [ignore])
|
||||
|
||||
AT_CLEANUP
|
||||
|
@ -164,7 +164,8 @@ m4_define([LT_AT_AUTORECONF],
|
||||
[[m4_ifndef([AC_CONFIG_MACRO_DIRS],
|
||||
[m4_define([AC_CONFIG_MACRO_DIRS], m4_defn([AC_CONFIG_MACRO_DIR]))])
|
||||
]])
|
||||
AT_CHECK([$AUTORECONF $1], [0], [ignore], [stderr],
|
||||
# This is stdout because its output is used by other test cases.
|
||||
AT_CHECK([$AUTORECONF $1], [0], [stdout], [stderr],
|
||||
[AT_CHECK([$GREP 'require .*but have' stderr && (exit 77)], [1])])
|
||||
AT_XFAIL_IF(
|
||||
[case ,$AUTORECONF,$AUTOCONF,$AUTOHEADER,$ACLOCAL,$AUTOMAKE, in *,no,*) :;; *) false;; esac])
|
||||
|
Loading…
Reference in New Issue
Block a user