From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Sun, 25 Mar 2012 10:54:59 +0000 (+0000)
Subject: Have check_makẹfile_consistency run at the end of make regtest
X-Git-Tag: svn/VALGRIND_3_8_0~397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=565baa930a6d806f57f944b2ad6ebd0c2c4a59e7;p=thirdparty%2Fvalgrind.git

Have check_makẹfile_consistency run at the end of make regtest
This ensures that a missing file in the Makefile is detected,
without blocking the tests.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12456
---

diff --git a/Makefile.am b/Makefile.am
index 7deb43ab00..b671713030 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,10 +66,15 @@ default.supp: $(DEFAULT_SUPP_FILES)
 	cat $(DEFAULT_SUPP_FILES) >> default.supp
 
 ## Preprend @PERL@ because tests/vg_regtest isn't executable
+## Ensure make exits with error if PERL fails or check_makẹfile_consistency fails.
 regtest: check
-	-tests/check_makefile_consistency gdbserver_tests $(TOOLS) $(EXP_TOOLS)
 	gdbserver_tests/make_local_links $(GDB)
-	@PERL@ tests/vg_regtest gdbserver_tests $(TOOLS) $(EXP_TOOLS)
+	if @PERL@ tests/vg_regtest gdbserver_tests $(TOOLS) $(EXP_TOOLS) ; then \
+	   tests/check_makefile_consistency gdbserver_tests $(TOOLS) $(EXP_TOOLS); \
+	else \
+	   tests/check_makefile_consistency gdbserver_tests $(TOOLS) $(EXP_TOOLS); \
+	   false; \
+	fi
 nonexp-regtest: check
 	@PERL@ tests/vg_regtest $(TOOLS)
 exp-regtest: check