diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 14:52:21 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 15:01:15 +0200 |
commit | 062aeb245e68208dccb3ccc9b28e100a81dbc79b (patch) | |
tree | 916ca4ae612169af518ca3c4b81ceb2e94567d6d /t/color2.sh | |
parent | 488de31efa525d864ad56cd023f3b33c83101088 (diff) | |
parent | 3a1a8c6d3cb46bfe65b715ddd8a3e0d7e27e1bf7 (diff) | |
download | automake-062aeb245e68208dccb3ccc9b28e100a81dbc79b.tar.gz |
Merge branch 'maint'
* maint:
tests: automatic re-execution works for non-POSIX shells too
tests: use more POSIX shell features our test scripts
+ Extra non-trivial edits:
* t/ax/test-init.sh: Apply the diffs between past versions of
'defs' in maint and in master; i.e., remove handling of $required
entries 'texi2dvi-o' and 'makeinfo-html', and adjust to the fact
that the parallel testsuite harness is now the default.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/color2.sh')
-rwxr-xr-x | t/color2.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/color2.sh b/t/color2.sh index b073d5cb3..041ffe6e8 100755 --- a/t/color2.sh +++ b/t/color2.sh @@ -32,7 +32,7 @@ std="$esc\[m" # Check that grep can parse nonprinting characters. # BSD 'grep' works from a pipe, but not a seekable file. # GNU or BSD 'grep -a' works on files, but is not portable. -case `echo "$std" | grep .` in +case $(echo "$std" | grep .) in "$std") ;; *) skip_ "grep can't parse nonprinting characters";; esac |