From 6b5e9a1df7dfb3a971e40aec35119ec019515b69 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Wed, 10 Jun 2015 23:16:01 +0200 Subject: [PATCH] tests: display the output of failed make check runs After a make check fails, it shows a summary but not the output of the failed tests although they contain information to diagnose the problem. Set the VERBOSE=true automake variable which is documented to collect and display the failed script output at the end of a run (the content of the test-suite.log file (valid from automake-1.11 up). http://www.gnu.org/software/automake/manual/automake.html#index-VERBOSE Also remove the run-make-check.sh that did the same in a way that is not compatible with automake-1.11. Signed-off-by: Loic Dachary (cherry picked from commit 3a55cb029bb7db9542d2b14f2deda90feb0ae0f6) --- run-make-check.sh | 5 ----- src/Makefile-env.am | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/run-make-check.sh b/run-make-check.sh index 4ff0783194e..e609816782d 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -61,11 +61,6 @@ function main() { echo "make check: successful run on $(git rev-parse HEAD)" return 0 else - find . -name '*.trs' | xargs grep -l FAIL | while read file ; do - log=$(dirname $file)/$(basename $file .trs).log - echo FAIL: $log - cat $log - done return 1 fi } diff --git a/src/Makefile-env.am b/src/Makefile-env.am index 93d5a9a0b55..e5fda78d5ff 100644 --- a/src/Makefile-env.am +++ b/src/Makefile-env.am @@ -35,6 +35,9 @@ check_PROGRAMS = # tests scripts will be appended to this check_SCRIPTS = +# display the output of failed check_SCRIPTS after a failed make check +export VERBOSE = true + # python unit tests need to know where the scripts are located export PYTHONPATH=$(top_srcdir)/src/pybind -- 2.47.3