From ff1cda1ec4b9e16500a15a39b43e2a578b913de5 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Sun, 3 Oct 2004 11:20:53 +0000 Subject: [PATCH] * tests/quote.test: echo is called ECHO now. Make sure we extract the value of ECHO from the libtool script. Reported by Bob Friesenhahn --- ChangeLog | 6 ++++++ tests/quote.test | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52f9c41f2..f5503babe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-10-03 Gary V. Vaughan + + * tests/quote.test: echo is called ECHO now. Make sure we extract + the value of ECHO from the libtool script. + Reported by Bob Friesenhahn + 2004-10-02 Gary V. Vaughan * m4/libtool.m4 (hardcode_shlibpath_var) [darwin7*]: Revert my diff --git a/tests/quote.test b/tests/quote.test index 3e8112444..9745a5150 100755 --- a/tests/quote.test +++ b/tests/quote.test @@ -26,10 +26,10 @@ # Do the torture test. status=$EXIT_SUCCESS -func_get_config "echo" "../libtool --config" +func_get_config "ECHO" "../libtool --config" for mode in compile link install; do - $echo "== $mode mode" + $ECHO "== $mode mode" # Unfortunately, without an array data type, it is nearly impossible # to protect libtool from metacharacters in filenames. So, we just @@ -60,7 +60,7 @@ for mode in compile link install; do esac # Trivial. - $echo "= trying: no quoting" + $ECHO "= trying: no quoting" result=`$LIBTOOL -n --mode=$mode $preargs ${preflag}"${flag}test" $postargs` || status=$EXIT_FAILURE # We used to have the contents of $match in the case statement, # without an intermediate variable, but it would fail on at least @@ -68,25 +68,25 @@ for mode in compile link install; do match="$preargs ${preflag}${flag}test " case "$result" in *"$match"*) - $echo "= passed: $result" + $ECHO "= passed: $result" ;; *) - $echo "= failed: $result" + $ECHO "= failed: $result" status=$EXIT_FAILURE ;; esac # Metacharacters that should be backslashified. for mchar in \\ \" \` \$; do - $echo "= trying: \\$mchar quoting" + $ECHO "= trying: \\$mchar quoting" result=`$LIBTOOL -n --mode=$mode $preargs ${preflag}"${flag}${mchar}test${mchar}" $postargs` || status=$EXIT_FAILURE match="$preargs ${preflag}${flag}\\${mchar}test\\${mchar} " case "$result" in *"$match"*) - $echo "= passed: $result" + $ECHO "= passed: $result" ;; *) - $echo "= failed: $result" + $ECHO "= failed: $result" status=$EXIT_FAILURE ;; esac @@ -96,15 +96,15 @@ for mode in compile link install; do for mchar in "[" "]" "~" "#" "^" "&" "*" "(" ")" "{" "}" "|" ";" "<" ">" "?" \ "'" " " " "; do - $echo "= trying: \"$mchar\" quoting" + $ECHO "= trying: \"$mchar\" quoting" result=`$LIBTOOL -n --mode=$mode $preargs ${preflag}"${flag}${mchar}test${mchar}" $postargs` || status=$EXIT_FAILURE match="$preargs ${preflag}\"${flag}${mchar}test${mchar}\" " case "$result" in *"$match"*) - $echo "= passed: $result" + $ECHO "= passed: $result" ;; *) - $echo "= failed: $result" + $ECHO "= failed: $result" status=$EXIT_FAILURE ;; esac -- 2.47.2