diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-22 00:09:30 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-22 00:09:30 +0200 |
| commit | 4d56c0f3b5973e386c3e5f0fb2367d2fff00bf71 (patch) | |
| tree | f0a26a6c57a6018c9405ce3a22ab9eddad70309d /t/parallel-tests-recheck-pr11791.sh | |
| parent | 60bfe0b9af62baae3498fe8688703570ecb1a93e (diff) | |
| parent | c7cfa09349bb588b71ea7adffa385034465b1b09 (diff) | |
| download | automake-4d56c0f3b5973e386c3e5f0fb2367d2fff00bf71.tar.gz | |
Merge branch 'micro' into maint
* micro:
tests: run_make: options to do command redirection
tests: only activate 'unset' alias if required
tests: better idiom to override make macro defs on the cmdline
test-lib: minor style changes
test-lib: fix botched function name in an error message
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/parallel-tests-recheck-pr11791.sh')
| -rw-r--r-- | t/parallel-tests-recheck-pr11791.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/parallel-tests-recheck-pr11791.sh b/t/parallel-tests-recheck-pr11791.sh index 7fad70688..94d576ce2 100644 --- a/t/parallel-tests-recheck-pr11791.sh +++ b/t/parallel-tests-recheck-pr11791.sh @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# parallel-tests: "make -k recheck" in the face of build -# failures for the test cases. See automake bug#11791. +# parallel-tests: "make recheck" and "make -k recheck" in the face of +# build failures for the test cases. See automake bug#11791. required='cc native' . test-init.sh @@ -42,6 +42,7 @@ $MAKE check >stdout && { cat stdout; exit 1; } cat stdout count_test_results total=1 pass=0 fail=1 xpass=0 xfail=0 skip=0 error=0 +$sleep # Required to avoid a spurious failure with some FreeBSD makes. st=0; $MAKE -k recheck >stdout || st=$? cat stdout # Don't trust the exit status of "make -k" for non-GNU makes. @@ -61,6 +62,7 @@ $EGREP '(X?PASS|X?FAIL|SKIP|ERROR):' stdout && exit 1 test -f foo.log test -f foo.trs +$sleep # Required to avoid a spurious failure with some FreeBSD makes. st=0; $MAKE -k recheck >stdout || st=$? cat stdout # Don't trust the exit status of "make -k" for non-GNU makes. |