RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10116 from tchaikov/wip-cmake-make-check

Browse Source 
test: make check using cmake

Reviewed-by: Ali Maredia <amaredia@redhat.com>
This commit is contained in:
Ali Maredia 2016-07-07 12:13:46 -04:00 committed by GitHub
commit 3ed34b58bd
8 changed files with 47 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/workunits/ceph-helpers.sh
View File

@ -1167,7 +1167,7 @@ function pg_scrub() {
wait_for_scrub $pgid "$last_scrub"
}
function test_pg_scrub() {
function DISABLED_test_pg_scrub() {
local dir=$1
setup $dir || return 1

52
qa/workunits/cephtool/test.sh
View File

@ -32,11 +32,11 @@ function expect_false()
if "$@"; then return 1; else return 0; fi
}
TMPDIR=/tmp/cephtool$$
mkdir $TMPDIR
trap "rm -fr $TMPDIR" 0
TMPFILE=$TMPDIR/test_invalid.$$
TEMP_DIR=$(mktemp -d cephtool.XXX)
trap "rm -fr $TEMP_DIR" 0
TMPFILE=$(mktemp -p $TEMP_DIR test_invalid.XXX)
#
# retry_eagain max cmd args ...
@ -49,7 +49,7 @@ function retry_eagain()
local max=$1
shift
local status
local tmpfile=$TMPDIR/retry_eagain.$$
local tmpfile=$TEMP_DIR/retry_eagain.$$
local count
for count in $(seq 1 $max) ; do
status=0
@ -77,7 +77,7 @@ function retry_eagain()
function map_enxio_to_eagain()
{
local status=0
local tmpfile=$TMPDIR/map_enxio_to_eagain.$$
local tmpfile=$TEMP_DIR/map_enxio_to_eagain.$$
"$@" > $tmpfile 2>&1 || status=$?
if test $status != 0 &&
@ -197,7 +197,7 @@ function test_mon_injectargs()
check_response "osd_enable_op_tracker = 'true'"
ceph tell osd.0 injectargs -- '--osd_enable_op_tracker --osd_op_history_duration 600' >& $TMPFILE || return 1
check_response "osd_enable_op_tracker = 'true' osd_op_history_duration = '600'"
expect_failure $TMPDIR "Option --osd_op_history_duration requires an argument" \
expect_failure $TEMP_DIR "Option --osd_op_history_duration requires an argument" \
ceph tell osd.0 injectargs -- '--osd_op_history_duration'
ceph tell osd.0 injectargs -- '--mon-lease 6' >& $TMPFILE || return 1
@ -596,22 +596,22 @@ function test_auth_profiles()
function test_mon_caps()
{
ceph-authtool --create-keyring $TMPDIR/ceph.client.bug.keyring
chmod +r $TMPDIR/ceph.client.bug.keyring
ceph-authtool $TMPDIR/ceph.client.bug.keyring -n client.bug --gen-key
ceph auth add client.bug -i $TMPDIR/ceph.client.bug.keyring
ceph-authtool --create-keyring $TEMP_DIR/ceph.client.bug.keyring
chmod +r $TEMP_DIR/ceph.client.bug.keyring
ceph-authtool $TEMP_DIR/ceph.client.bug.keyring -n client.bug --gen-key
ceph auth add client.bug -i $TEMP_DIR/ceph.client.bug.keyring
rados lspools --keyring $TMPDIR/ceph.client.bug.keyring -n client.bug >& $TMPFILE || true
rados lspools --keyring $TEMP_DIR/ceph.client.bug.keyring -n client.bug >& $TMPFILE || true
check_response "Permission denied"
rm -rf $TMPDIR/ceph.client.bug.keyring
rm -rf $TEMP_DIR/ceph.client.bug.keyring
ceph auth del client.bug
ceph-authtool --create-keyring $TMPDIR/ceph.client.bug.keyring
chmod +r $TMPDIR/ceph.client.bug.keyring
ceph-authtool $TMPDIR/ceph.client.bug.keyring -n client.bug --gen-key
ceph-authtool -n client.bug --cap mon '' $TMPDIR/ceph.client.bug.keyring
ceph auth add client.bug -i $TMPDIR/ceph.client.bug.keyring
rados lspools --keyring $TMPDIR/ceph.client.bug.keyring -n client.bug >& $TMPFILE || true
ceph-authtool --create-keyring $TEMP_DIR/ceph.client.bug.keyring
chmod +r $TEMP_DIR/ceph.client.bug.keyring
ceph-authtool $TEMP_DIR/ceph.client.bug.keyring -n client.bug --gen-key
ceph-authtool -n client.bug --cap mon '' $TEMP_DIR/ceph.client.bug.keyring
ceph auth add client.bug -i $TEMP_DIR/ceph.client.bug.keyring
rados lspools --keyring $TEMP_DIR/ceph.client.bug.keyring -n client.bug >& $TMPFILE || true
check_response "Permission denied"
}
@ -818,7 +818,7 @@ function test_mon_mds()
ceph mds metadata
# XXX mds fail, but how do you undo it?
mdsmapfile=$TMPDIR/mdsmap.$$
mdsmapfile=$TEMP_DIR/mdsmap.$$
current_epoch=$(ceph mds getmap -o $mdsmapfile --no-log-to-stderr 2>&1 | grep epoch | sed 's/.*epoch //')
[ -s $mdsmapfile ]
rm $mdsmapfile
@ -1035,8 +1035,8 @@ function test_mon_mon()
ceph --help mon
# no mon add/remove
ceph mon dump
ceph mon getmap -o $TMPDIR/monmap.$$
[ -s $TMPDIR/monmap.$$ ]
ceph mon getmap -o $TEMP_DIR/monmap.$$
[ -s $TEMP_DIR/monmap.$$ ]
# ceph mon tell
ceph mon_status
}
@ -1143,7 +1143,7 @@ function test_mon_osd()
ceph osd dump | grep 'osd.0.*in'
ceph osd find 0
f=$TMPDIR/map.$$
f=$TEMP_DIR/map.$$
ceph osd getcrushmap -o $f
[ -s $f ]
ceph osd setcrushmap -i $f
@ -1374,8 +1374,8 @@ function test_mon_pg()
ceph pg ls-by-pool rbd active stale
# can't test this...
# ceph pg force_create_pg
ceph pg getmap -o $TMPDIR/map.$$
[ -s $TMPDIR/map.$$ ]
ceph pg getmap -o $TEMP_DIR/map.$$
[ -s $TEMP_DIR/map.$$ ]
ceph pg map 0.0 | grep acting
ceph pg repair 0.0
ceph pg scrub 0.0
@ -1757,7 +1757,7 @@ function test_mon_tell()
function test_mon_crushmap_validation()
{
local map=$TMPDIR/map
local map=$TEMP_DIR/map
ceph osd getcrushmap -o $map
local crushtool_path="${TMPDIR}/crushtool"

21
run-make-check.sh
View File

@ -64,12 +64,21 @@ 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
export TMPDIR=$(mktemp -d --tmpdir ceph.XXX)
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
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
rm -rf $TMPDIR
}
function main() {

2
src/ceph-detect-init/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set(CEPH_DETECT_INIT_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-detect-init-virtualenv)
add_custom_target(ceph-detect-init ALL
add_custom_target(ceph-detect-init
COMMAND
${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${CEPH_DETECT_INIT_VIRTUALENV} &&
${CEPH_DETECT_INIT_VIRTUALENV}/bin/pip install --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-detect-init/wheelhouse -e .

2
src/ceph-disk/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set(CEPH_DISK_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/ceph-disk-virtualenv)
add_custom_target(ceph-disk ALL
add_custom_target(ceph-disk
COMMAND
${CMAKE_SOURCE_DIR}/src/tools/setup-virtualenv.sh ${CEPH_DISK_VIRTUALENV} &&
${CEPH_DISK_VIRTUALENV}/bin/pip install --no-index --use-wheel --find-links=file:${CMAKE_SOURCE_DIR}/src/ceph-disk/wheelhouse -e .

16
src/test/osd/CMakeLists.txt
View File

@ -24,21 +24,7 @@ add_ceph_test(osd-markdown.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-markdown.sh)
add_ceph_test(osd-reactivate.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-reactivate.sh)
add_ceph_test(osd-reuse-id.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-reuse-id.sh)
add_ceph_test(osd-scrub-snaps.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-scrub-snaps.sh)
#osd-copy-from.sh needs to be run out of ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
add_test(NAME osd-copy-from.sh COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/osd-copy-from.sh WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
add_dependencies(check osd-copy-from.sh)
set_property(TEST
osd-copy-from.sh
PROPERTY ENVIRONMENT
CEPH_ROOT=${CMAKE_SOURCE_DIR}
CEPH_BIN=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
CEPH_LIB=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
CEPH_BUILD_DIR=${CMAKE_BINARY_DIR}
LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib
PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}:${CMAKE_SOURCE_DIR}/src:$ENV{PATH}
PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cython_modules/lib.linux-x86_64-2.7:${CMAKE_SOURCE_DIR}/src/pybind)
add_ceph_test(osd-copy-from.sh ${CMAKE_CURRENT_SOURCE_DIR}/osd-copy-from.sh)
# unittest_osdmap
add_executable(unittest_osdmap

2
src/test/osd/osd-copy-from.sh
View File

@ -45,7 +45,7 @@ function TEST_copy_from() {
run_osd $dir 1 || return 1
# success
rados -p rbd put foo rados
rados -p rbd put foo $(which rados)
rados -p rbd cp foo foo2
rados -p rbd stat foo2

2
src/test/vstart_wrapper.sh
View File

@ -19,7 +19,7 @@
source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
export CEPH_VSTART_WRAPPER=1
export CEPH_DIR="$PWD/testdir/test-$CEPH_PORT"
export CEPH_DIR="${TMPDIR:-$PWD}/testdir/test-$CEPH_PORT"
export CEPH_DEV_DIR="$CEPH_DIR/dev"
export CEPH_OUT_DIR="$CEPH_DIR/out"