diff options
| author |  Lars Schneider <larsxschneider@gmail.com> | 2017-04-26 21:15:44 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-04-26 18:19:09 -0700 |
| commit | 505ad91304e1793ee588ccdcc2413c2e0af6f667 (patch) | |
| tree | ae46d573a2bf132d5324411b204a550c91029469 | |
| parent | travis-ci: unset compiler for jobs that do not need one (diff) | |
| download | tgif-505ad91304e1793ee588ccdcc2413c2e0af6f667.tar.xz | |
travis-ci: check AsciiDoc/AsciiDoctor stderr output
`make` does not necessarily fail with an error code if
Asciidoc/AsciiDoctor encounters problems. Anything written to stderr
might be a better indicator for problems.
Ensure that nothing is written to stderr during a documentation build.
The redirects do not work in `sh`, therefore the script uses `bash`.
This shouldn't be a problem as the script is only executed on TravisCI.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | ci/test-documentation.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh index 58962d668a..6214e6acb4 100755 --- a/ci/test-documentation.sh +++ b/ci/test-documentation.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # # Perform sanity checks on documentation and build it. # @@ -9,7 +9,8 @@ make check-builtins make check-docs # Build docs with AsciiDoc -make --jobs=2 doc +make --jobs=2 doc > >(tee stdout.log) 2> >(tee stderr.log >&2) +! test -s stderr.log test -s Documentation/git.html test -s Documentation/git.xml test -s Documentation/git.1 @@ -17,6 +18,8 @@ grep '<meta name="generator" content="AsciiDoc ' Documentation/git.html # Build docs with AsciiDoctor make clean -make --jobs=2 USE_ASCIIDOCTOR=1 doc +make --jobs=2 USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.log >&2) +sed '/^GIT_VERSION = / d' stderr.log +! test -s stderr.log test -s Documentation/git.html grep '<meta name="generator" content="Asciidoctor ' Documentation/git.html |