RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 09:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3322 from dachary/wip-10426-test-directories

Browse Source 
tests: group clusters in a single directory

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2015-01-08 12:57:53 -08:00
commit c2929f14b9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/ceph-helpers.sh
View File

@ -83,7 +83,7 @@ PG_NUM=4
function setup() {
local dir=$1
teardown $dir || return 1
mkdir $dir
mkdir -p $dir
}
function test_setup() {
@ -939,7 +939,7 @@ function test_repair() {
# @return 0 on success, 1 on error
#
function main() {
local dir=$1
local dir=testdir/$1
shift
set -x
@ -976,7 +976,7 @@ function run_tests() {
export CEPH_CONF=/dev/null
local funcs=${@:-$(set | sed -n -e 's/^\(test_[0-9a-z_]*\) .*/\1/p')}
local dir=ceph-helpers
local dir=testdir/ceph-helpers
for func in $funcs ; do
$func $dir || return 1

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

@ -20,7 +20,7 @@ source test/test_btrfs_common.sh
function setup() {
local dir=$1
teardown $dir
mkdir $dir
mkdir -p $dir
}
function teardown() {
@ -103,7 +103,7 @@ function call_TEST_functions() {
}
function main() {
local dir=$1
local dir=testdir/$1
export PATH=:$PATH # make sure program from sources are prefered

2
src/test/vstart_wrapper.sh
View File

@ -17,7 +17,7 @@
source test/mon/mon-test-helpers.sh
export CEPH_DIR="$PWD/test-$CEPH_PORT"
export CEPH_DIR="$PWD/testdir/test-$CEPH_PORT"
export CEPH_DEV_DIR="$CEPH_DIR/dev"
export CEPH_OUT_DIR="$CEPH_DIR/out"