Fixed configtest script

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-ramiel-epoll-cond@10366 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/test/script/l7directord/l7directord-1-2-44-1.sh b/test/script/l7directord/l7directord-1-2-44-1.sh
index 55dc5db..a23cb9b 100755 (executable)
--- a/test/script/l7directord/l7directord-1-2-44-1.sh
+++ b/test/script/l7directord/l7directord-1-2-44-1.sh
@@ -9,10 +9,9 @@ then
         echo "Test failed: $L7DIRECTORD configtest"
         exit 1
 fi
-usleep 100000
 
-EXPECT="Syntax OK"
-if [ "$RET" != "$EXPECT" ]
+echo "$RET" | grep "Syntax OK" > /dev/null 2>&1
+if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD configtest"
         exit 1

diff --git a/test/script/l7directord/l7directord-1-2-44-2.sh b/test/script/l7directord/l7directord-1-2-44-2.sh
index e02f699..ab3114b 100755 (executable)
--- a/test/script/l7directord/l7directord-1-2-44-2.sh
+++ b/test/script/l7directord/l7directord-1-2-44-2.sh
@@ -9,10 +9,9 @@ then
         echo "Test failed: $L7DIRECTORD -t"
         exit 1
 fi
-usleep 100000
 
-EXPECT="Syntax OK"
-if [ "$RET" != "$EXPECT" ]
+echo "$RET" | grep "Syntax OK" > /dev/null 2>&1
+if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD -t"
         exit 1

diff --git a/test/script/l7directord/l7directord-1-2-44-3.sh b/test/script/l7directord/l7directord-1-2-44-3.sh
index 135db99..f1e9948 100755 (executable)
--- a/test/script/l7directord/l7directord-1-2-44-3.sh
+++ b/test/script/l7directord/l7directord-1-2-44-3.sh
@@ -9,10 +9,9 @@ then
         echo "Test failed: $INIT_L7DIRECTORD configtest"
         exit 1
 fi
-usleep 100000
 
-EXPECT="Syntax OK"
-if [ "$RET" != "$EXPECT" ]
+echo "$RET" | grep "Syntax OK" > /dev/null 2>&1
+if [ $? -ne 0 ]
 then
         echo "Test failed: $INIT_L7DIRECTORD configtest"
         exit 1

diff --git a/test/script/l7directord/l7directord-1-2-46-1.sh b/test/script/l7directord/l7directord-1-2-46-1.sh
index 0605708..415f81c 100755 (executable)
--- a/test/script/l7directord/l7directord-1-2-46-1.sh
+++ b/test/script/l7directord/l7directord-1-2-46-1.sh
@@ -9,10 +9,9 @@ then
         echo "Test failed: $L7DIRECTORD configtest"
         exit 1
 fi
-usleep 100000
 
-EXPECT="Syntax OK"
-if [ "$RET" != "$EXPECT" ]
+echo "$RET" | grep "Syntax OK" > /dev/null 2>&1
+if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD configtest"
         exit 1

diff --git a/test/script/l7directord/l7directord-1-2-46-2.sh b/test/script/l7directord/l7directord-1-2-46-2.sh
index 85511e8..a007c67 100755 (executable)
--- a/test/script/l7directord/l7directord-1-2-46-2.sh
+++ b/test/script/l7directord/l7directord-1-2-46-2.sh
@@ -9,10 +9,9 @@ then
         echo "Test failed: $L7DIRECTORD -t"
         exit 1
 fi
-usleep 100000
 
-EXPECT="Syntax OK"
-if [ "$RET" != "$EXPECT" ]
+echo "$RET" | grep "Syntax OK" > /dev/null 2>&1
+if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD -t"
         exit 1

diff --git a/test/script/l7directord/l7directord-1-2-46-3.sh b/test/script/l7directord/l7directord-1-2-46-3.sh
index edf15ce..500a49f 100755 (executable)
--- a/test/script/l7directord/l7directord-1-2-46-3.sh
+++ b/test/script/l7directord/l7directord-1-2-46-3.sh
@@ -9,10 +9,9 @@ then
         echo "Test failed: $INIT_L7DIRECTORD configtest"
         exit 1
 fi
-usleep 100000
 
-EXPECT="Syntax OK"
-if [ "$RET" != "$EXPECT" ]
+echo "$RET" | grep "Syntax OK" > /dev/null 2>&1
+if [ $? -ne 0 ]
 then
         echo "Test failed: $INIT_L7DIRECTORD configtest"
         exit 1

diff --git a/test/script/l7directord/l7directord-1-2-48-1.sh b/test/script/l7directord/l7directord-1-2-48-1.sh
index aec324d..bc6dc50 100755 (executable)
--- a/test/script/l7directord/l7directord-1-2-48-1.sh
+++ b/test/script/l7directord/l7directord-1-2-48-1.sh
@@ -10,8 +10,8 @@ then
         exit 1
 fi
 
-EXPECT="Syntax OK"
-if [ "$RET" != "$EXPECT" ]
+echo "$RET" | grep "Syntax OK" > /dev/null 2>&1
+if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD ${L7DIRECTORD_CONF_DIR}/specified.cf configtest"
         exit 1

diff --git a/test/script/l7directord/l7directord-1-2-48-2.sh b/test/script/l7directord/l7directord-1-2-48-2.sh
index 900655f..5f33d23 100755 (executable)
--- a/test/script/l7directord/l7directord-1-2-48-2.sh
+++ b/test/script/l7directord/l7directord-1-2-48-2.sh
@@ -10,8 +10,8 @@ then
         exit 1
 fi
 
-EXPECT="Syntax OK"
-if [ "$RET" != "$EXPECT" ]
+echo "$RET" | grep "Syntax OK" > /dev/null 2>&1
+if [ $? -ne 0 ]
 then
         echo "Test failed: $L7DIRECTORD -t ${L7DIRECTORD_CONF_DIR}/specified.cf"
         exit 1