From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 6 Jan 2018 15:20:25 +0000 (+0100)
Subject: Ensure the sptps-basic test doesn't fail during make distcheck.
X-Git-Tag: release-1.1pre16~41
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ee5e3404e49ef08437cd6b6e4c5b83d190efa053;p=oweals%2Ftinc.git

Ensure the sptps-basic test doesn't fail during make distcheck.
---

diff --git a/test/sptps-basic.test b/test/sptps-basic.test
index 4c79437..b6d081f 100755
--- a/test/sptps-basic.test
+++ b/test/sptps-basic.test
@@ -4,7 +4,7 @@
 
 # Skip this test if we did not compile sptps_test
 
-test -e $sptps_test || exit 77
+test -e $sptps_test -a -e $sptps_keypair || exit 77
 
 # Generate keys
 
@@ -15,18 +15,18 @@ $sptps_keypair $d1/client.priv $d1/client.pub
 
 # Test transfer of a simple file.
 
-(sleep 1; $sptps_test -4 -q $d1/client.priv $d1/server.pub localhost 32750 <../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 ../README
+cmp $d1/out1 Makefile
 
-$sptps_test -4 -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 -4 $d1/client.priv $d1/server.pub localhost 32750 > $d1/out2
-cmp $d1/out2 ../NEWS
+cmp $d1/out2 Makefile
 
 # Datagram mode
 
-$sptps_test -4 -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 -4 -dq $d1/client.priv $d1/server.pub localhost 32750 >$d1/out3
-cmp $d1/out3 ../COPYING
+cmp $d1/out3 Makefile