updated testing.conf
[strongswan.git] / testing / do-tests.in
index 650b106..f6ff19f 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,6 +245,13 @@ do
            continue
        fi
 
+       if [ $SUBDIR = "ipv6" -o $name = "rw-psk-ipv6" ]
+       then
+           IPTABLES="ip6tables"
+       else
+           IPTABLES="iptables"
+       fi
+
        [ -f $DEFAULTTESTSDIR/${testname}/description.txt ] || die "!! File 'description.txt' is missing"
        [ -f $DEFAULTTESTSDIR/${testname}/test.conf ]       || die "!! File 'test.conf' is missing"
        [ -f $DEFAULTTESTSDIR/${testname}/pretest.dat ]     || die "!! File 'pretest.dat' is missing"
@@ -471,7 +471,7 @@ do
 
                if [ $SUBDIR = "sql" ]
                then
-                       scp $HOSTLOGIN:/ipsec.d/etc/ipsec.sql \
+                       scp $HOSTLOGIN:/etc/ipsec.d/ipsec.sql \
                        $TESTRESULTDIR/${host}.ipsec.sql  > /dev/null 2>&1
                else
                        touch $TESTRESULTDIR/${host}.ipsec.sql