8 files changed, 71 insertions, 68 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index d6eeb732a..1aa952a67 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ endif
 
 if LINUX
 # All of these currently only work on GNU/Linux
- LINUX_DIR = dns vpn gns exit pt
+ LINUX_DIR = dns exit vpn gns pt
 endif
 
 if HAVE_MYSQL
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index 9cbfd2d3a..99738056d 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -1081,7 +1081,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
                                              &max_record_put_interval))
   {
     GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-               "Record put interval: %d\n",
+               "Record put interval: %llu\n",
                max_record_put_interval);
   }
   
@@ -1091,7 +1091,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
                                             &max_parallel_bg_queries))
   {
     GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-               "Number of allowed parallel background queries: %d\n",
+               "Number of allowed parallel background queries: %llu\n",
                max_parallel_bg_queries);
   }
 
@@ -1110,7 +1110,7 @@ run (void *cls, struct GNUNET_SERVER_Handle *server,
                                             &default_lookup_timeout_secs))
   {
     GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-               "Default lookup timeout: %ds\n", default_lookup_timeout_secs);
+               "Default lookup timeout: %llus\n", default_lookup_timeout_secs);
     default_lookup_timeout = GNUNET_TIME_relative_multiply(
                                             GNUNET_TIME_UNIT_SECONDS,
                                             default_lookup_timeout_secs);
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 385bff672..af2817bf9 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -29,3 +29,69 @@ gnunet_daemon_pt_LDADD = \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/mesh/libgnunetmesh.la \
   $(GN_LIBINTL)
+
+check_PROGRAMS = $(VPN_TEST)
+
+if ENABLE_TEST_RUN
+TESTS = $(check_PROGRAMS)
+endif
+
+EXTRA_DIST = \
+ test_gnunet_vpn.conf \
+ test_gns_vpn.conf
+
+if HAVE_MHD
+ VPN_TEST = \
+ test_gnunet_vpn-4_to_6 \
+ test_gnunet_vpn-6_to_4 \
+ test_gnunet_vpn-6_over \
+ test_gnunet_vpn-4_over \
+ test_gns_vpn
+endif
+
+
+test_gns_vpn_SOURCES = \
+ test_gns_vpn.c
+test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/namestore/libgnunetnamestore.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+test_gnunet_vpn_4_over_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
+test_gnunet_vpn_4_over_SOURCES = \
+ test_gnunet_vpn.c
+test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
+test_gnunet_vpn_4_over_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
+test_gnunet_vpn_6_over_SOURCES = \
+ test_gnunet_vpn.c
+test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
+test_gnunet_vpn_6_over_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
+test_gnunet_vpn_4_to_6_SOURCES = \
+ test_gnunet_vpn.c
+test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
+test_gnunet_vpn_4_to_6_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
+test_gnunet_vpn_6_to_4_SOURCES = \
+ test_gnunet_vpn.c
+test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBCURL@ \
+ $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
+test_gnunet_vpn_6_to_4_CPPFLAGS = \
+ @LIBCURL_CPPFLAGS@
+
diff --git a/src/vpn/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 0c6e42500..0c6e42500 100644
--- a/src/vpn/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
diff --git a/src/vpn/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index 4c1425793..4c1425793 100644
--- a/src/vpn/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
diff --git a/src/vpn/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c
index d2cfc757b..d2cfc757b 100644
--- a/src/vpn/test_gnunet_vpn.c
+++ b/src/pt/test_gnunet_vpn.c
diff --git a/src/vpn/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index bdac1a5b6..bdac1a5b6 100644
--- a/src/vpn/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index c079f3711..efd61d775 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -20,14 +20,6 @@ VPNBIN = gnunet-helper-vpn
 install-exec-hook:
         $(SUDO_BINARY) chown root:root $(bindir)/gnunet-helper-vpn || true
         $(SUDO_BINARY) chmod u+s $(bindir)/gnunet-helper-vpn || true
-if HAVE_MHD
- VPN_TEST = \
- test_gnunet_vpn-4_to_6 \
- test_gnunet_vpn-6_to_4 \
- test_gnunet_vpn-6_over \
- test_gnunet_vpn-4_over \
- test_gns_vpn
-endif
 else
 install-exec-hook:
 endif
@@ -40,18 +32,6 @@ lib_LTLIBRARIES = \
 bin_PROGRAMS = \
   $(VPNBIN) gnunet-service-vpn gnunet-vpn
 
-
-
-check_PROGRAMS = $(VPN_TEST)
-
-if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS)
-endif
-
-EXTRA_DIST = \
-  test_gnunet_vpn.conf \
-        test_gns_vpn.conf
-
 gnunet_helper_vpn_SOURCES = \
  gnunet-helper-vpn.c
 
@@ -82,47 +62,4 @@ libgnunetvpn_la_LIBADD = \
 libgnunetvpn_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)
 
-test_gns_vpn_SOURCES = \
- test_gns_vpn.c
-test_gns_vpn_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/namestore/libgnunetnamestore.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la
-test_gnunet_vpn_4_over_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
-
-test_gnunet_vpn_4_over_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la 
-test_gnunet_vpn_4_over_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
-
-test_gnunet_vpn_6_over_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la 
-test_gnunet_vpn_6_over_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
-
-test_gnunet_vpn_4_to_6_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la 
-test_gnunet_vpn_4_to_6_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
-
-test_gnunet_vpn_6_to_4_SOURCES = \
- test_gnunet_vpn.c
-test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
- $(top_builddir)/src/testing/libgnunettesting.la \
- $(top_builddir)/src/util/libgnunetutil.la 
-test_gnunet_vpn_6_to_4_CPPFLAGS = \
- @LIBCURL_CPPFLAGS@
+