提交: 38d708929ad103324f6e87adea951ae037ea1a1f - UltraMonkeyL7_nakano (git)

Commit MetaInfo

• 修訂: 38d708929ad103324f6e87adea951ae037ea1a1f (tree)
• 時間: 2010-10-13 17:51:56
• 作者: 0809216 <0809216@1ed6...>
• Commiter: 0809216

Log Message

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

Change Summary

• modified: test/script/l7directord/l7directord-1-2-44-1.sh
• modified: test/script/l7directord/l7directord-1-2-44-2.sh
• modified: test/script/l7directord/l7directord-1-2-44-3.sh
• modified: test/script/l7directord/l7directord-1-2-46-1.sh
• modified: test/script/l7directord/l7directord-1-2-46-2.sh
• modified: test/script/l7directord/l7directord-1-2-46-3.sh
• modified: test/script/l7directord/l7directord-1-2-48-1.sh
• modified: test/script/l7directord/l7directord-1-2-48-2.sh

差異

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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