From: Kefu Chai <kchai@redhat.com>
Date: Wed, 13 Jul 2016 13:44:31 +0000 (+0800)
Subject: run-make-check.sh: run tests in two steps
X-Git-Tag: ses5-milestone5~376^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd0dfc305d3861b9baf332a1cc13f1c716d8017b;p=ceph.git

run-make-check.sh: run tests in two steps

this is a workaround of the timeout found in jenkins. currently three
tests are found timeout, and they are labeld with "Racing" and
"LongRunning". so, to workaround this issue, we run the tests in two
phases:

1. run the racing tests with -j1
2. run the non-racing tests with -jN

if we all all tests with -j1, the total test time is 2683.57 sec

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/run-make-check.sh b/run-make-check.sh
index 16c0672730f8..880d6011efa9 100755
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -69,7 +69,8 @@ function run() {
         $DRY_RUN ./do_cmake.sh || return 1
         cd build
         $DRY_RUN make $BUILD_MAKEOPTS tests || return 1
-        $DRY_RUN ctest $CHECK_MAKEOPTS --output-on-failure || return 1
+        $DRY_RUN ctest -L Racing -j1 --output-on-failure || return 1
+        $DRY_RUN ctest -LE Racing $CHECK_MAKEOPTS --output-on-failure || return 1
     else
         $DRY_RUN ./autogen.sh || return 1
         $DRY_RUN ./configure "$@"  --with-librocksdb-static --disable-static --with-radosgw --with-debug --without-lttng \