From ff8ca942ce6ff6646f9ac8415f4ece9636396721 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Sat, 7 Mar 2015 01:45:27 +0100 Subject: [PATCH] build-ceph.sh always make check Nowadays it's always possible to make check, no need to test for src/gtest or something. http://tracker.ceph.com/issues/10766 Fixes: #10766 Signed-off-by: Loic Dachary --- build-ceph.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build-ceph.sh b/build-ceph.sh index 2758ab4..b8c27a0 100755 --- a/build-ceph.sh +++ b/build-ceph.sh @@ -50,13 +50,8 @@ fi NCPU=$(( 2 * `grep -c processor /proc/cpuinfo` )) ionice -c3 nice -n20 make -j$NCPU "$@" || exit 4 -# The "make -q check" probe in build.sh.example is faulty in that -# screwups in Makefiles make it think there are no unit tests to -# run. That's unacceptable; use a dumber probe. -if [ -e src/gtest ]; then - # run "make check", but give it a time limit in case a test gets stuck - ../maxtime 1800 ionice -c3 nice -n20 make check "$@" || exit 5 -fi +# run "make check", but give it a time limit in case a test gets stuck +../maxtime 1800 ionice -c3 nice -n20 make check "$@" || exit 5 REV="$(git rev-parse HEAD)" OUTDIR="../out/output/sha1/$REV" -- 2.39.5