From 146d2b15ffad73ba1b419d890127e24ef9afcc0d Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Thu, 7 Jul 2016 12:41:54 +0800 Subject: [PATCH] run-make-check.sh: use "make check" for running tests "make all" does not offer "ceph-disk" and "ceph-detect-init" for testing. as they are solely used for testing purpose. instead, these two python command line packages are installed by the "install" target. so we need to use "make check" to 1) prepare the test dependencies 2) launch ctest to perform the test. Signed-off-by: Kefu Chai --- run-make-check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-make-check.sh b/run-make-check.sh index f321eb1a434a5..158f60d90e9e2 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -68,8 +68,8 @@ function run() { if test -x ./do_cmake.sh ; then $DRY_RUN ./do_cmake.sh || return 1 cd build - $DRY_RUN make $BUILD_MAKEOPTS || return 1 - $DRY_RUN ctest $CHECK_MAKEOPTS --output-on-failure || return 1 + export CTEST_OUTPUT_ON_FAILURE=1 CTEST_PARALLEL_LEVEL=$(get_processors) + $DRY_RUN make $BUILD_MAKEOPTS check || return 1 else $DRY_RUN ./autogen.sh || return 1 $DRY_RUN ./configure "$@" --with-librocksdb-static --disable-static --with-radosgw --with-debug --without-lttng \ -- 2.39.5