[Ileana Dumitrescu]

branch: development
commit 0db5b4ae6637f0651e698a32df92c665abed2e73
Author: Ileana Dumitrescu <ileanadumitresc...@gmail.com>
AuthorDate: Fri Oct 25 18:23:58 2024 +0300

    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.
---
 tests/bug_42313.at | 4 ++--
 tests/testsuite.at | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/bug_42313.at b/tests/bug_42313.at
index 1ee0f7b1..2d8369f4 100644
--- a/tests/bug_42313.at
+++ b/tests/bug_42313.at
@@ -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
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 5817c85c..bacc72ce 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -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])