Changeset 264

Timestamp:

05/30/10 17:44:05 (21 months ago)

Author:

ol

Message:

Change Valgrind leak check to be able to play with Valgrind suppress files. Add curl mode in unit_test

Files:

• trunk/test/unit_test (modified) (3 diffs)

trunk/test/unit_test

@@ -11 +11 @@
 list_tmp=._list_tmp
 
+#valgrind_opt="--leak-check=yes --run-libc-freeres=no --show-reachable=yes --gen-suppressions=yes"
 valgrind_opt="--leak-check=yes --run-libc-freeres=no --show-reachable=yes"
 
@@ -51 +52 @@
                           -e 's/from.\+$//'                               \
                           -e 's/ errors //'`
-    valgrind_leak=`grep LEAK $file_tmp | wc -l`
+    valgrind_leak=`(grep "definitely lost: 0 bytes in 0 blocks" $file_tmp && grep "indirectly lost: 0 bytes in 0 blocks" $file_tmp && grep "possibly lost: 0 bytes in 0 blocks" $file_tmp && grep "still reachable: 0 bytes in 0 blocks" $file_tmp) | wc -l`
                         
     echo -n "$unit_id           -> $valgrind_error errors "
 
-    if [ $valgrind_leak -eq 0 ] ; then
+    if [ $valgrind_leak -eq 4 ] ; then
       echo " |  No leak detected"
     else
@@ -91 +92 @@
     echo -n "$unit_id  -> "
     `which time` -p ./tinyows 2>&1 | grep user | sed -e 's/user //'
+
+# curl mode
+elif [ $mode -eq 8 ]; then
+    if [ ! $TINYOWS_CONFIG_FILE ]; then
+        TINYOWS_CONFIG_FILE=/usr/local/tinyows/config.xml
+    fi
+    IP=`grep online_resource $TINYOWS_CONFIG_FILE | sed -e 's/.*online_resource="//' -e 's/".*//'`
+    curl -i -H "Content-Type: text/xml" --data @$unit_id $IP
 fi
+
 
 done