diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-23 00:16:26 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-23 00:16:26 +0200 |
| commit | edbcd8f1948b35f956bba1586d7cc2e628b98338 (patch) | |
| tree | c27eef97bf1889acb0e0a36e943762ed627dbaff /t/parallel-tests-reset-term.sh | |
| parent | 3b83966e81cd038e79be4225225787d3766c54ec (diff) | |
| parent | 5898641fb97b63ff62d84eed90ea7e1b2329bfe8 (diff) | |
| download | automake-edbcd8f1948b35f956bba1586d7cc2e628b98338.tar.gz | |
Merge branch 'maint'
* maint:
tests: avoid one last `...` command substitution in 'test-init.sh'
maintcheck: guard against `...` for command substitution in test cases
tests: more uses of $(...) over `...` for command substitution
cosmetics: quote `like this', not 'like this', in a couple of tests
readme: clarify/extend few entries in 't/README'
readme: better separation of entries in 't/README'
readme: subsections "Do" and "Do not" in 't/README' merged
tests: new requirement 'grep-nonprint'
cosmetics: fix description of an expected error message in a test
tests: assume automake quotes 'like this', not `like this'
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/parallel-tests-reset-term.sh')
| -rwxr-xr-x | t/parallel-tests-reset-term.sh | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/t/parallel-tests-reset-term.sh b/t/parallel-tests-reset-term.sh index 4cd80862b..52e15c069 100755 --- a/t/parallel-tests-reset-term.sh +++ b/t/parallel-tests-reset-term.sh @@ -17,20 +17,11 @@ # Check that the testsuite harness correctly handle overrides of the # TERM variable by either TESTS_ENVIRONMENT and AM_TESTS_ENVIRONMENT. +required='grep-nonprint' . ./defs || Exit 1 -esc='[' - TERM=ansi; export TERM -# 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 "$esc" | $FGREP "$esc"` in - "$esc") ;; - *) skip_ "$FGREP can't parse nonprinting characters" ;; -esac - cat >> configure.ac << 'END' AC_OUTPUT END @@ -67,9 +58,9 @@ $AUTOMAKE -a ./configure mkcheck TESTS_ENVIRONMENT='TERM=dumb' -cat stdout | grep "PASS.*foobar" | $FGREP "$esc" +cat stdout | grep "PASS.*foobar" | grep "$esc\\[" mkcheck AM_TESTS_ENVIRONMENT='TERM=dumb' -cat stdout | grep "PASS.*foobar" | $FGREP "$esc" +cat stdout | grep "PASS.*foobar" | grep "$esc\\[" : |