RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: cephtool-test-rados/mds/osd passing in cmake

Browse Source 
Replaced relative paths in test/cephtool-test-mon.sh,
qa/workunits/cephtool/test.sh, and test/cephtool-test-mon.sh
to work with CEPH_FOO environment variables set in cmake.

Signed-off-by: Ali Maredia <amaredia@redhat.com>
This commit is contained in:
Ali Maredia 2016-01-14 13:28:21 -05:00
parent 005e4b4314
commit cf24535ed7
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
#!/bin/bash -x
source $(dirname $0)/../ceph-helpers.sh
source $CEPH_ROOT/qa/workunits/ceph-helpers.sh
set -e
set -o functrace
@ -1078,7 +1078,7 @@ function test_mon_osd()
ceph osd set $f
ceph osd unset $f
done
ceph osd set sortbitwise # new backends can't handle nibblewise
ceph osd set sortbitwise # new backends cant handle nibblewise
expect_false ceph osd set bogus
expect_false ceph osd unset bogus

4
src/test/cephtool-test-mds.sh
View File

@ -16,7 +16,7 @@
# GNU Library Public License for more details.
#
CEPH_CLI_TEST_DUP_COMMAND=1 \
MDS=1 MON=1 OSD=3 CEPH_START='mon osd mds' CEPH_PORT=7200 test/vstart_wrapper.sh \
../qa/workunits/cephtool/test.sh \
MDS=1 MON=1 OSD=3 CEPH_START='mon osd mds' CEPH_PORT=7200 $CEPH_ROOT/src/test/vstart_wrapper.sh \
$CEPH_ROOT/qa/workunits/cephtool/test.sh \
--test-mds \
--asok-does-not-need-root

4
src/test/cephtool-test-mon.sh
View File

@ -18,7 +18,7 @@
CEPH_CLI_TEST_DUP_COMMAND=1 \
# uses CEPH_PORT going from 7202 7203 and 7204 because
# it starts at 7202 and runs 3 mons (see vstart.sh)
MON=3 OSD=3 CEPH_START='mon osd' CEPH_PORT=7202 test/vstart_wrapper.sh \
../qa/workunits/cephtool/test.sh \
MON=3 OSD=3 CEPH_START='mon osd' CEPH_PORT=7202 $CEPH_ROOT/src/test/vstart_wrapper.sh \
$CEPH_ROOT/qa/workunits/cephtool/test.sh \
--test-mon \
--asok-does-not-need-root

4
src/test/cephtool-test-osd.sh
View File

@ -16,7 +16,7 @@
# GNU Library Public License for more details.
#
CEPH_CLI_TEST_DUP_COMMAND=1 \
MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7201 test/vstart_wrapper.sh \
../qa/workunits/cephtool/test.sh \
MON=1 OSD=3 CEPH_START='mon osd' CEPH_PORT=7201 $CEPH_ROOT/src/test/vstart_wrapper.sh \
$CEPH_ROOT/qa/workunits/cephtool/test.sh \
--test-osd \
--asok-does-not-need-root