summaryrefslogtreecommitdiff
path: root/t/tap-log.sh
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-06-22 20:05:11 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-06-22 20:18:25 +0200
commitcf4f853ca2695a9e3cd35836cd610279fb3a6864 (patch)
treeac27ad32859255c4efdc2253f47e88efb6896d28 /t/tap-log.sh
parentffc53e60412bf7df5c1c7ee68f11a10682b5499e (diff)
parent3b83966e81cd038e79be4225225787d3766c54ec (diff)
downloadautomake-cf4f853ca2695a9e3cd35836cd610279fb3a6864.tar.gz
Merge branch 'master' into ng/master
* master: tests: prefer using 'is_newest' over 'ls -t' hacks tests: implement is_newest as an auxiliary script, not shell function tests: fix some spurious failures in VPATH setup tests: work in VPATH setup again tests: automatic re-execution works for non-POSIX shells too tests: use more POSIX shell features our test scripts docs: avoid failures with development version of Texinfo (4.13.90) typofix: s/test derivers/test drivers/ in check.am comments typofix: s/env/even/ in comments in GNUmakefile Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/tap-log.sh')
-rwxr-xr-xt/tap-log.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/tap-log.sh b/t/tap-log.sh
index 683093853..c5bcf0c88 100755
--- a/t/tap-log.sh
+++ b/t/tap-log.sh
@@ -103,8 +103,8 @@ for result in xfail fail xpass skip error; do
$FGREP "$pmarker $result $pmarker" my.log || st=1
$FGREP "$cmarker $result $cmarker" my.log || st=1
done
-test `$FGREP -c "$pmarker" my.log` -eq 5
-test `$FGREP -c "$cmarker" my.log` -eq 5
+test $($FGREP -c "$pmarker" my.log) -eq 5
+test $($FGREP -c "$cmarker" my.log) -eq 5
# Passed test scripts shouldn't be mentioned in the global log.
$EGREP '(^pass|[^x]pass)\.test' my.log && Exit 1
@@ -139,8 +139,8 @@ test ! -f my.log
test ! -f test-suite.log
# Check that VERBOSE causes the global testsuite log to be
# emitted on stdout.
-out=`cat stdout`
-log=`cat global.log`
+out=$(cat stdout)
+log=$(cat global.log)
case $out in *"$log"*) ;; *) Exit 1;; esac
touch error2.log test-suite.log my.log