Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp> --- tests/check | 6 ++++++ tests/common.config | 2 +- tests/common.rc | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/check b/tests/check index b05c823..04e0113 100755 --- a/tests/check +++ b/tests/check @@ -143,6 +143,7 @@ check options -corosync use corosync driver (default: local) -zk use zookeeper driver -valgrind use valgrind + -dio use direct IO for sheep backend store -xdiff graphical mode diff -md enable md for backend -e exit immediately on test failure @@ -179,6 +180,11 @@ testlist options xpand=false ;; + -dio) + SHEEP_OPTIONS="$SHEEP_OPTIONS -D" + xpand=false + ;; + -g) # -g group ... pick from group file group=true xpand=false diff --git a/tests/common.config b/tests/common.config index aae756f..3ee4c4c 100644 --- a/tests/common.config +++ b/tests/common.config @@ -77,9 +77,9 @@ export WD=${WD:-/tmp/sheepdog} export STORE export SHEEP_PROG=${SHEEP_PROG:-../sheep/sheep} export SHEEP=${SHEEP:-$SHEEP_PROG} +export SHEEP_OPTIONS=${SHEEP_OPTIONS:-"-y 127.0.0.1 -d"} export COLLIE_PROG=${COLLIE_PROG:-../collie/collie} export COLLIE=${COLLIE:-$COLLIE_PROG} -export LOG_FORMAT=${LOG_FORMAT:-default} # make sure this script returns success /bin/true diff --git a/tests/common.rc b/tests/common.rc index 243460f..82314a2 100644 --- a/tests/common.rc +++ b/tests/common.rc @@ -279,7 +279,7 @@ _start_sheep() MD=",$STORE/$1/d0,$STORE/$1/d1,$STORE/$1/d2" fi - $SHEEP $STORE/$1$MD -z $1 -p $((7000+$1)) -c $DRIVER -y 127.0.0.1 -d $2 -F $LOG_FORMAT + $SHEEP $STORE/$1$MD -z $1 -p $((7000+$1)) -c $DRIVER $SHEEP_OPTIONS $2 if [ $? != 0 ]; then _die "cannot start sheep $1" -- 1.8.1.3.566.gaa39828 |