RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-07 10:03:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10346 from tchaikov/wip-make-check

Browse Source 
test: ceph-disk.sh do not kill all daemons

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
This commit is contained in:
Kefu Chai 2016-07-19 17:50:21 +08:00 committed by GitHub
commit 6f3ce3aed9
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
run-make-check.sh
View File

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

2
src/ceph-disk/tests/ceph-disk.sh
View File

@ -58,7 +58,7 @@ function teardown() {
if ! test -e $dir ; then if ! test -e $dir ; then
return return
fi fi
kill_daemons kill_daemons $dir
if [ $(stat -f -c '%T' .) == "btrfs" ]; then if [ $(stat -f -c '%T' .) == "btrfs" ]; then
rm -fr $dir/*/*db rm -fr $dir/*/*db
__teardown_btrfs $dir __teardown_btrfs $dir

5
src/test/CMakeLists.txt
View File

@ -507,12 +507,9 @@ add_dependencies(tests
cython_modules) cython_modules)
add_ceph_test(test-ceph-helpers.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-ceph-helpers.sh) add_ceph_test(test-ceph-helpers.sh ${CMAKE_CURRENT_SOURCE_DIR}/test-ceph-helpers.sh)
add_ceph_test(ceph_objectstore_tool.py ${CMAKE_CURRENT_SOURCE_DIR}/ceph_objectstore_tool.py)
set_property(TEST test-ceph-helpers.sh ceph_objectstore_tool.py
PROPERTY LABELS Racing LongRunning)
add_ceph_test(erasure-decode-non-regression.sh ${CMAKE_SOURCE_DIR}/qa/workunits/erasure-code/encode-decode-non-regression.sh) add_ceph_test(erasure-decode-non-regression.sh ${CMAKE_SOURCE_DIR}/qa/workunits/erasure-code/encode-decode-non-regression.sh)
add_ceph_test(ceph_objectstore_tool.py ${CMAKE_CURRENT_SOURCE_DIR}/ceph_objectstore_tool.py)
add_ceph_test(cephtool-test-mds.sh ${CMAKE_CURRENT_SOURCE_DIR}/cephtool-test-mds.sh) add_ceph_test(cephtool-test-mds.sh ${CMAKE_CURRENT_SOURCE_DIR}/cephtool-test-mds.sh)
add_ceph_test(cephtool-test-mon.sh ${CMAKE_CURRENT_SOURCE_DIR}/cephtool-test-mon.sh) add_ceph_test(cephtool-test-mon.sh ${CMAKE_CURRENT_SOURCE_DIR}/cephtool-test-mon.sh)
add_ceph_test(cephtool-test-osd.sh ${CMAKE_CURRENT_SOURCE_DIR}/cephtool-test-osd.sh) add_ceph_test(cephtool-test-osd.sh ${CMAKE_CURRENT_SOURCE_DIR}/cephtool-test-osd.sh)