From: Kefu Chai <kchai@redhat.com>
Date: Mon, 12 Jun 2017 08:15:24 +0000 (+0800)
Subject: test/vstart_wrapper.sh: display_log on test failure
X-Git-Tag: v12.1.0~180^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2e162b55cce3914ea4222cea3dc0616a42cba4e;p=ceph.git

test/vstart_wrapper.sh: display_log on test failure

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/vstart_wrapper.sh b/src/test/vstart_wrapper.sh
index bec5e73e8966e..bc3cd9b56019a 100755
--- a/src/test/vstart_wrapper.sh
+++ b/src/test/vstart_wrapper.sh
@@ -62,7 +62,13 @@ function main()
 {
     teardown $CEPH_DIR
     vstart_setup || return 1
-    CEPH_CONF=$CEPH_DIR/ceph.conf "$@" || return 1
+    if CEPH_CONF=$CEPH_DIR/ceph.conf "$@"; then
+        code=0
+    else
+        code=1
+        display_logs $CEPH_OUT_DIR
+    fi
+    return $code
 }
 
 main "$@"