diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 4212cab2f9afb9e2e17fe6582a7f2f8a9ea56db5..4238ee7652e8a75d64f4d6b21301415a15db57ff 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