[GNUnet-SVN] r24686 - in gnunet/src: dht hostlist peerinfo-tool statistics util

[gnunet]

Author: grothoff
Date: 2012-11-03 20:17:51 +0100 (Sat, 03 Nov 2012)
New Revision: 24686

Modified:
   gnunet/src/dht/Makefile.am
   gnunet/src/hostlist/test_hostlist_defaults.conf
   gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
   gnunet/src/statistics/test_gnunet_statistics.py.in
   gnunet/src/util/test_crypto_ecc.c
Log:
-misc minor fixes

Modified: gnunet/src/dht/Makefile.am
===================================================================
--- gnunet/src/dht/Makefile.am  2012-11-03 19:10:54 UTC (rev 24685)
+++ gnunet/src/dht/Makefile.am  2012-11-03 19:17:51 UTC (rev 24686)
@@ -155,8 +155,8 @@
 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    

Modified: gnunet/src/hostlist/test_hostlist_defaults.conf
===================================================================
--- gnunet/src/hostlist/test_hostlist_defaults.conf     2012-11-03 19:10:54 UTC 
(rev 24685)
+++ gnunet/src/hostlist/test_hostlist_defaults.conf     2012-11-03 19:17:51 UTC 
(rev 24686)
@@ -65,3 +65,6 @@
 
 [lockmanager]
 AUTOSTART = NO
+
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
\ No newline at end of file

Modified: gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf
===================================================================
--- gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf     2012-11-03 
19:10:54 UTC (rev 24685)
+++ gnunet/src/peerinfo-tool/test_gnunet_peerinfo_data.conf     2012-11-03 
19:17:51 UTC (rev 24686)
@@ -32,4 +32,8 @@
 [nse]
 AUTOSTART = NO
 
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
 
+
+

Modified: gnunet/src/statistics/test_gnunet_statistics.py.in
===================================================================
--- gnunet/src/statistics/test_gnunet_statistics.py.in  2012-11-03 19:10:54 UTC 
(rev 24685)
+++ gnunet/src/statistics/test_gnunet_statistics.py.in  2012-11-03 19:17:51 UTC 
(rev 24686)
@@ -71,7 +71,6 @@
   time.sleep (1)
   t = r_arm (['-i', 'statistics'])
   time.sleep (1)
-  print ("DONE")
 
 
 cleanup ()
@@ -81,10 +80,9 @@
 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 ("Stopping service...")
 t = r_arm (['-e'], want_stdo = False)
 time.sleep (1)
-print ("DONE")
 
 cleanup ()

Modified: gnunet/src/util/test_crypto_ecc.c
===================================================================
--- gnunet/src/util/test_crypto_ecc.c   2012-11-03 19:10:54 UTC (rev 24685)
+++ gnunet/src/util/test_crypto_ecc.c   2012-11-03 19:17:51 UTC (rev 24686)
@@ -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)