Merge pull request #12151: jewel: test fails due to The UNIX domain s…

…ocket path Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Dec 5, 2016 · 161d11f · 161d11f
2 parents a31214a + 4df1b9c
commit 161d11f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/qa/workunits/ceph-helpers.sh b/qa/workunits/ceph-helpers.sh
@@ -1442,7 +1442,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
@@ -1481,7 +1481,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="$PWD/testdir/test-$CEPH_PORT"
+export CEPH_DIR="$PWD/td/t-$CEPH_PORT"
 export CEPH_DEV_DIR="$CEPH_DIR/dev"
 export CEPH_OUT_DIR="$CEPH_DIR/out"