From dc673ff8151e7eb6096029f0d4445b3682499caa Mon Sep 17 00:00:00 2001
From: wangchao <wangchao>
Date: Wed, 12 May 2004 06:52:49 +0000
Subject: [PATCH] b=2693 r=Robert
Update the regex of conf-sanity.sh test 13 to parse mds uuid from xml file properly.
---
lustre/tests/conf-sanity.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 4212cab2f9..4238ee7652 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -482,8 +482,10 @@ test_13() {
fi
EXPECTEDMDS1UUID="e_longer_than_31characters_UUID"
EXPECTEDMDS2UUID="longer_than_31characters_UUID_2"
- FOUNDMDS1UUID=`awk -F"'" '/<mds uuid=/{print $2}' $XMLCONFIG | sed -n '1p'`
- FOUNDMDS2UUID=`awk -F"'" '/<mds uuid=/{print $2}' $XMLCONFIG | sed -n '2p'`
+ FOUNDMDS1UUID=`awk -F"'" '/<mds .*uuid=/' $XMLCONFIG | sed -n '1p' \
+ | sed "s/ /\n\r/g" | awk -F"'" '/uuid=/{print $2}'`
+ FOUNDMDS2UUID=`awk -F"'" '/<mds .*uuid=/' $XMLCONFIG | sed -n '2p' \
+ | sed "s/ /\n\r/g" | awk -F"'" '/uuid=/{print $2}'`
if [ $EXPECTEDMDS1UUID != $FOUNDMDS1UUID ]; then
echo "Error:expected uuid for mds1: $EXPECTEDMDS1UUID; found: $FOUNDMDS1UUID"
return 1
--
GitLab