From cb38d6df6e8c3cca0775d2bee9f7490c5e7194e5 Mon Sep 17 00:00:00 2001
From: Loic Dachary <ldachary@redhat.com>
Date: Wed, 10 Jun 2015 23:23:41 +0200
Subject: [PATCH] the make check output is in test-suite.log

Searching the .trs files is not compatible with automake-1.11.

See also https://github.com/ceph/ceph/pull/4923 for more context.

Signed-off-by: Loic Dachary <loic@dachary.org>
---
 build-ceph.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build-ceph.sh b/build-ceph.sh
index 2b77255..9a22a7f 100755
--- a/build-ceph.sh
+++ b/build-ceph.sh
@@ -77,11 +77,12 @@ function get_processors() {
 
 function display_failures() {
     local dir=$1
-    find $dir -name '*.trs' | xargs grep -l FAIL | while read file ; do
-        log=$(dirname $file)/$(basename $file .trs).log
-        echo FAIL: $log
-        cat $log
-    done
+    # can be removed after hammer is retired
+    # or https://github.com/ceph/ceph/pull/4923
+    # is backported to all branches.
+    if ! test -f src/Makefile-env.am || ! grep -q VERBOSE src/Makefile-env.am ; then
+        cat src/test-suite.log
+    fi
 }
 
 make -j$(get_processors) "$@" || exit 4
-- 
2.39.5