libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Fix expout and experr line ending issues.


From: Ralf Wildenhues
Subject: Fix expout and experr line ending issues.
Date: Sun, 23 Nov 2008 22:59:07 +0100
User-agent: Mutt/1.5.18 (2008-05-17)

> * Roumen Petrov wrote on Tue, Nov 18, 2008 at 11:12:56PM CET:
> 
> >> Test 48 "enforced lib prefix" FAILED (need_lib_prefix.at:184) - again  
> >> "--mode install" problem (see test 29).
> > It is not "--mode install" problem. It is related to end of line.

Fixed like this.

Cheers,
Ralf

        Fix expout and experr line ending issues.
        * tests/testsuite.at (LT_AT_HOST_DATA): Renamed from..
        (_LT_AT_TRANSLATE_TEXT_OUTPUT): ..this.
        (LT_AT_EXEC_CHECK, LT_AT_NOINST_EXEC_CHECK): Do not use
        _LT_AT_TRANSLATE_TEXT_OUTPUT any more.
        * tests/configure-iface.at: Use LT_AT_HOST_DATA instead of
        AT_DATA for `expout' files.
        * tests/lt_dladvise.at (lt_dlopenadvise library loading):
        Likewise.
        * tests/need_lib_prefix.at (enforced lib prefix): Likewise.
        Report by Roumen Petrov.

diff --git a/tests/configure-iface.at b/tests/configure-iface.at
index 38e7824..77e2ebc 100644
--- a/tests/configure-iface.at
+++ b/tests/configure-iface.at
@@ -89,7 +89,7 @@ int f (void) { return 5150; }
 #endif
 ]])
 
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
 [[5150
 ]])
 ])# _LT_AT_LTDL_SETUP
diff --git a/tests/lt_dladvise.at b/tests/lt_dladvise.at
index 60385a6..3bf9bee 100644
--- a/tests/lt_dladvise.at
+++ b/tests/lt_dladvise.at
@@ -289,7 +289,7 @@ int k = 3;
 #endif
 ]])
 
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
 [[resident: 2
 local: 3
 global: 4
diff --git a/tests/need_lib_prefix.at b/tests/need_lib_prefix.at
index 90f3a60..f6cfcfb 100644
--- a/tests/need_lib_prefix.at
+++ b/tests/need_lib_prefix.at
@@ -131,7 +131,7 @@ int i = 6;
 #endif
 ]])
 
-AT_DATA([expout],
+LT_AT_HOST_DATA([expout],
 [[libfoo1: 2
 libfoo2: 3
 ]])
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 96c172b..f116a1f 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -193,11 +193,12 @@ m4_define([LT_AT_CHECK],
 [echo "LT_ESCAPE([$1])"; AT_CHECK($@)])
 
 
-# _LT_AT_TRANSLATE_TEXT_OUTPUT(FILE)
-# ----------------------------------
+# LT_AT_HOST_DATA(FILE, CONTENTS)
+# -------------------------------
 # Ensure correct line ending for expected output of host executables.
-m4_define([_LT_AT_TRANSLATE_TEXT_OUTPUT],
-[case $host_os in mingw*)
+m4_define([LT_AT_HOST_DATA],
+[AT_DATA([$1], [$2])
+case $host_os in mingw*)
   while read -r l; do printf "%s\r\n" "$l"; done < $1 > $1.t
   mv -f $1.t $1 ;;
 esac])
@@ -207,15 +208,12 @@ esac])
 #                 [ARGS-OR-STATUS-ADJUST])
 # --------------------------------------------------------------
 # Run EXECUTABLE ARGS-OR-STATUS-ADJUST.  STATUS, STDOUT, and STDERR are
-# handled as in AT_CHECK, but expout and experr get line endings
-# translated.
+# handled as in AT_CHECK.
 # However, if we are cross-compiling, then SKIP instead of FAIL.
 # ARGS-OR-STATUS-ADJUST can also contain code like `|| (exit 1)'
 # to unify different possible exit status values.
 m4_define([LT_AT_EXEC_CHECK],
-[m4_if([$3], [expout], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$3])])
-m4_if([$4], [experr], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$4])])
-lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
+[lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
 AT_CHECK([if "$lt_exe" $5; then :; else lt_status=$?; ]dnl
         [  m4_ifval([$2], [test $lt_status != $2 && ])]dnl
         [  test "X$host" != "X$build" && test -x "$lt_exe" && exit 77; ]dnl
@@ -229,15 +227,12 @@ AT_CHECK([if "$lt_exe" $5; then :; else lt_status=$?; ]dnl
 # ---------------------------------------------------------
 # Run EXECUTABLE ARGS-OR-STATUS-ADJUST using `libtool --mode=execute'
 # with `-dlopen' arguments in NOINST_MODULES.  STATUS, STDOUT, and
-# STDERR are handled as in AT_CHECK, but expout and experr get line
-# endings translated.
+# STDERR are handled as in AT_CHECK.
 # However, if we are cross-compiling, then SKIP instead of FAIL.
 # ARGS-OR-STATUS-ADJUST can also contain code like `|| (exit 1)'
 # to unify different possible exit status values.
 m4_define([LT_AT_NOINST_EXEC_CHECK],
-[m4_if([$4], [expout], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$4])])
-m4_if([$5], [experr], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$5])])
-lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
+[lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
 AT_CHECK([if $LIBTOOL --mode=execute $2 "$lt_exe" $6; then :; else 
lt_status=$?; ]dnl
         [  m4_ifval([$2], [test $lt_status != $2 && ])]dnl
         [  test "X$host" != "X$build" && test -x "$lt_exe" && exit 77; ]dnl




reply via email to

[Prev in Thread] Current Thread [Next in Thread]