From 6e713425a0dcede167924e7691e95ab5e54e399c Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 14 Jun 2012 13:13:58 +0200 Subject: tests: use more POSIX shell features our test scripts Since commit 'v1.12-36-g2d68fd9' of 2012-05-07, "configure: search a sturdy POSIX shell to be used in the testsuite", the shell running our test script is assured to be a POSIX-conforming shell, so we can use the more modern and flexible idioms and features that we couldn't use when we also aimed at compatibility with non-POSIX Bourne shells, like Solaris /bin/sh. * t/README: Suggest to use POSIX shell features liberally in test cases, with possible exception of Makefile recipes and configure shell code. * Several tests: Adjust to use more POSIX shell features; e.g., $(...) rather than `...`, $((...)) rather than `expr ...`, "if ! CMD; then ..." instead of "if CMD; then :; else ...", and so on. In several places, when using the 'test' built-in, prefer '-eq' over '=' for numeric comparisons, and prefer "grep -c PATTERN FILE" over "grep PATTERN FILE | wc -l". Throw in other low-hanging easy improvements and fixlets while we are at it. * t/ax/depcomp.sh, t/ax/tap-summary-aux.sh, t/ax/tap-functions.sh, defs, defs-static.in: Likewise. Signed-off-by: Stefano Lattarini --- t/instmany-mans.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 't/instmany-mans.sh') diff --git a/t/instmany-mans.sh b/t/instmany-mans.sh index ceb3a9e0f..682fc1da7 100755 --- a/t/instmany-mans.sh +++ b/t/instmany-mans.sh @@ -28,7 +28,7 @@ limit=2500 subdir=long_subdir_name_with_many_characters nfiles=81 -list=`seq_ 1 $nfiles` +list=$(seq_ 1 $nfiles) sed "s|@limit@|$limit|g" >myinstall.in <<'END' #! /bin/sh @@ -100,7 +100,7 @@ $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing -instdir=`pwd`/inst +instdir=$(pwd)/inst mkdir build cd build ../configure --prefix="$instdir" @@ -110,11 +110,11 @@ $MAKE install # Multiple uninstall should work, too. $MAKE uninstall $MAKE uninstall -test `find "$instdir" -type f -print | wc -l` = 0 +test $(find "$instdir" -type f -print | wc -l) -eq 0 # Try whether we don't exceed the low limit. INSTALL='$(SHELL) $(top_builddir)/myinstall' $MAKE -e install -env save_PATH="$PATH" PATH="`pwd`/..$PATH_SEPARATOR$PATH" $MAKE uninstall +env save_PATH="$PATH" PATH="$(pwd)/..$PATH_SEPARATOR$PATH" $MAKE uninstall cd $subdir srcdir=../../$subdir -- cgit v1.2.1