Skip to content

Commit

Permalink
tests: reduce make check verbosity
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
ldachary committed May 17, 2015
1 parent a0eac3e commit e4ca468
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
4 changes: 3 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions qa/workunits/erasure-code/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.log
*.trs
7 changes: 3 additions & 4 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/test/encoding/readable.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh -e

dir=$1
dir=../ceph-object-corpus

set -e

Expand Down

0 comments on commit e4ca468

Please sign in to comment.