summaryrefslogtreecommitdiff
path: root/lib/am/check.am
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2011-08-18 21:53:34 +0200
committerStefano Lattarini <stefano.lattarini@gmail.com>2011-08-18 21:53:34 +0200
commit94aa58693d1a6fd09db715524e1785d062f1a252 (patch)
treef1ffbde1c396ce0c1742b2dfd347db656704bbe3 /lib/am/check.am
parentc8b66be05a6301e5f82ee7b3b7a87727f5cecd9f (diff)
parent8c4d0f0650486315359a63b2b6a832dcf4986147 (diff)
downloadautomake-94aa58693d1a6fd09db715524e1785d062f1a252.tar.gz
Merge branch 'master' into test-protocols
* master: * THANKS (Daniel Richard G.): Update e-mail address. java: avoid compilation errors when CLASSPATH is empty parallel-tests: no more spurious successes for FreeBSD make hacking: we now require autoconf 2.68
Diffstat (limited to 'lib/am/check.am')
-rw-r--r--lib/am/check.am9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/am/check.am b/lib/am/check.am
index 27388df02..0628c8661 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -295,8 +295,13 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
fi; \
echo "$$col$$br$$std"; \
fi; \
-## Be sure to exit with the proper exit status.
- $$success
+## Be sure to exit with the proper exit status. The use of "exit 1" below
+## is required to work around a FreeBSD make bug (present only when running
+## in concurrent mode). See automake bug#9245:
+## <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9245>
+## and FreeBSD PR bin/159730:
+## <http://www.freebsd.org/cgi/query-pr.cgi?pr=159730>.
+ $$success || exit 1
RECHECK_LOGS = $(TEST_LOGS)