diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-26 20:56:32 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-26 20:56:32 +0200 |
| commit | 2b9a79a7c2edefebb4aea3dc08acadb683c9487d (patch) | |
| tree | 8bf30b9f031eeaba192abdf4a495384785199ac9 /t/parallel-tests-fd-redirect.sh | |
| parent | 313db7c6a9ad24f059326cc43223056ca3814f23 (diff) | |
| parent | 4a4f39cf7b87a9384a1b274263a66577f3387131 (diff) | |
| download | automake-2b9a79a7c2edefebb4aea3dc08acadb683c9487d.tar.gz | |
Merge branch 'master' into ng/master
* master:
NEWS: document deprecation of 'shar' and 'compress' dist formats
m4: rename minuso.m4 -> prog-cc-c-o.m4
tests: adjust or remove some obsolete comments
tests: remove some useless 'unset' of variables
tests: avoid a couple of extra sleep with GNU make
NEWS: document testsuite work for 1.13.3
lint: remove a couple of obsolete syntax checks
lint: cosmetics: use #-comments, not ##-comments
lint: cosmetics: some reordering
lint: recipes of syntax check require GNU grep; ensure it is used
lint: better name for a syntax check
tests: rename $am_make_rc_got -> $am_make_rc
tests: some tests make no sense if "$CC -c -o" doesn't work
AM_PROG_CC_C_O: don't rely on AC_PROG_CC_C_O, re-implement similar logic
compile: rewrite AC_PROG_CC with AM_PROG_CC_C_O contents
tests: ensure $required is not set too late
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/parallel-tests-fd-redirect.sh')
| -rw-r--r-- | t/parallel-tests-fd-redirect.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/parallel-tests-fd-redirect.sh b/t/parallel-tests-fd-redirect.sh index cab27014a..bfdfdb8c8 100644 --- a/t/parallel-tests-fd-redirect.sh +++ b/t/parallel-tests-fd-redirect.sh @@ -54,7 +54,7 @@ chmod a+x foo.sh bar run_make -O -e IGNORE check cat foo.log cat bar.log -test $am_make_rc_got -eq 0 +test $am_make_rc -eq 0 grep "^ foofoofoo$" stdout grep "^ barbarbar$" stdout $EGREP '(foofoofoo|barbarbar)' *.log && exit 1 |