tests: avoid a spurious failure on NetBSD

[platform/upstream/automake.git] / t / libtool7.sh

diff --git a/t/libtool7.sh b/t/libtool7.sh
index bc8eaca..f810b69 100755 (executable)
--- a/t/libtool7.sh
+++ b/t/libtool7.sh
@@ -18,7 +18,7 @@
 # Also check basic support for AM_LIBTOOLFLAGS/LIBTOOLFLAGS
 
 required='cc libtoolize'
-. ./defs || Exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CC
@@ -78,21 +78,21 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing --copy
 
-./configure "--prefix=`pwd`/_inst"
+./configure "--prefix=$(pwd)/_inst"
 env LIBTOOLFLAGS=--silent $MAKE print >output 2>&1 || {
   cat output
-  Exit 1
+  exit 1
 }
 cat output
 grep '1BEG: libmod1.la mod2.la :END1' output
 grep '2BEG: mod2.la :END2' output
 grep '3BEG: .*silent.*silent.* :END3' output
-test 2 -le `grep mod2_la_LIBTOOLFLAGS Makefile | wc -l`
+test 2 -le $(grep mod2_la_LIBTOOLFLAGS Makefile | wc -l)
 $MAKE
 
 env LIBTOOLFLAGS=--silent $MAKE install >output 2>&1 || {
   cat output
-  Exit 1
+  exit 1
 }
 cat output
 grep 'silent.*silent.*prg' output
@@ -100,7 +100,7 @@ grep 'silent.*silent.*libmod1' output
 
 env LIBTOOLFLAGS=--silent $MAKE uninstall >output 2>&1 || {
   cat output
-  Exit 1
+  exit 1
 }
 cat output
 grep 'silent.*silent.*libmod1' output