From 9e6ad2ee02f95d1fc235aded3bd8c5259d4aee25 Mon Sep 17 00:00:00 2001
From: dzogin <dzogin>
Date: Thu, 10 Dec 2009 13:41:52 +0000
Subject: [PATCH]  Branch b1_8  b=21409  i=grev 
 ---------------------------------------------------------------------- 
 Modified Files:   Tag: b1_8  	lustre/tests/test-framework.sh

The small fix for test-framework to make code in 1.8 and HEAD consistent
----------------------------------------------------------------------
---
 lustre/tests/test-framework.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 8d802a3..24e1632 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2085,8 +2085,10 @@ error_noexit() {
 
 error() {
     error_noexit "$@"
-    reset_fail_loc
-    $FAIL_ON_ERROR && exit 1 || true
+    if $FAIL_ON_ERROR;  then
+        reset_fail_loc
+        exit 1
+    fi
 }
 
 error_exit() {
-- 
1.8.3.1