diff options
| author | Kefu Chai <kchai@redhat.com> | 2016-07-13 15:14:30 +0200 |
|---|---|---|
| committer | Kefu Chai <kchai@redhat.com> | 2016-07-16 04:57:12 +0200 |
| commit | ce5724effb270b0f57369fd1e9bd82d7cc872676 (patch) | |
| tree | 95acd30e786ce6a48f9346ea10907bd39d968e4d /run-make-check.sh | |
| parent | test: ceph-detect-init/run-tox.sh: run it from any path (diff) | |
| download | ceph-ce5724effb270b0f57369fd1e9bd82d7cc872676.tar.xz ceph-ce5724effb270b0f57369fd1e9bd82d7cc872676.zip | |
cmake: add a "tests" target to build tests
please note "make test" is used by cmake to run tests, so we cannot just
repurpose it to *build* them.
* AddCephTest.cmake: depends on "tests"
* CMakeLists.txt: let "check" depend on "tests"
* src/CMakeLists.txt: update the run-tox tests
* run-make-check.sh: use "make tests" and "ctest" instead of "make check"
* ceph-detect-init/CMakeLists.txt: let "tests" depend on
"ceph-detect-init"
* ceph-disk/CMakeLists.txt: let "tests" depend on "ceph-disk"
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'run-make-check.sh')
| -rwxr-xr-x | run-make-check.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/run-make-check.sh b/run-make-check.sh index 158f60d90e9..16c0672730f 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 - export CTEST_OUTPUT_ON_FAILURE=1 CTEST_PARALLEL_LEVEL=$(get_processors) - $DRY_RUN make $BUILD_MAKEOPTS check || return 1 + $DRY_RUN make $BUILD_MAKEOPTS tests || 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 \ |