]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: cephtool-test-rados/mds/osd passing in cmake
authorAli Maredia <amaredia@redhat.com>
Thu, 14 Jan 2016 18:28:21 +0000 (13:28 -0500)
committerAli Maredia <amaredia@redhat.com>
Fri, 15 Apr 2016 00:48:21 +0000 (20:48 -0400)
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>
qa/workunits/cephtool/test.sh
src/test/cephtool-test-mds.sh
src/test/cephtool-test-mon.sh
src/test/cephtool-test-osd.sh

index 85fd65ff8f2f244dfb31c5af547f03ffd434dd74..0b60cee7f08cc32e04c8d9873892b87cfaeee25a 100755 (executable)
@@ -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
 
index 0fc215175350ebc1aebd93a714b7a59be89deca8..8c9c88b6c42104b475e7d3e2e96c01b83ba446ab 100755 (executable)
@@ -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
index d4da5f28b8dae5fa293a861377f3890b19cd7d2b..9c9b20147acafc70d9b7feed24e1ef951c9b9562 100755 (executable)
@@ -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
index c016d24b2502e1187eb47a9b100253f0274eef08..13b0774a70533a0f7a157fd7e8e6da589b635166 100755 (executable)
@@ -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