merged with guus/1.1

test/executables.test

@@ -5,4 +5,6 @@
 # Just test whether the executables work
 $tincd --help
 $tinc --help
-$sptps_test --help
+if [ -e $sptps_test ]; then
+	$sptps_test --help
+fi

test/pong.c

@@ -1,6 +1,6 @@
 /*
     pong.c -- ICMP echo reply generator
-    Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2013-2017 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,6 +19,8 @@
 
 #include "../src/system.h"
 
+#include "../src/ethernet.h"
+
 uint8_t mymac[6] = {6, 5, 5, 6, 5, 5};
 
 static ssize_t do_arp(uint8_t *buf, ssize_t len, struct sockaddr_in *in) {
@@ -152,7 +154,7 @@ int main(int argc, char *argv[]) {
 #endif
 
 		default:
-			fprintf(stderr, "Multicast for address family %hx unsupported\n", ai->ai_family);
+			fprintf(stderr, "Multicast for address family %x unsupported\n", ai->ai_family);
 			return 1;
 	}
 

test/scripts.test

@@ -71,6 +71,8 @@ echo bar-started >>$OUT
 # Stop server node
 
 $tinc $c1 stop
+sleep 1
+$tinc $c2 stop
 
 # Check if the script output is what is expected
 

test/sptps-basic.test

@@ -2,6 +2,10 @@
 
 . ./testlib.sh
 
+# Skip this test if we did not compile sptps_test
+
+test -e $sptps_test || exit 77
+
 # Generate keys
 
 mkdir -p $d1

test/testlib.sh

@@ -9,18 +9,10 @@ sptps_keypair=../src/sptps_keypair
 
 # Test directories
 
-case "$_" in
-	/*)
-		d1=$_.1
-		d2=$_.2
-		d3=$_.3
-	;;
-	*)
-		d1=$PWD/$_.1
-		d2=$PWD/$_.2
-		d3=$PWD/$_.3
-	;;
-esac
+scriptname=`basename $0`
+d1=$PWD/$scriptname.1
+d2=$PWD/$scriptname.2
+d3=$PWD/$scriptname.3
 
 # Default arguments for both tinc and tincd