threshhold and ./configure option for lock profiler
[strongswan.git] / testing / do-tests.in
index 54407f2..2e1dc46 100755 (executable)
@@ -233,13 +233,6 @@ do
 @EOF
     fi
 
-    if [ $SUBDIR = "ipv6" ]
-    then
-       IPTABLES="ip6tables"
-    else
-       IPTABLES="iptables"
-    fi
-
     for name in $SUBTESTS
     do
        let "testnumber += 1"
@@ -252,7 +245,7 @@ do
            continue
        fi
 
-       if [ $name = "rw-psk-ipv6" ]
+       if [ $SUBDIR = "ipv6" -o $name = "rw-psk-ipv6" ]
        then
            IPTABLES="ip6tables"
        else
@@ -476,22 +469,18 @@ do
                    $TESTRESULTDIR/${host}.$file  > /dev/null 2>&1
            done
 
-               if [ $SUBDIR = "sql" ]
-               then
-                       scp $HOSTLOGIN:/etc/ipsec.d/ipsec.sql \
-                       $TESTRESULTDIR/${host}.ipsec.sql  > /dev/null 2>&1
-               else
-                       touch $TESTRESULTDIR/${host}.ipsec.sql
-               fi
+           scp $HOSTLOGIN:/etc/ipsec.d/ipsec.sql \
+               $TESTRESULTDIR/${host}.ipsec.sql  > /dev/null 2>&1
 
-           ssh $HOSTLOGIN ip xfrm policy \
+           ssh $HOSTLOGIN ip -s xfrm policy \
                    > $TESTRESULTDIR/${host}.ip.policy 2>/dev/null
-           ssh $HOSTLOGIN ip xfrm state \
+           ssh $HOSTLOGIN ip -s xfrm state \
                    > $TESTRESULTDIR/${host}.ip.state 2>/dev/null
            ssh $HOSTLOGIN ip route list table $SOURCEIP_ROUTING_TABLE \
                    > $TESTRESULTDIR/${host}.ip.route 2>/dev/null
            ssh $HOSTLOGIN $IPTABLES -v -n -L \
                    > $TESTRESULTDIR/${host}.iptables 2>/dev/null
+           chmod a+r $TESTRESULTDIR/*
            cat >> $TESTRESULTDIR/index.html <<@EOF
     <h3>$host</h3>
       <table border="0" cellspacing="0" width="600">
@@ -514,8 +503,8 @@ do
       </td>
        <td valign="top">
          <ul>
-           <li><a href="$host.ip.policy">ip xfrm policy</a></li>
-           <li><a href="$host.ip.state">ip xfrm state</a></li>
+           <li><a href="$host.ip.policy">ip -s xfrm policy</a></li>
+           <li><a href="$host.ip.state">ip -s xfrm state</a></li>
            <li><a href="$host.ip.route">ip route list table $SOURCEIP_ROUTING_TABLE</a></li>
            <li><a href="$host.iptables">$IPTABLES -L</a></li>
          </ul>