X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=test%2Fsptps-basic.test;h=b6d081fb8ef1a5246691f5d316e3f319a0e0a5b9;hb=22ae0c3549628739ca7c40e48ce1a276469ded92;hp=2abb99c0f6a010a366585eae59d8f6e2669bd4d0;hpb=2cd8e2b8e8d60fdeb633afe54eaf38e18afb04dc;p=tinc

diff --git a/test/sptps-basic.test b/test/sptps-basic.test
index 2abb99c0..b6d081fb 100755
--- a/test/sptps-basic.test
+++ b/test/sptps-basic.test
@@ -1,32 +1,32 @@
 #!/bin/sh
 
-. ./testlib.sh
+. "${0%/*}/testlib.sh"
+
+# Skip this test if we did not compile sptps_test
+
+test -e $sptps_test -a -e $sptps_keypair || exit 77
 
 # Generate keys
 
 mkdir -p $d1
 
-openssl ecparam -genkey -name secp521r1 -noout -out $d1/server.priv
-openssl ecparam -genkey -name secp521r1 -noout -out $d1/client.priv
-yes '' | openssl req -new -pubkey -key $d1/server.priv -noout -out $d1/server.pub
-echo
-yes '' | openssl req -new -pubkey -key $d1/client.priv -noout -out $d1/client.pub
-echo
+$sptps_keypair $d1/server.priv $d1/server.pub
+$sptps_keypair $d1/client.priv $d1/client.pub
 
 # Test transfer of a simple file.
 
-(sleep 1; $sptps_test -q $d1/client.priv $d1/server.pub localhost 32750 <../README) &
-$sptps_test $d1/server.priv $d1/client.pub 32750 >$d1/out1
-cmp $d1/out1 ../README
+(sleep 1; $sptps_test -4 -q $d1/client.priv $d1/server.pub localhost 32750 <Makefile) &
+$sptps_test -4 $d1/server.priv $d1/client.pub 32750 >$d1/out1
+cmp $d1/out1 Makefile
 
-$sptps_test -q $d1/server.priv $d1/client.pub 32750 <../NEWS &
+$sptps_test -4 -q $d1/server.priv $d1/client.pub 32750 <Makefile &
 sleep 1
-$sptps_test $d1/client.priv $d1/server.pub localhost 32750 > $d1/out2
-cmp $d1/out2 ../NEWS
+$sptps_test -4 $d1/client.priv $d1/server.pub localhost 32750 > $d1/out2
+cmp $d1/out2 Makefile
 
 # Datagram mode
 
-$sptps_test -dq $d1/server.priv $d1/client.pub 32750 <../COPYING &
+$sptps_test -4 -dq $d1/server.priv $d1/client.pub 32750 <Makefile &
 sleep 1
-sleep 1 | $sptps_test -dq $d1/client.priv $d1/server.pub localhost 32750 >$d1/out3
-cmp $d1/out3 ../COPYING
+sleep 1 | $sptps_test -4 -dq $d1/client.priv $d1/server.pub localhost 32750 >$d1/out3
+cmp $d1/out3 Makefile