[GNUnet-SVN] r21821 - in gnunet/src: mesh testing

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21821 - in gnunet/src: mesh testing_old

From:	gnunet
Subject:	[GNUnet-SVN] r21821 - in gnunet/src: mesh testing_old
Date:	Sat, 9 Jun 2012 17:39:34 +0200
Author: grothoff
Date: 2012-06-09 17:39:34 +0200 (Sat, 09 Jun 2012)
New Revision: 21821

Added:
   gnunet/src/testing_old/testing_old.conf
Removed:
   gnunet/src/testing_old/testing.conf
Modified:
   gnunet/src/mesh/test_mesh_2dtorus.conf
   gnunet/src/mesh/test_mesh_small.conf
   gnunet/src/testing_old/Makefile.am
Log:
-fixes

Modified: gnunet/src/mesh/test_mesh_2dtorus.conf
===================================================================
--- gnunet/src/mesh/test_mesh_2dtorus.conf      2012-06-09 15:35:06 UTC (rev 
21820)
+++ gnunet/src/mesh/test_mesh_2dtorus.conf      2012-06-09 15:39:34 UTC (rev 
21821)
@@ -59,7 +59,7 @@
 # PREFIX = valgrind --leak-check=full
 # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
-[testing]
+[testing_old]
 NUM_PEERS = 16
 WEAKRANDOM = YES
 TOPOLOGY = 2D_TORUS

Modified: gnunet/src/mesh/test_mesh_small.conf
===================================================================
--- gnunet/src/mesh/test_mesh_small.conf        2012-06-09 15:35:06 UTC (rev 
21820)
+++ gnunet/src/mesh/test_mesh_small.conf        2012-06-09 15:39:34 UTC (rev 
21821)
@@ -62,6 +62,9 @@
 # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
 [testing]
+WEAKRANDOM = YES
+
+[testing_old]
 NUM_PEERS = 5
 WEAKRANDOM = YES
 TOPOLOGY = NONE

Modified: gnunet/src/testing_old/Makefile.am
===================================================================
--- gnunet/src/testing_old/Makefile.am  2012-06-09 15:35:06 UTC (rev 21820)
+++ gnunet/src/testing_old/Makefile.am  2012-06-09 15:39:34 UTC (rev 21821)
@@ -34,14 +34,14 @@
 endif
 
 lib_LTLIBRARIES = \
-  libgnunettestingold.la 
+  libgnunettesting_old.la 
 
-libgnunettestingold_la_SOURCES = \
+libgnunettesting_old_la_SOURCES = \
   helper.c \
   testing.c  \
   testing_group.c \
   testing_peergroup.c
-libgnunettestingold_la_LIBADD = $(XLIB) \
+libgnunettesting_old_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
@@ -49,7 +49,7 @@
  -lm \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
-libgnunettestingold_la_LDFLAGS = \
+libgnunettesting_old_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
  -version-info 0:1:0
 
@@ -97,94 +97,94 @@
 gnunet_testing_SOURCES = \
  gnunet-testing.c         
 gnunet_testing_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(GN_LIBINTL)
 gnunet_testing_DEPENDENCIES = \
- libgnunettestingold.la
+ libgnunettesting_old.la
 
 
 test_testing_SOURCES = \
  test_testing.c
 test_testing_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_testing_connect_SOURCES = \
  test_testing_connect.c
 test_testing_connect_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_testing_reconnect_SOURCES = \
  test_testing_reconnect.c
 test_testing_reconnect_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_testing_group_SOURCES = \
  test_testing_group.c
 test_testing_group_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_testing_peergroup_SOURCES = \
  test_testing_peergroup.c
 test_testing_peergroup_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 test_testing_topology_clique_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_topology_stability_SOURCES = \
  test_testing_topology.c
 test_testing_topology_stability_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_topology_blacklist_SOURCES = \
  test_testing_topology_blacklist.c
 test_testing_topology_blacklist_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 test_testing_topology_churn_SOURCES = \
  test_testing_topology_churn.c
 test_testing_topology_churn_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 test_testing_topology_clique_random_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_random_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_testing_topology_clique_minimum_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_minimum_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_topology_clique_dfs_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_dfs_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_testing_topology_line_SOURCES = \
  test_testing_topology.c
 test_testing_topology_line_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
@@ -192,68 +192,68 @@
 test_testing_group_remote_SOURCES = \
  test_testing_group_remote.c
 test_testing_group_remote_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_testing_2dtorus_SOURCES = \
   test_testing_2dtorus.c
 test_testing_2dtorus_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 test_testing_topology_ring_SOURCES = \
  test_testing_topology.c
 test_testing_topology_ring_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
 test_testing_topology_2d_torus_SOURCES = \
   test_testing_topology.c
 test_testing_topology_2d_torus_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 test_testing_topology_small_world_ring_SOURCES = \
   test_testing_topology.c
 test_testing_topology_small_world_ring_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_topology_small_world_torus_SOURCES = \
   test_testing_topology.c
 test_testing_topology_small_world_torus_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_topology_internat_SOURCES = \
   test_testing_topology.c
 test_testing_topology_internat_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_topology_erdos_renyi_SOURCES = \
   test_testing_topology.c
 test_testing_topology_erdos_renyi_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_topology_scale_free_SOURCES = \
   test_testing_topology.c
 test_testing_topology_scale_free_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 
 test_testing_topology_none_SOURCES = \
  test_testing_topology.c
 test_testing_topology_none_LDADD = \
- $(top_builddir)/src/testing_old/libgnunettestingold.la \
+ $(top_builddir)/src/testing_old/libgnunettesting_old.la \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/util/libgnunetutil.la
 

Deleted: gnunet/src/testing_old/testing.conf
===================================================================
--- gnunet/src/testing_old/testing.conf 2012-06-09 15:35:06 UTC (rev 21820)
+++ gnunet/src/testing_old/testing.conf 2012-06-09 15:39:34 UTC (rev 21821)
@@ -1,11 +0,0 @@
-[TESTING]
-# How long before failing a connection?
-CONNECT_TIMEOUT = 30 s
-# How many connect attempts should we make?
-CONNECT_ATTEMPTS = 3
-# How many connections can happen simultaneously?
-MAX_OUTSTANDING_CONNECTIONS = 50
-
-# Should we clean up the files on peer group shutdown?
-DELETE_FILES = YES
-

Copied: gnunet/src/testing_old/testing_old.conf (from rev 21820, 
gnunet/src/testing_old/testing.conf)
===================================================================
--- gnunet/src/testing_old/testing_old.conf                             (rev 0)
+++ gnunet/src/testing_old/testing_old.conf     2012-06-09 15:39:34 UTC (rev 
21821)
@@ -0,0 +1,11 @@
+[TESTING]
+# How long before failing a connection?
+CONNECT_TIMEOUT = 30 s
+# How many connect attempts should we make?
+CONNECT_ATTEMPTS = 3
+# How many connections can happen simultaneously?
+MAX_OUTSTANDING_CONNECTIONS = 50
+
+# Should we clean up the files on peer group shutdown?
+DELETE_FILES = YES
+
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r21821 - in gnunet/src: mesh testing_old, gnunet <=
Prev by Date: [GNUnet-SVN] r21820 - in gnunet: . src src/dht src/fs src/mesh src/nse src/testing src/testing_old src/topology
Next by Date: [GNUnet-SVN] r21822 - in gnunet/src: dht fs integration-tests mesh nse topology
Previous by thread: [GNUnet-SVN] r21820 - in gnunet: . src src/dht src/fs src/mesh src/nse src/testing src/testing_old src/topology
Next by thread: [GNUnet-SVN] r21822 - in gnunet/src: dht fs integration-tests mesh nse topology
Index(es):
- Date
- Thread