From: Vladimir Saveliev <vladimir.saveliev@oracle.com>
Date: Thu, 17 Feb 2011 19:16:26 +0000 (+0300)
Subject: b=24426 run_one(): run error() once
X-Git-Tag: 1.8.5.55~10
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0402c0b7b0a360ffe5a188e469b6edc4b32be8fe;p=fs%2Flustre-release.git

b=24426 run_one(): run error() once

there is no reason to run error() (and lctl dk thereby) more than once
second lctl dk overwrites the most important logs obtained on first lctl dk

i=grev
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index b5c0bf5..8cfda77 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2824,9 +2824,9 @@ run_one() {
     #check_mds
     cd $SAVE_PWD
     reset_fail_loc
-    check_grant ${testnum} || error "check_grant $testnum failed with $?"
-    check_catastrophe || error "LBUG/LASSERT detected"
-    ps auxww | grep -v grep | grep -q multiop && error "multiop still running"
+    check_grant ${testnum} || $TEST_FAILED || error "check_grant $testnum failed"
+    check_catastrophe || $TEST_FAILED || error "LBUG/LASSERT detected"
+    ps auxww | grep -v grep | grep -q multiop && ($TEST_FAILED || error "multiop still running")
     pass "($((`date +%s` - $BEFORE))s)"
     TEST_FAILED=false
     unset TESTNAME