Merge pull request #12066 from dachary/wip-16014-cot

tests: save 9 characters for asok paths Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Nov 18, 2016 · 2a302ec · 2a302ec
2 parents db1a943 + cd72ff9
commit 2a302ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,7 +28,7 @@ core
 
 # Files generated by running tests
 *.log
-/src/testdir
+/src/td
 
 # specific local dir files
 /build-doc

diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh
@@ -1457,7 +1457,7 @@ function test_wait_background() {
 # @return 0 on success, 1 on error
 #
 function main() {
-    local dir=testdir/$1
+    local dir=td/$1
     shift
 
     shopt -s -o xtrace
@@ -1496,7 +1496,7 @@ function run_tests() {
     export CEPH_CONF=/dev/null
 
     local funcs=${@:-$(set | sed -n -e 's/^\(test_[0-9a-z_]*\) .*/\1/p')}
-    local dir=testdir/ceph-helpers
+    local dir=td/ceph-helpers
 
     for func in $funcs ; do
         $func $dir || return 1

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