diff options
| author | Yves-Alexis Perez <corsac@debian.org> | 2013-01-02 14:18:20 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2013-01-02 14:18:20 +0100 |
| commit | c1343b3278cdf99533b7902744d15969f9d6fdc1 (patch) | |
| tree | d5ed3dc5677a59260ec41cd39bb284d3e94c91b3 /testing/do-tests.in | |
| parent | b34738ed08c2227300d554b139e2495ca5da97d6 (diff) | |
| download | vyos-strongswan-c1343b3278cdf99533b7902744d15969f9d6fdc1.tar.gz vyos-strongswan-c1343b3278cdf99533b7902744d15969f9d6fdc1.zip | |
Imported Upstream version 5.0.1
Diffstat (limited to 'testing/do-tests.in')
| -rwxr-xr-x | testing/do-tests.in | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/testing/do-tests.in b/testing/do-tests.in index 67c2e7ad6..82e027078 100755 --- a/testing/do-tests.in +++ b/testing/do-tests.in @@ -268,15 +268,21 @@ do if [ $SUBDIR = "ipv6" -o $name = "rw-psk-ipv6" ] then + IPROUTE_CMD="ip -6 route list table $SOURCEIP_ROUTING_TABLE" + IPROUTE_DSP=$IPROUTE_CMD IPTABLES_CMD="ip6tables -v -n -L" IPTABLES_DSP="ip6tables -L" else + IPROUTE_CMD="ip route list table $SOURCEIP_ROUTING_TABLE" + IPROUTE_DSP=$IPROUTE_CMD IPTABLES_CMD="iptables -v -n -L" IPTABLES_DSP="iptables -L" fi if [ $name = "net2net-ip4-in-ip6-ikev2" -o $name = "net2net-ip6-in-ip4-ikev2" ] then + IPROUTE_CMD="ip route list table $SOURCEIP_ROUTING_TABLE; echo; ip -6 route list table $SOURCEIP_ROUTING_TABLE" + IPROUTE_DSP="ip (-6) route list table $SOURCEIP_ROUTING_TABLE" IPTABLES_CMD="iptables -v -n -L ; echo ; ip6tables -v -n -L" IPTABLES_DSP="iptables -L ; ip6tables -L" fi @@ -507,7 +513,7 @@ do > $TESTRESULTDIR/${host}.ip.policy 2>/dev/null ssh $SSHCONF $HOSTLOGIN ip -s xfrm state \ > $TESTRESULTDIR/${host}.ip.state 2>/dev/null - ssh $SSHCONF $HOSTLOGIN ip route list table $SOURCEIP_ROUTING_TABLE \ + ssh $SSHCONF $HOSTLOGIN $IPROUTE_CMD \ > $TESTRESULTDIR/${host}.ip.route 2>/dev/null ssh $SSHCONF $HOSTLOGIN $IPTABLES_CMD \ > $TESTRESULTDIR/${host}.iptables 2>/dev/null @@ -536,7 +542,7 @@ do <ul> <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.ip.route">$IPROUTE_DSP</a></li> <li><a href="$host.iptables">$IPTABLES_DSP</a></li> </ul> </td> @@ -625,11 +631,8 @@ do for host in $IPSECHOSTS do eval HOSTLOGIN=root@\$ipv4_${host} - ssh $SSHCONF $HOSTLOGIN grep pluto /var/log/auth.log \ - > $TESTRESULTDIR/${host}.auth.log - echo >> $TESTRESULTDIR/${host}.auth.log - ssh $SSHCONF $HOSTLOGIN grep charon /var/log/auth.log \ - >> $TESTRESULTDIR/${host}.auth.log + ssh $SSHCONF $HOSTLOGIN "grep -E 'charon|last message repeated' \ + /var/log/auth.log" >> $TESTRESULTDIR/${host}.auth.log done @@ -640,11 +643,8 @@ do for host in $IPSECHOSTS do eval HOSTLOGIN=root@\$ipv4_${host} - ssh $SSHCONF $HOSTLOGIN grep pluto /var/log/daemon.log \ - > $TESTRESULTDIR/${host}.daemon.log - echo >> $TESTRESULTDIR/${host}.daemon.log - ssh $SSHCONF $HOSTLOGIN grep charon /var/log/daemon.log \ - >> $TESTRESULTDIR/${host}.daemon.log + ssh $SSHCONF $HOSTLOGIN "grep -E 'charon|last message repeated' \ + /var/log/daemon.log" >> $TESTRESULTDIR/${host}.daemon.log done |