[sheepdog] [PATCH v2 2/4] test: support log format select with $LOG_FORMAT

Hitoshi Mitake mitake.hitoshi at lab.ntt.co.jp
Tue Feb 5 03:49:30 CET 2013


From: Hitoshi Mitake <mitake.hitoshi at gmail.com>

Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
---
 tests/common.config |    1 +
 tests/common.rc     |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/tests/common.config b/tests/common.config
index 3b99621..2196477 100644
--- a/tests/common.config
+++ b/tests/common.config
@@ -78,6 +78,7 @@ export SHEEP_PROG=${SHEEP_PROG:-../sheep/sheep}
 export SHEEP=${SHEEP:-$SHEEP_PROG}
 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 914be32..b160800 100644
--- a/tests/common.rc
+++ b/tests/common.rc
@@ -221,7 +221,7 @@ _start_sheep()
         _die "sheep $1 is still running"
     fi
 
-    $SHEEP $STORE/$1 -z $1 -p $((7000+$1)) -c $DRIVER -y 127.0.0.1 -d $2
+    $SHEEP $STORE/$1 -z $1 -p $((7000+$1)) -c $DRIVER -y 127.0.0.1 -d $2 -F $LOG_FORMAT
 
     if [ $? != 0 ]; then
         _die "cannot start sheep $1"
-- 
1.7.2.5




More information about the sheepdog mailing list