From e4ca4685e024aed8eff3f9eee2d82eb232ce871d Mon Sep 17 00:00:00 2001
From: Loic Dachary <ldachary@redhat.com>
Date: Sat, 16 May 2015 10:57:43 +0200
Subject: [PATCH] tests: reduce make check verbosity

Move check-local scripts

   src/test/run-cli-tests
   encode-decode-non-regression.sh
   test/encoding/readable.sh

to check_SCRIPTS. Their output is captured in .log file when running
with a recent automake. This reduces the output of make check by an
order of magnitude.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---
 Makefile.am                          | 4 +++-
 qa/workunits/erasure-code/.gitignore | 2 ++
 src/Makefile.am                      | 7 +++----
 src/test/encoding/readable.sh        | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 qa/workunits/erasure-code/.gitignore

diff --git a/Makefile.am b/Makefile.am
index f2d1e8c112bf5..f1a0bd7fd0e94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,7 +52,9 @@ check-local:: all
 		echo "or run make CHECK_ULIMIT=false -j4 check to override this safeguard." ; \
 		exit 1 ; \
 	fi
-	$(srcdir)/src/test/run-cli-tests '$(top_builddir)/src/test'
+
+check_SCRIPTS = \
+	src/test/run-cli-tests
 
 # "make distclean" both runs this and recurses into src/gtest, if
 # gtest is in DIST_SUBDIRS. Take extra care to not fail when
diff --git a/qa/workunits/erasure-code/.gitignore b/qa/workunits/erasure-code/.gitignore
new file mode 100644
index 0000000000000..7e563b8b3023b
--- /dev/null
+++ b/qa/workunits/erasure-code/.gitignore
@@ -0,0 +1,2 @@
+*.log
+*.trs
diff --git a/src/Makefile.am b/src/Makefile.am
index 74153c91fdd6d..daf1a8aa88f95 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,7 +78,6 @@ EXTRA_DIST += \
 	$(srcdir)/make_version \
 	$(srcdir)/.git_version \
 	$(srcdir)/ceph-rbdnamer \
-	$(srcdir)/test/encoding/readable.sh \
 	$(srcdir)/upstart/ceph-all.conf \
 	$(srcdir)/upstart/ceph-mon.conf \
 	$(srcdir)/upstart/ceph-mon-all.conf \
@@ -151,9 +150,9 @@ TESTS = \
 	$(check_TESTPROGRAMS) \
 	$(check_SCRIPTS)
 
-check-local::
-	$(top_srcdir)/qa/workunits/erasure-code/encode-decode-non-regression.sh 
-	$(srcdir)/test/encoding/readable.sh ../ceph-object-corpus
+check_SCRIPTS += \
+	../qa/workunits/erasure-code/encode-decode-non-regression.sh \
+	test/encoding/readable.sh
 
 if WITH_LTTNG
 # TODO: If we're running the parallel test harness (the preferred harness), this should be AM_TESTS_ENVIRONMENT instead.
diff --git a/src/test/encoding/readable.sh b/src/test/encoding/readable.sh
index 1f433a552a63f..a0d41dc811e7b 100755
--- a/src/test/encoding/readable.sh
+++ b/src/test/encoding/readable.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 
-dir=$1
+dir=../ceph-object-corpus
 
 set -e
 
-- 
2.39.5