From: Lars Schneider <larsxschneider@gmail.com>
To: git@vger.kernel.org
Cc: sandals@crustytoothpaste.net, gitster@pobox.com
Subject: [PATCH v2 3/4] travis-ci: check AsciiDoc/AsciiDoctor stderr output
Date: Wed, 26 Apr 2017 21:15:44 +0200 [thread overview]
Message-ID: <20170426191545.27552-4-larsxschneider@gmail.com> (raw)
In-Reply-To: <20170426191545.27552-1-larsxschneider@gmail.com>
`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>
---
ci/test-documentation.sh | 9 ++++++---
1 file 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
--
2.12.2
next prev parent reply other threads:[~2017-04-26 19:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-26 19:15 [PATCH v2 0/4] travis-ci: build docs with asciidoctor Lars Schneider
2017-04-26 19:15 ` [PATCH v2 1/4] travis-ci: build documentation with AsciiDoc and Asciidoctor Lars Schneider
2017-04-26 19:15 ` [PATCH v2 2/4] travis-ci: parallelize documentation build Lars Schneider
2017-04-26 19:15 ` Lars Schneider [this message]
2017-04-27 1:21 ` [PATCH v2 3/4] travis-ci: check AsciiDoc/AsciiDoctor stderr output Junio C Hamano
2017-04-26 19:15 ` [PATCH v2 4/4] travis-ci: unset compiler for jobs that do not need one Lars Schneider
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170426191545.27552-4-larsxschneider@gmail.com \
--to=larsxschneider@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).