Skip to content

Commit

Permalink
tests: save 9 characters for asok paths
Browse files Browse the repository at this point in the history
For vstart.sh powered tests, save 9 characters in the path name
by replacing testdir/test- with td/t-

60 characters imposed by jenkins
9 characters for src/test
5 characters for td/t-

33 left (instead of 24) for the test to create asok such as out/client.admin.25327.asok

Moving these files outside of the build directory is a bad idea because
tests should only create/use files within the builddir and not write
outside of this directory. Doing so would make things more complicated
for cleanup in case the test fail and create other problems as a
consequence (filling out disk space, conflicting directories between
runs etc.).

For ceph-helpers.sh tests replace testdir with td, saving 5 characters.
This is not strictly necessary but keeps the directory names consistent:
if the developer wants to get rid of all the test leftovers, it is
enough to remove the a single directory: td.

Fixes: http://tracker.ceph.com/issues/16014

Signed-off-by: Loic Dachary <loic@dachary.org>
  • Loading branch information
ldachary committed Nov 18, 2016
1 parent db1a943 commit cd72ff9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ core

# Files generated by running tests
*.log
/src/testdir
/src/td

# specific local dir files
/build-doc
Expand Down
4 changes: 2 additions & 2 deletions qa/workunits/ceph-helpers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/test/vstart_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit cd72ff9

Please sign in to comment.