From 7029b59a741d074a8b7ce8bce7cec94cc420323c Mon Sep 17 00:00:00 2001
From: grev <grev>
Date: Fri, 7 Nov 2008 16:34:28 +0000
Subject: [PATCH] b=14384 i=Brian assert_DIR cleanup
---
lustre/tests/test-framework.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index e43fa9baaf..eee4a8ab9b 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -31,12 +31,12 @@ assert_env() {
assert_DIR () {
local failed=""
- [ -z "`echo :$DIR: | grep :$MOUNT:`" ] && \
- failed=1 && echo "DIR not in $MOUNT. Aborting."
- [ -z "`echo :$DIR1: | grep :$MOUNT1:`" ] && \
- failed=1 && echo "DIR1 not in $MOUNT1. Aborting."
- [ -z "`echo :$DIR2: | grep :$MOUNT2:`" ] && \
- failed=1 && echo "DIR2 not in $MOUNT2. Aborting"
+ [[ $DIR/ = $MOUNT/* ]] || \
+ { failed=1 && echo "DIR=$DIR not in $MOUNT. Aborting."; }
+ [[ $DIR1/ = $MOUNT1/* ]] || \
+ { failed=1 && echo "DIR1=$DIR1 not in $MOUNT1. Aborting."; }
+ [[ $DIR2/ = $MOUNT2/* ]] || \
+ { failed=1 && echo "DIR2=$DIR2 not in $MOUNT2. Aborting"; }
[ -n "$failed" ] && exit 99 || true
}
--
GitLab