From: Sage Weil <sage@redhat.com>
Date: Sat, 2 Jul 2016 11:50:34 +0000 (-0700)
Subject: run-make-check.sh: run make check with cmake if do_cmake.sh is available
X-Git-Tag: ses5-milestone5~472^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=96f6fc064324a06cf99ec11f777a545ffcbdd04d;p=ceph.git

run-make-check.sh: run make check with cmake if do_cmake.sh is available

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/run-make-check.sh b/run-make-check.sh
index 8902ead2db83..0f16a4456d7f 100755
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -64,12 +64,19 @@ function run() {
     if test -f ./install-deps.sh ; then
 	$DRY_RUN ./install-deps.sh || return 1
     fi
-    $DRY_RUN ./autogen.sh || return 1
-    $DRY_RUN ./configure "$@"  --with-librocksdb-static --disable-static --with-radosgw --with-debug --without-lttng \
-        CC="ccache gcc" CXX="ccache g++" CFLAGS="-Wall -g" CXXFLAGS="-Wall -g" || return 1
-    $DRY_RUN make $BUILD_MAKEOPTS || return 1
-    $DRY_RUN make $CHECK_MAKEOPTS check || return 1
-    $DRY_RUN make dist || return 1
+    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
+    else
+        $DRY_RUN ./autogen.sh || return 1
+        $DRY_RUN ./configure "$@"  --with-librocksdb-static --disable-static --with-radosgw --with-debug --without-lttng \
+            CC="ccache gcc" CXX="ccache g++" CFLAGS="-Wall -g" CXXFLAGS="-Wall -g" || return 1
+        $DRY_RUN make $BUILD_MAKEOPTS || return 1
+        $DRY_RUN make $CHECK_MAKEOPTS check || return 1
+        $DRY_RUN make dist || return 1
+    fi
 }
 
 function main() {