diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 20:05:11 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 20:18:25 +0200 |
commit | cf4f853ca2695a9e3cd35836cd610279fb3a6864 (patch) | |
tree | ac27ad32859255c4efdc2253f47e88efb6896d28 /t/test-log.sh | |
parent | ffc53e60412bf7df5c1c7ee68f11a10682b5499e (diff) | |
parent | 3b83966e81cd038e79be4225225787d3766c54ec (diff) | |
download | automake-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/test-log.sh')
-rwxr-xr-x | t/test-log.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/test-log.sh b/t/test-log.sh index 3e14f1066..d0ed987fc 100755 --- a/t/test-log.sh +++ b/t/test-log.sh @@ -106,12 +106,12 @@ 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 have_rst_section () { - eqeq=`echo "$1" | sed 's/./=/g'` + eqeq=$(echo "$1" | sed 's/./=/g') # Assume $1 contains no RE metacharacters. sed -n "/^$1$/,/^$eqeq$/p" $2 > got (echo "$1" && echo "$eqeq") > exp @@ -153,8 +153,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 |