bug fix

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

diff --git a/test/script/PT/C/C-10-IPv6v6.sh b/test/script/PT/C/C-10-IPv6v6.sh
index e2c6b1c..9758219 100755 (executable)
--- a/test/script/PT/C/C-10-IPv6v6.sh
+++ b/test/script/PT/C/C-10-IPv6v6.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 . ${SET_DEFAULT_CONF}
-\cp ./materials/C-10-IPv4v4-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
+\cp ./materials/C-10-IPv6v6-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
 
 VS="[::1]"
 RS="[::1]"

diff --git a/test/script/PT/C/C-8-IPv6v6.sh b/test/script/PT/C/C-8-IPv6v6.sh
index d52d756..6bd6f62 100755 (executable)
--- a/test/script/PT/C/C-8-IPv6v6.sh
+++ b/test/script/PT/C/C-8-IPv6v6.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 . ${SET_DEFAULT_CONF}
-\cp ./materials/C-8-IPv4v4-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
+\cp ./materials/C-8-IPv6v6-l7directord.cf ${L7DIRECTORD_CONF_DIR}/l7directord.cf
 
 VS="[::1]"
 RS="[::1]"

diff --git a/test/script/snmpagent/snmpagent-10.sh b/test/script/snmpagent/snmpagent-10.sh
index 7d710dd..8307cb7 100755 (executable)
--- a/test/script/snmpagent/snmpagent-10.sh
+++ b/test/script/snmpagent/snmpagent-10.sh
@@ -47,14 +47,13 @@ then
 fi
 
 #Make 10M.dat in materials 
-dd if=/dev/zero of=materials/10M.dat bs=1024 count=10240
+dd if=/dev/zero of=${TMP_DIR}/10M.dat bs=1024 count=10240
 
 #Get The File
-$WGET http://127.0.0.1:40001 --post-file materials/10M.dat -t 1
+$WGET http://127.0.0.1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
 if [ $? -ne 0 ]
 then
         echo "Test failed: $WGET http://127.0.0.1:40001 --post-file 10M.dat"
-       \rm -f materials/10M.dat 
         exit 1
 fi
 
@@ -68,8 +67,6 @@ RET=`cat  ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log | grep -e  "SNMPv2-SMI::e
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log"
-       \rm -f materials/10M.dat
         exit 1
 fi
-\rm -f materials/10M.dat
 exit 0

diff --git a/test/script/snmpagent/snmpagent-9.sh b/test/script/snmpagent/snmpagent-9.sh
index 752d603..c44f293 100755 (executable)
--- a/test/script/snmpagent/snmpagent-9.sh
+++ b/test/script/snmpagent/snmpagent-9.sh
@@ -47,14 +47,13 @@ then
 fi
 
 #Make 10M.dat in materials 
-dd if=/dev/zero of=materials/10M.dat bs=1024 count=10240
+dd if=/dev/zero of=${TMP_DIR}/10M.dat bs=1024 count=10240
 
 #Get The File
-$WGET http://127.0.0.1:40001 --post-file materials/10M.dat -t 1
+$WGET http://127.0.0.1:40001 --post-file ${TMP_DIR}/10M.dat -t 1
 if [ $? -ne 0 ]
 then
         echo "Test failed: $WGET http://127.0.0.1:40001 --post-file 10M.dat"
-        \rm -f materials/10M.dat
         exit 1
 fi
 usleep 1000000
@@ -65,10 +64,7 @@ RET=`cat  ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log | grep -e  "SNMPv2-SMI::e
 if [ -z "${RET}" ]
 then
         echo "Test failed: cat ${L7VS_LOG_DIR}/snmpagent-1-19-snmptrapd.log"
-       \rm -f materials/10M.dat
         exit 1
 fi
 
-\rm -f materials/10M.dat
-
 exit 0