-misc minor fixes

5 files changed, 10 insertions, 5 deletions

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 5e85b42ed..9b4bfc168 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -155,8 +155,8 @@ test_dht_api_DEPENDENCIES = \
 test_dht_twopeer_SOURCES = \
  test_dht_topo.c
 test_dht_twopeer_LDADD = \
+ $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/testbed/libgnunettestbed.la \
  $(top_builddir)/src/dht/libgnunetdhttest.a \
  $(top_builddir)/src/dht/libgnunetdht.la    
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
index c7ef8ea0f..d7383005c 100644
--- a/src/hostlist/test_hostlist_defaults.conf
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -65,3 +65,6 @@ AUTOSTART = NO
 
 [lockmanager]
 AUTOSTART = NO
+
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
\ No newline at end of file
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
index 843dc983a..a4c16ac16 100644
--- a/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
+++ b/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
@@ -32,4 +32,8 @@ AUTOSTART = NO
 [nse]
 AUTOSTART = NO
 
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
+
+
 
diff --git a/src/statistics/test_gnunet_statistics.py.in b/src/statistics/test_gnunet_statistics.py.in
index b5697d246..0d3c984eb 100644
--- a/src/statistics/test_gnunet_statistics.py.in
+++ b/src/statistics/test_gnunet_statistics.py.in
@@ -71,7 +71,6 @@ def restart ():
   time.sleep (1)
   t = r_arm (['-i', 'statistics'])
   time.sleep (1)
-  print ("DONE")
 
 
 cleanup ()
@@ -81,10 +80,9 @@ t = r_arm (['-s'], want_stdo = False)
 time.sleep (1)
 t = r_arm (['-i', 'statistics'], want_stdo = False)
 time.sleep (1)
-print ("DONE")
 
 print ("TEST: Bad argument checking...", end='')
-r_st (['-x'], normal = False, nofail = True, want_stdo = False)
+r_st (['-x'], normal = False, nofail = True, want_stdo = False, want_stde = True)
 print ("PASS")
 
 print ("TEST: Set value...", end='')
@@ -146,6 +144,5 @@ print ("PASS")
 print ("Stopping service...")
 t = r_arm (['-e'], want_stdo = False)
 time.sleep (1)
-print ("DONE")
 
 cleanup ()
diff --git a/src/util/test_crypto_ecc.c b/src/util/test_crypto_ecc.c
index 14794a34d..d8329a0ae 100644
--- a/src/util/test_crypto_ecc.c
+++ b/src/util/test_crypto_ecc.c
@@ -27,6 +27,7 @@
 #include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_signatures.h"
+#include <gcrypt.h>
 
 #define TESTSTRING "Hello World\0"
 #define MAX_TESTVAL sizeof(struct GNUNET_CRYPTO_AesSessionKey)