From: grev <grev>
Date: Wed, 27 Aug 2008 11:14:12 +0000 (+0000)
Subject: b=16798
X-Git-Tag: v1_7_110~2^242~1
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=4feda5592d463f047d503ad334f66148f90a9008;p=fs%2Flustre-release.git

b=16798
i=Adilger
rundbench fix: skip if dbench or client are not found
t-f skip fn fix: do not fail if TESTSUITELOG is not found
log fn: escape /
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 07b80ec..8403ff7 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -1272,7 +1272,8 @@ error_ignore() {
 
 skip () {
 	log " SKIP: ${TESTSUITE} ${TESTNAME} $@"
-	[ "$TESTSUITELOG" ] && echo "${TESTSUITE}: SKIP: $TESTNAME $@" >> $TESTSUITELOG
+	[ "$TESTSUITELOG" ] && \
+		echo "${TESTSUITE}: SKIP: $TESTNAME $@" >> $TESTSUITELOG || true
 }
 
 build_test_filter() {
@@ -1369,6 +1370,7 @@ log() {
     MSG=${MSG//\|/\\\|}
     MSG=${MSG//\>/\\\>}
     MSG=${MSG//\</\\\<}
+    MSG=${MSG//\//\\\/}
     local NODES=$(nodes_list)
     for NODE in $NODES; do
         do_node $NODE $LCTL mark "$MSG" 2> /dev/null || true