Avoid nonportable ${x##y} substitutions in program tests.

[dxcommon.git] / tests / programs.at

diff --git a/tests/programs.at b/tests/programs.at
index 1346edee73ec816e48590d6146f46c2a920e818f..5460b5ccd5dc7cf9b676edcc6995db0af3196aa3 100644 (file)
--- a/tests/programs.at
+++ b/tests/programs.at
@@ -37,14 +37,17 @@ TEST_AUTORECONF
 
 # Check the search via path lookup
 save_PATH=$PATH
-PATH=$PWD/bin${PATH:+":$PATH"}
+PATH=`pwd`/bin${PATH:+":$PATH"}
 
-# Sanity test on PATH lookup
-AT_CHECK([test x"`command -v $1`" = x"$PWD/bin/$1" || exit 99 #''])
+# Sanity test on PATH lookup; configure will substitute absolute path if
+# "command" does not work (e.g., heirloom-sh).
+expected=$1
+val=`$TEST_SHELL -c 'command -v $1'`
+test x"$val" = x"`pwd`/bin/$1" || expected=`pwd`/bin/$1
 
 TEST_CONFIGURE
 AT_CHECK_UNQUOTED([cat test], [0], [yes
-$1
+$expected
 ])
 PATH=$save_PATH