From e0033c1da56e1889775d7dccf92ea78ee52e4d5c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 9 Jun 2012 15:35:06 +0000 Subject: [PATCH] -moving old testing code to legacy location --- configure.ac | 1 + src/Makefile.am | 3 +- src/dht/Makefile.am | 16 +- src/fs/Makefile.am | 16 +- src/mesh/Makefile.am | 10 +- src/nse/Makefile.am | 4 +- src/testing/Makefile.am | 267 +---------------- src/testing_old/Makefile.am | 283 ++++++++++++++++++ .../gnunet-testing-remote-peer-start.pl | 0 src/{testing => testing_old}/gnunet-testing.c | 0 src/{testing => testing_old}/helper.c | 0 src/{testing => testing_old}/test_testing.c | 0 .../test_testing_2dtorus.c | 0 .../test_testing_2dtorus.conf | 2 +- .../test_testing_connect.c | 0 .../test_testing_connect_peer1.conf | 0 .../test_testing_connect_peer2.conf | 0 .../test_testing_data.conf | 0 .../test_testing_data_remote.conf | 2 +- .../test_testing_data_topology_2d_torus.conf | 2 +- .../test_testing_data_topology_blacklist.conf | 2 +- .../test_testing_data_topology_churn.conf | 2 +- .../test_testing_data_topology_clique.conf | 2 +- ...test_testing_data_topology_clique_dfs.conf | 2 +- ..._testing_data_topology_clique_minimum.conf | 2 +- ...t_testing_data_topology_clique_random.conf | 2 +- ...est_testing_data_topology_erdos_renyi.conf | 2 +- .../test_testing_data_topology_internat.conf | 2 +- .../test_testing_data_topology_none.conf | 2 +- .../test_testing_data_topology_ring.conf | 2 +- ...test_testing_data_topology_scale_free.conf | 2 +- ...esting_data_topology_small_world_ring.conf | 2 +- ...sting_data_topology_small_world_torus.conf | 2 +- .../test_testing_data_topology_stability.conf | 2 +- .../test_testing_defaults.conf | 2 +- .../test_testing_group.c | 0 .../test_testing_group_remote.c | 0 .../test_testing_large_topology.c | 0 .../test_testing_peergroup.c | 0 .../test_testing_peergroup_data.conf | 2 +- .../test_testing_reconnect.c | 0 .../test_testing_topology.c | 0 .../test_testing_topology_blacklist.c | 0 .../test_testing_topology_churn.c | 0 src/{testing => testing_old}/testing.c | 2 +- src/testing_old/testing.conf | 11 + src/{testing => testing_old}/testing_group.c | 60 ++-- .../testing_peergroup.c | 50 ++-- src/topology/Makefile.am | 2 +- 49 files changed, 402 insertions(+), 361 deletions(-) create mode 100644 src/testing_old/Makefile.am rename src/{testing => testing_old}/gnunet-testing-remote-peer-start.pl (100%) rename src/{testing => testing_old}/gnunet-testing.c (100%) rename src/{testing => testing_old}/helper.c (100%) rename src/{testing => testing_old}/test_testing.c (100%) rename src/{testing => testing_old}/test_testing_2dtorus.c (100%) rename src/{testing => testing_old}/test_testing_2dtorus.conf (99%) rename src/{testing => testing_old}/test_testing_connect.c (100%) rename src/{testing => testing_old}/test_testing_connect_peer1.conf (100%) rename src/{testing => testing_old}/test_testing_connect_peer2.conf (100%) rename src/{testing => testing_old}/test_testing_data.conf (100%) rename src/{testing => testing_old}/test_testing_data_remote.conf (93%) rename src/{testing => testing_old}/test_testing_data_topology_2d_torus.conf (90%) rename src/{testing => testing_old}/test_testing_data_topology_blacklist.conf (94%) rename src/{testing => testing_old}/test_testing_data_topology_churn.conf (92%) rename src/{testing => testing_old}/test_testing_data_topology_clique.conf (93%) rename src/{testing => testing_old}/test_testing_data_topology_clique_dfs.conf (94%) rename src/{testing => testing_old}/test_testing_data_topology_clique_minimum.conf (93%) rename src/{testing => testing_old}/test_testing_data_topology_clique_random.conf (95%) rename src/{testing => testing_old}/test_testing_data_topology_erdos_renyi.conf (89%) rename src/{testing => testing_old}/test_testing_data_topology_internat.conf (89%) rename src/{testing => testing_old}/test_testing_data_topology_none.conf (96%) rename src/{testing => testing_old}/test_testing_data_topology_ring.conf (89%) rename src/{testing => testing_old}/test_testing_data_topology_scale_free.conf (93%) rename src/{testing => testing_old}/test_testing_data_topology_small_world_ring.conf (91%) rename src/{testing => testing_old}/test_testing_data_topology_small_world_torus.conf (89%) rename src/{testing => testing_old}/test_testing_data_topology_stability.conf (91%) rename src/{testing => testing_old}/test_testing_defaults.conf (98%) rename src/{testing => testing_old}/test_testing_group.c (100%) rename src/{testing => testing_old}/test_testing_group_remote.c (100%) rename src/{testing => testing_old}/test_testing_large_topology.c (100%) rename src/{testing => testing_old}/test_testing_peergroup.c (100%) rename src/{testing => testing_old}/test_testing_peergroup_data.conf (97%) rename src/{testing => testing_old}/test_testing_reconnect.c (100%) rename src/{testing => testing_old}/test_testing_topology.c (100%) rename src/{testing => testing_old}/test_testing_topology_blacklist.c (100%) rename src/{testing => testing_old}/test_testing_topology_churn.c (100%) rename src/{testing => testing_old}/testing.c (99%) create mode 100644 src/testing_old/testing.conf rename src/{testing => testing_old}/testing_group.c (99%) rename src/{testing => testing_old}/testing_peergroup.c (95%) diff --git a/configure.ac b/configure.ac index e7418a667..e711a12a9 100644 --- a/configure.ac +++ b/configure.ac @@ -1058,6 +1058,7 @@ src/stream/Makefile src/template/Makefile src/testbed/Makefile src/testing/Makefile +src/testing_old/Makefile src/topology/Makefile src/transport/Makefile src/transport/transport.conf diff --git a/src/Makefile.am b/src/Makefile.am index 37bcbf676..0afd18063 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,6 +28,7 @@ SUBDIRS = \ block \ statistics \ arm \ + testing \ peerinfo \ $(MYSQL_DIR) \ $(POSTGRES_DIR) \ @@ -41,7 +42,7 @@ SUBDIRS = \ transport \ peerinfo-tool \ core \ - testing \ + testing_old \ testbed \ nse \ dht \ diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 0ea452db1..0b840dc9a 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am @@ -141,7 +141,7 @@ test_dht_twopeer_SOURCES = \ test_dht_twopeer.c test_dht_twopeer_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/dht/libgnunetdht.la test_dht_twopeer_DEPENDENCIES = \ libgnunetdht.la @@ -150,21 +150,21 @@ test_dht_twopeer_put_get_SOURCES = \ test_dht_twopeer_put_get.c test_dht_twopeer_put_get_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/dht/libgnunetdht.la test_dht_twopeer_get_put_SOURCES = \ test_dht_twopeer_get_put.c test_dht_twopeer_get_put_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/dht/libgnunetdht.la test_dht_twopeer_path_tracking_SOURCES = \ test_dht_twopeer_path_tracking.c test_dht_twopeer_path_tracking_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/dht/libgnunetdht.la test_dht_multipeer_SOURCES = \ @@ -172,7 +172,7 @@ test_dht_multipeer_SOURCES = \ test_dht_multipeer_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/dht/libgnunetdht.la test_dht_multipeer_DEPENDENCIES = \ libgnunetdht.la @@ -181,7 +181,7 @@ test_dht_2dtorus_SOURCES = \ test_dht_topo.c test_dht_2dtorus_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/dht/libgnunetdht.la test_dht_2dtorus_DEPENDENCIES = \ libgnunetdht.la @@ -190,7 +190,7 @@ test_dht_line_SOURCES = \ test_dht_topo.c test_dht_line_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/dht/libgnunetdht.la test_dht_line_DEPENDENCIES = \ libgnunetdht.la @@ -198,7 +198,7 @@ test_dht_line_DEPENDENCIES = \ test_dht_monitor_SOURCES = test_dht_monitor.c test_dht_monitor_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/dht/libgnunetdht.la test_dht_monitor_DEPENDENCIES = \ libgnunetdht.la diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index f68cad75b..c88427d83 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am @@ -57,7 +57,7 @@ libgnunetfstest_a_SOURCES = \ fs_test_lib.c fs_test_lib.h libgnunetfstest_a_LIBADD = \ - $(top_builddir)/src/testing/libgnunettesting.la + $(top_builddir)/src/testing_old/libgnunettesting_old.la bin_PROGRAMS = \ gnunet-directory \ @@ -375,7 +375,7 @@ test_fs_test_lib_SOURCES = \ test_fs_test_lib.c test_fs_test_lib_LDADD = \ $(top_builddir)/src/fs/libgnunetfstest.a \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/fs/libgnunetfs.la \ $(top_builddir)/src/util/libgnunetutil.la @@ -383,7 +383,7 @@ test_gnunet_service_fs_p2p_SOURCES = \ test_gnunet_service_fs_p2p.c test_gnunet_service_fs_p2p_LDADD = \ $(top_builddir)/src/fs/libgnunetfstest.a \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/fs/libgnunetfs.la \ $(top_builddir)/src/util/libgnunetutil.la @@ -391,7 +391,7 @@ test_gnunet_service_fs_migration_SOURCES = \ test_gnunet_service_fs_migration.c test_gnunet_service_fs_migration_LDADD = \ $(top_builddir)/src/fs/libgnunetfstest.a \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/fs/libgnunetfs.la \ $(top_builddir)/src/util/libgnunetutil.la @@ -400,7 +400,7 @@ perf_gnunet_service_fs_p2p_SOURCES = \ perf_gnunet_service_fs_p2p_LDADD = \ $(top_builddir)/src/fs/libgnunetfstest.a \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/fs/libgnunetfs.la \ $(top_builddir)/src/util/libgnunetutil.la @@ -409,7 +409,7 @@ perf_gnunet_service_fs_p2p_index_SOURCES = \ perf_gnunet_service_fs_p2p_index_LDADD = \ $(top_builddir)/src/fs/libgnunetfstest.a \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/fs/libgnunetfs.la \ $(top_builddir)/src/util/libgnunetutil.la @@ -418,7 +418,7 @@ perf_gnunet_service_fs_p2p_dht_SOURCES = \ perf_gnunet_service_fs_p2p_dht_LDADD = \ $(top_builddir)/src/fs/libgnunetfstest.a \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/fs/libgnunetfs.la \ $(top_builddir)/src/util/libgnunetutil.la @@ -427,7 +427,7 @@ perf_gnunet_service_fs_p2p_trust_SOURCES = \ perf_gnunet_service_fs_p2p_trust_LDADD = \ $(top_builddir)/src/fs/libgnunetfstest.a \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/fs/libgnunetfs.la \ $(top_builddir)/src/util/libgnunetutil.la diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index 4c5dbb5d9..e116b889a 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -105,14 +105,14 @@ test_mesh_2dtorus_SOURCES = \ test_mesh_2dtorus.c test_mesh_2dtorus_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la + $(top_builddir)/src/testing_old/libgnunettesting_old.la test_mesh_small_unicast_SOURCES = \ test_mesh_small.c test_mesh_small_unicast_LDADD = \ $(top_builddir)/src/mesh/libgnunetmesh.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la + $(top_builddir)/src/testing_old/libgnunettesting_old.la test_mesh_small_unicast_DEPENDENCIES = \ libgnunetmesh.la @@ -121,7 +121,7 @@ test_mesh_small_multicast_SOURCES = \ test_mesh_small_multicast_LDADD = \ $(top_builddir)/src/mesh/libgnunetmesh.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la + $(top_builddir)/src/testing_old/libgnunettesting_old.la test_mesh_small_multicast_DEPENDENCIES = \ libgnunetmesh.la @@ -130,7 +130,7 @@ test_mesh_small_speed_SOURCES = \ test_mesh_small_speed_LDADD = \ $(top_builddir)/src/mesh/libgnunetmesh.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la + $(top_builddir)/src/testing_old/libgnunettesting_old.la test_mesh_small_speed_DEPENDENCIES = \ libgnunetmesh.la @@ -139,7 +139,7 @@ test_mesh_small_speed_ack_SOURCES = \ test_mesh_small_speed_ack_LDADD = \ $(top_builddir)/src/mesh/libgnunetmesh.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la + $(top_builddir)/src/testing_old/libgnunettesting_old.la test_mesh_small_speed_ack_DEPENDENCIES = \ libgnunetmesh.la diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index 054a77663..2011661cf 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am @@ -39,7 +39,7 @@ gnunet_nse_profiler_LDADD = -lm \ $(top_builddir)/src/nse/libgnunetnse.la \ $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(GN_LIBINTL) gnunet_nse_profiler_DEPENDENCIES = \ libgnunetnse.la @@ -80,7 +80,7 @@ test_nse_multipeer_SOURCES = \ test_nse_multipeer_LDADD = \ $(top_builddir)/src/nse/libgnunetnse.la \ $(top_builddir)/src/util/libgnunetutil.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ -lm EXTRA_DIST = \ diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 455df6989..dcefc34d1 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -14,301 +14,46 @@ pkgcfgdir= $(pkgdatadir)/config.d/ dist_pkgcfg_DATA = \ testing.conf -if HAVE_EXPENSIVE_TESTS - EXPENSIVE_TESTS = \ - test_testing_topology_stability \ - test_testing_topology_clique_random \ - test_testing_topology_clique_minimum \ - test_testing_topology_clique_dfs \ - test_testing_topology_churn \ - test_testing_topology_line \ - test_testing_topology_blacklist \ - test_testing_group_remote \ - test_testing_topology_ring \ - test_testing_topology_2d_torus \ - test_testing_topology_small_world_ring \ - test_testing_topology_small_world_torus \ - test_testing_topology_erdos_renyi \ - test_testing_topology_internat \ - test_testing_topology_scale_free -endif - lib_LTLIBRARIES = \ - libgnunettesting.la \ - libgnunettesting_new.la + libgnunettesting.la libgnunettesting_la_SOURCES = \ - helper.c \ - testing.c \ - testing_group.c \ - testing_peergroup.c -libgnunettesting_la_LIBADD = $(XLIB) \ - $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/hello/libgnunethello.la \ - -lm \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(LTLIBINTL) -libgnunettesting_la_LDFLAGS = \ - $(GN_LIB_LDFLAGS) \ - -version-info 0:1:0 - - -libgnunettesting_new_la_SOURCES = \ testing_new.c -libgnunettesting_new_la_LIBADD = \ +libgnunettesting_la_LIBADD = \ $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) -libgnunettesting_new_la_LDFLAGS = \ +libgnunettesting_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ -version-info 0:1:0 -bin_PROGRAMS = \ - gnunet-testing - check_PROGRAMS = \ - test_testing \ - test_testing_connect \ - test_testing_reconnect \ - test_testing_group \ - test_testing_peergroup \ - test_testing_topology_stability \ - test_testing_topology_clique \ - test_testing_topology_clique_random \ - test_testing_topology_clique_minimum \ - test_testing_topology_clique_dfs \ - test_testing_topology_churn \ - test_testing_topology_line \ - test_testing_topology_blacklist \ - test_testing_group_remote \ - test_testing_2dtorus \ - test_testing_topology_ring \ - test_testing_topology_2d_torus \ - test_testing_topology_small_world_ring \ - test_testing_topology_small_world_torus \ - test_testing_topology_erdos_renyi \ - test_testing_topology_internat \ - test_testing_topology_none \ - test_testing_topology_scale_free \ test_testing_new_portreservation \ test_testing_new_peerstartup \ test_testing_new_servicestartup if ENABLE_TEST_RUN TESTS = \ - test_testing \ - test_testing_connect \ - test_testing_reconnect \ - test_testing_group \ - test_testing_peergroup \ test_testing_new_portreservation \ test_testing_new_peerstartup \ test_testing_new_servicestartup endif -gnunet_testing_SOURCES = \ - gnunet-testing.c -gnunet_testing_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBINTL) -gnunet_testing_DEPENDENCIES = \ - libgnunettesting.la - - -test_testing_SOURCES = \ - test_testing.c -test_testing_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - -test_testing_connect_SOURCES = \ - test_testing_connect.c -test_testing_connect_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - -test_testing_reconnect_SOURCES = \ - test_testing_reconnect.c -test_testing_reconnect_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - -test_testing_group_SOURCES = \ - test_testing_group.c -test_testing_group_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - -test_testing_peergroup_SOURCES = \ - test_testing_peergroup.c -test_testing_peergroup_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.la \ - $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/util/libgnunetutil.la - - -test_testing_group_remote_SOURCES = \ - test_testing_group_remote.c -test_testing_group_remote_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - -test_testing_2dtorus_SOURCES = \ - test_testing_2dtorus.c -test_testing_2dtorus_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.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/libgnunettesting.la \ - $(top_builddir)/src/core/libgnunetcore.la \ - $(top_builddir)/src/util/libgnunetutil.la - test_testing_new_portreservation_SOURCES = \ test_testing_new_portreservation.c test_testing_new_portreservation_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting_new.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_testing_new_peerstartup_SOURCES = \ test_testing_new_peerstartup.c test_testing_new_peerstartup_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting_new.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la test_testing_new_servicestartup_SOURCES = \ test_testing_new_servicestartup.c test_testing_new_servicestartup_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting_new.la \ + $(top_builddir)/src/testing/libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la -EXTRA_DIST = \ - test_testing_defaults.conf \ - test_testing_data.conf \ - test_testing_connect_peer1.conf \ - test_testing_connect_peer2.conf \ - test_testing_2dtorus.conf \ - test_testing_data_topology_clique.conf \ - test_testing_data_topology_clique_random.conf \ - test_testing_data_topology_clique_minimum.conf \ - test_testing_data_topology_clique_dfs.conf \ - test_testing_data_topology_ring.conf \ - test_testing_data_topology_2d_torus.conf \ - test_testing_data_topology_small_world_ring.conf \ - test_testing_data_topology_small_world_torus.conf \ - test_testing_data_topology_erdos_renyi.conf \ - test_testing_data_topology_internat.conf \ - test_testing_data_topology_scale_free.conf \ - test_testing_data_topology_blacklist.conf \ - test_testing_data_topology_churn.conf \ - test_testing_data_topology_none.conf \ - test_testing_data_remote.conf \ - test_testing_data_topology_stability.conf \ - test_testing_peergroup_data.conf diff --git a/src/testing_old/Makefile.am b/src/testing_old/Makefile.am new file mode 100644 index 000000000..298483189 --- /dev/null +++ b/src/testing_old/Makefile.am @@ -0,0 +1,283 @@ +INCLUDES = -I$(top_srcdir)/src/include + +if MINGW + WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols +endif + +if USE_COVERAGE + AM_CFLAGS = --coverage -O0 + XLIB = -lgcov +endif + +pkgcfgdir= $(pkgdatadir)/config.d/ + +dist_pkgcfg_DATA = \ + testing_old.conf + +if HAVE_EXPENSIVE_TESTS + EXPENSIVE_TESTS = \ + test_testing_topology_stability \ + test_testing_topology_clique_random \ + test_testing_topology_clique_minimum \ + test_testing_topology_clique_dfs \ + test_testing_topology_churn \ + test_testing_topology_line \ + test_testing_topology_blacklist \ + test_testing_group_remote \ + test_testing_topology_ring \ + test_testing_topology_2d_torus \ + test_testing_topology_small_world_ring \ + test_testing_topology_small_world_torus \ + test_testing_topology_erdos_renyi \ + test_testing_topology_internat \ + test_testing_topology_scale_free +endif + +lib_LTLIBRARIES = \ + libgnunettestingold.la + +libgnunettestingold_la_SOURCES = \ + helper.c \ + testing.c \ + testing_group.c \ + testing_peergroup.c +libgnunettestingold_la_LIBADD = $(XLIB) \ + $(top_builddir)/src/core/libgnunetcore.la \ + $(top_builddir)/src/statistics/libgnunetstatistics.la \ + $(top_builddir)/src/transport/libgnunettransport.la \ + $(top_builddir)/src/hello/libgnunethello.la \ + -lm \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(LTLIBINTL) +libgnunettestingold_la_LDFLAGS = \ + $(GN_LIB_LDFLAGS) \ + -version-info 0:1:0 + + +bin_PROGRAMS = \ + gnunet-testing + +check_PROGRAMS = \ + test_testing \ + test_testing_connect \ + test_testing_reconnect \ + test_testing_group \ + test_testing_peergroup \ + test_testing_topology_stability \ + test_testing_topology_clique \ + test_testing_topology_clique_random \ + test_testing_topology_clique_minimum \ + test_testing_topology_clique_dfs \ + test_testing_topology_churn \ + test_testing_topology_line \ + test_testing_topology_blacklist \ + test_testing_group_remote \ + test_testing_2dtorus \ + test_testing_topology_ring \ + test_testing_topology_2d_torus \ + test_testing_topology_small_world_ring \ + test_testing_topology_small_world_torus \ + test_testing_topology_erdos_renyi \ + test_testing_topology_internat \ + test_testing_topology_none \ + test_testing_topology_scale_free + +if ENABLE_TEST_RUN +TESTS = \ + test_testing \ + test_testing_connect \ + test_testing_reconnect \ + test_testing_group \ + test_testing_peergroup \ + test_testing_new_portreservation \ + test_testing_new_peerstartup \ + test_testing_new_servicestartup +endif + +gnunet_testing_SOURCES = \ + gnunet-testing.c +gnunet_testing_LDADD = \ + $(top_builddir)/src/testing_old/libgnunettestingold.la \ + $(top_builddir)/src/util/libgnunetutil.la \ + $(GN_LIBINTL) +gnunet_testing_DEPENDENCIES = \ + libgnunettestingold.la + + +test_testing_SOURCES = \ + test_testing.c +test_testing_LDADD = \ + $(top_builddir)/src/testing_old/libgnunettestingold.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/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/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/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/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/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/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/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/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/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/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/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/core/libgnunetcore.la \ + $(top_builddir)/src/util/libgnunetutil.la + + +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/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/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/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/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/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/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/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/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/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/core/libgnunetcore.la \ + $(top_builddir)/src/util/libgnunetutil.la + + +EXTRA_DIST = \ + test_testing_defaults.conf \ + test_testing_data.conf \ + test_testing_connect_peer1.conf \ + test_testing_connect_peer2.conf \ + test_testing_2dtorus.conf \ + test_testing_data_topology_clique.conf \ + test_testing_data_topology_clique_random.conf \ + test_testing_data_topology_clique_minimum.conf \ + test_testing_data_topology_clique_dfs.conf \ + test_testing_data_topology_ring.conf \ + test_testing_data_topology_2d_torus.conf \ + test_testing_data_topology_small_world_ring.conf \ + test_testing_data_topology_small_world_torus.conf \ + test_testing_data_topology_erdos_renyi.conf \ + test_testing_data_topology_internat.conf \ + test_testing_data_topology_scale_free.conf \ + test_testing_data_topology_blacklist.conf \ + test_testing_data_topology_churn.conf \ + test_testing_data_topology_none.conf \ + test_testing_data_remote.conf \ + test_testing_data_topology_stability.conf \ + test_testing_peergroup_data.conf diff --git a/src/testing/gnunet-testing-remote-peer-start.pl b/src/testing_old/gnunet-testing-remote-peer-start.pl similarity index 100% rename from src/testing/gnunet-testing-remote-peer-start.pl rename to src/testing_old/gnunet-testing-remote-peer-start.pl diff --git a/src/testing/gnunet-testing.c b/src/testing_old/gnunet-testing.c similarity index 100% rename from src/testing/gnunet-testing.c rename to src/testing_old/gnunet-testing.c diff --git a/src/testing/helper.c b/src/testing_old/helper.c similarity index 100% rename from src/testing/helper.c rename to src/testing_old/helper.c diff --git a/src/testing/test_testing.c b/src/testing_old/test_testing.c similarity index 100% rename from src/testing/test_testing.c rename to src/testing_old/test_testing.c diff --git a/src/testing/test_testing_2dtorus.c b/src/testing_old/test_testing_2dtorus.c similarity index 100% rename from src/testing/test_testing_2dtorus.c rename to src/testing_old/test_testing_2dtorus.c diff --git a/src/testing/test_testing_2dtorus.conf b/src/testing_old/test_testing_2dtorus.conf similarity index 99% rename from src/testing/test_testing_2dtorus.conf rename to src/testing_old/test_testing_2dtorus.conf index 54bb7c5a7..d69969f1a 100644 --- a/src/testing/test_testing_2dtorus.conf +++ b/src/testing_old/test_testing_2dtorus.conf @@ -53,7 +53,7 @@ PORT = 10003 AUTOSTART = YES PORT = 10004 -[testing] +[testing_old] NUM_PEERS = 16 WEAKRANDOM = YES TOPOLOGY = 2D_TORUS diff --git a/src/testing/test_testing_connect.c b/src/testing_old/test_testing_connect.c similarity index 100% rename from src/testing/test_testing_connect.c rename to src/testing_old/test_testing_connect.c diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing_old/test_testing_connect_peer1.conf similarity index 100% rename from src/testing/test_testing_connect_peer1.conf rename to src/testing_old/test_testing_connect_peer1.conf diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing_old/test_testing_connect_peer2.conf similarity index 100% rename from src/testing/test_testing_connect_peer2.conf rename to src/testing_old/test_testing_connect_peer2.conf diff --git a/src/testing/test_testing_data.conf b/src/testing_old/test_testing_data.conf similarity index 100% rename from src/testing/test_testing_data.conf rename to src/testing_old/test_testing_data.conf diff --git a/src/testing/test_testing_data_remote.conf b/src/testing_old/test_testing_data_remote.conf similarity index 93% rename from src/testing/test_testing_data_remote.conf rename to src/testing_old/test_testing_data_remote.conf index d58666f31..477baad7e 100644 --- a/src/testing/test_testing_data_remote.conf +++ b/src/testing_old/test_testing_data_remote.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_remote.conf -[TESTING] +[TESTING_old] CONTROL_HOST = 127.0.0.1 HOSTFILE = remote_hosts.txt MAX_OUTSTANDING_SSH = 5 diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing_old/test_testing_data_topology_2d_torus.conf similarity index 90% rename from src/testing/test_testing_data_topology_2d_torus.conf rename to src/testing_old/test_testing_data_topology_2d_torus.conf index cbdaceb5a..62fff6925 100644 --- a/src/testing/test_testing_data_topology_2d_torus.conf +++ b/src/testing_old/test_testing_data_topology_2d_torus.conf @@ -2,6 +2,6 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_2d_torus.conf -[TESTING] +[TESTING_old] NUM_PEERS = 13 TOPOLOGY = 2D_TORUS diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing_old/test_testing_data_topology_blacklist.conf similarity index 94% rename from src/testing/test_testing_data_topology_blacklist.conf rename to src/testing_old/test_testing_data_topology_blacklist.conf index 36e378d42..28e61301a 100644 --- a/src/testing/test_testing_data_topology_blacklist.conf +++ b/src/testing_old/test_testing_data_topology_blacklist.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_blacklist.conf -[TESTING] +[TESTING_old] NUM_PEERS = 4 TOPOLOGY = CLIQUE BLACKLIST_TOPOLOGY = RING diff --git a/src/testing/test_testing_data_topology_churn.conf b/src/testing_old/test_testing_data_topology_churn.conf similarity index 92% rename from src/testing/test_testing_data_topology_churn.conf rename to src/testing_old/test_testing_data_topology_churn.conf index b3371658d..ae46bf0e6 100644 --- a/src/testing/test_testing_data_topology_churn.conf +++ b/src/testing_old/test_testing_data_topology_churn.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_churn.conf -[TESTING] +[TESTING_old] NUM_PEERS = 12 [arm] diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing_old/test_testing_data_topology_clique.conf similarity index 93% rename from src/testing/test_testing_data_topology_clique.conf rename to src/testing_old/test_testing_data_topology_clique.conf index 69cecb7e9..c71a4b6c2 100644 --- a/src/testing/test_testing_data_topology_clique.conf +++ b/src/testing_old/test_testing_data_topology_clique.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] CONNECT_TIMEOUT = 180 s CONNECT_ATTEMPTS = 14 NUM_PEERS = 4 diff --git a/src/testing/test_testing_data_topology_clique_dfs.conf b/src/testing_old/test_testing_data_topology_clique_dfs.conf similarity index 94% rename from src/testing/test_testing_data_topology_clique_dfs.conf rename to src/testing_old/test_testing_data_topology_clique_dfs.conf index c7abeae5e..349c398ed 100644 --- a/src/testing/test_testing_data_topology_clique_dfs.conf +++ b/src/testing_old/test_testing_data_topology_clique_dfs.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] NUM_PEERS = 7 TOPOLOGY = CLIQUE CONNECT_TOPOLOGY_OPTION = CONNECT_DFS diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing_old/test_testing_data_topology_clique_minimum.conf similarity index 93% rename from src/testing/test_testing_data_topology_clique_minimum.conf rename to src/testing_old/test_testing_data_topology_clique_minimum.conf index ef95cb1fd..8d8206d33 100644 --- a/src/testing/test_testing_data_topology_clique_minimum.conf +++ b/src/testing_old/test_testing_data_topology_clique_minimum.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] NUM_PEERS = 20 TOPOLOGY = CLIQUE CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM diff --git a/src/testing/test_testing_data_topology_clique_random.conf b/src/testing_old/test_testing_data_topology_clique_random.conf similarity index 95% rename from src/testing/test_testing_data_topology_clique_random.conf rename to src/testing_old/test_testing_data_topology_clique_random.conf index cd44b65f0..d76175291 100644 --- a/src/testing/test_testing_data_topology_clique_random.conf +++ b/src/testing_old/test_testing_data_topology_clique_random.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] NUM_PEERS = 20 TOPOLOGY = CLIQUE CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET diff --git a/src/testing/test_testing_data_topology_erdos_renyi.conf b/src/testing_old/test_testing_data_topology_erdos_renyi.conf similarity index 89% rename from src/testing/test_testing_data_topology_erdos_renyi.conf rename to src/testing_old/test_testing_data_topology_erdos_renyi.conf index 8e1741352..ece17e505 100644 --- a/src/testing/test_testing_data_topology_erdos_renyi.conf +++ b/src/testing_old/test_testing_data_topology_erdos_renyi.conf @@ -2,6 +2,6 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] TOPOLOGY = ERDOS_RENYI diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing_old/test_testing_data_topology_internat.conf similarity index 89% rename from src/testing/test_testing_data_topology_internat.conf rename to src/testing_old/test_testing_data_topology_internat.conf index af3f62f39..14475ce55 100644 --- a/src/testing/test_testing_data_topology_internat.conf +++ b/src/testing_old/test_testing_data_topology_internat.conf @@ -2,6 +2,6 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] TOPOLOGY = INTERNAT diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing_old/test_testing_data_topology_none.conf similarity index 96% rename from src/testing/test_testing_data_topology_none.conf rename to src/testing_old/test_testing_data_topology_none.conf index dbee5d0b9..38e658680 100644 --- a/src/testing/test_testing_data_topology_none.conf +++ b/src/testing_old/test_testing_data_topology_none.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] NUM_PEERS = 1000 TOPOLOGY = NONE F2F = NO diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing_old/test_testing_data_topology_ring.conf similarity index 89% rename from src/testing/test_testing_data_topology_ring.conf rename to src/testing_old/test_testing_data_topology_ring.conf index 6159030f4..5320ae068 100644 --- a/src/testing/test_testing_data_topology_ring.conf +++ b/src/testing_old/test_testing_data_topology_ring.conf @@ -2,6 +2,6 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] TOPOLOGY = RING diff --git a/src/testing/test_testing_data_topology_scale_free.conf b/src/testing_old/test_testing_data_topology_scale_free.conf similarity index 93% rename from src/testing/test_testing_data_topology_scale_free.conf rename to src/testing_old/test_testing_data_topology_scale_free.conf index 7690eac29..ae7233588 100644 --- a/src/testing/test_testing_data_topology_scale_free.conf +++ b/src/testing_old/test_testing_data_topology_scale_free.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_scale_free.conf -[TESTING] +[TESTING_old] NUM_PEERS = 50 TOPOLOGY = SCALE_FREE diff --git a/src/testing/test_testing_data_topology_small_world_ring.conf b/src/testing_old/test_testing_data_topology_small_world_ring.conf similarity index 91% rename from src/testing/test_testing_data_topology_small_world_ring.conf rename to src/testing_old/test_testing_data_topology_small_world_ring.conf index 01931df6d..10e398fa0 100644 --- a/src/testing/test_testing_data_topology_small_world_ring.conf +++ b/src/testing_old/test_testing_data_topology_small_world_ring.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] NUM_PEERS = 25 TOPOLOGY = SMALL_WORLD_RING diff --git a/src/testing/test_testing_data_topology_small_world_torus.conf b/src/testing_old/test_testing_data_topology_small_world_torus.conf similarity index 89% rename from src/testing/test_testing_data_topology_small_world_torus.conf rename to src/testing_old/test_testing_data_topology_small_world_torus.conf index 7c35454de..d5a58b760 100644 --- a/src/testing/test_testing_data_topology_small_world_torus.conf +++ b/src/testing_old/test_testing_data_topology_small_world_torus.conf @@ -2,6 +2,6 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] TOPOLOGY = SMALL_WORLD diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing_old/test_testing_data_topology_stability.conf similarity index 91% rename from src/testing/test_testing_data_topology_stability.conf rename to src/testing_old/test_testing_data_topology_stability.conf index 1bfcd1bde..389c0aa25 100644 --- a/src/testing/test_testing_data_topology_stability.conf +++ b/src/testing_old/test_testing_data_topology_stability.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_data_topology_clique.conf -[TESTING] +[TESTING_old] SETTLE_TIME = 600 s NUM_PEERS = 2 TOPOLOGY = CLIQUE diff --git a/src/testing/test_testing_defaults.conf b/src/testing_old/test_testing_defaults.conf similarity index 98% rename from src/testing/test_testing_defaults.conf rename to src/testing_old/test_testing_defaults.conf index ba7e269a6..a89064f81 100644 --- a/src/testing/test_testing_defaults.conf +++ b/src/testing_old/test_testing_defaults.conf @@ -26,7 +26,7 @@ PORT = 2569 [core] PORT = 2570 -[testing] +[testing_old] NUM_PEERS = 5 WEAKRANDOM = YES F2F = YES diff --git a/src/testing/test_testing_group.c b/src/testing_old/test_testing_group.c similarity index 100% rename from src/testing/test_testing_group.c rename to src/testing_old/test_testing_group.c diff --git a/src/testing/test_testing_group_remote.c b/src/testing_old/test_testing_group_remote.c similarity index 100% rename from src/testing/test_testing_group_remote.c rename to src/testing_old/test_testing_group_remote.c diff --git a/src/testing/test_testing_large_topology.c b/src/testing_old/test_testing_large_topology.c similarity index 100% rename from src/testing/test_testing_large_topology.c rename to src/testing_old/test_testing_large_topology.c diff --git a/src/testing/test_testing_peergroup.c b/src/testing_old/test_testing_peergroup.c similarity index 100% rename from src/testing/test_testing_peergroup.c rename to src/testing_old/test_testing_peergroup.c diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing_old/test_testing_peergroup_data.conf similarity index 97% rename from src/testing/test_testing_peergroup_data.conf rename to src/testing_old/test_testing_peergroup_data.conf index 6eadede95..880cebf86 100644 --- a/src/testing/test_testing_peergroup_data.conf +++ b/src/testing_old/test_testing_peergroup_data.conf @@ -2,7 +2,7 @@ [PATHS] DEFAULTCONFIG = test_testing_peergroup_data.conf -[TESTING] +[TESTING_old] CONNECT_ATTEMPTS = 2 MAX_OUTSTANDING_CONNECTIONS = 20 MAX_CONCURRENT_SSH = 1 diff --git a/src/testing/test_testing_reconnect.c b/src/testing_old/test_testing_reconnect.c similarity index 100% rename from src/testing/test_testing_reconnect.c rename to src/testing_old/test_testing_reconnect.c diff --git a/src/testing/test_testing_topology.c b/src/testing_old/test_testing_topology.c similarity index 100% rename from src/testing/test_testing_topology.c rename to src/testing_old/test_testing_topology.c diff --git a/src/testing/test_testing_topology_blacklist.c b/src/testing_old/test_testing_topology_blacklist.c similarity index 100% rename from src/testing/test_testing_topology_blacklist.c rename to src/testing_old/test_testing_topology_blacklist.c diff --git a/src/testing/test_testing_topology_churn.c b/src/testing_old/test_testing_topology_churn.c similarity index 100% rename from src/testing/test_testing_topology_churn.c rename to src/testing_old/test_testing_topology_churn.c diff --git a/src/testing/testing.c b/src/testing_old/testing.c similarity index 99% rename from src/testing/testing.c rename to src/testing_old/testing.c index a80ad25cf..5456d56cb 100644 --- a/src/testing/testing.c +++ b/src/testing_old/testing.c @@ -1150,7 +1150,7 @@ GNUNET_TESTING_daemon_start (const struct GNUNET_CONFIGURATION_Handle *cfg, username = GNUNET_strdup (ssh_username); if ((ssh_username == NULL) && (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING", "USERNAME", + GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING_OLD", "USERNAME", &username))) { if (NULL != getenv ("USER")) diff --git a/src/testing_old/testing.conf b/src/testing_old/testing.conf new file mode 100644 index 000000000..7e25f8c13 --- /dev/null +++ b/src/testing_old/testing.conf @@ -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 + diff --git a/src/testing/testing_group.c b/src/testing_old/testing_group.c similarity index 99% rename from src/testing/testing_group.c rename to src/testing_old/testing_group.c index 75c0e617d..3ba7c5cce 100644 --- a/src/testing/testing_group.c +++ b/src/testing_old/testing_group.c @@ -1355,7 +1355,7 @@ update_config (void *cls, const char *section, const char *option, { if ((ival != 0) && (GNUNET_YES != - GNUNET_CONFIGURATION_get_value_yesno (ctx->orig, "testing", + GNUNET_CONFIGURATION_get_value_yesno (ctx->orig, "testing_old", single_variable))) { GNUNET_snprintf (cval, sizeof (cval), "%u", ctx->nport++); @@ -1363,9 +1363,9 @@ update_config (void *cls, const char *section, const char *option, } else if ((ival != 0) && (GNUNET_YES == - GNUNET_CONFIGURATION_get_value_yesno (ctx->orig, "testing", + GNUNET_CONFIGURATION_get_value_yesno (ctx->orig, "testing_old", single_variable)) && - GNUNET_CONFIGURATION_get_value_number (ctx->orig, "testing", + GNUNET_CONFIGURATION_get_value_number (ctx->orig, "testing_old", per_host_variable, &num_per_host)) { @@ -1383,7 +1383,7 @@ update_config (void *cls, const char *section, const char *option, if (0 == strcmp (option, "UNIXPATH")) { if (GNUNET_YES != - GNUNET_CONFIGURATION_get_value_yesno (ctx->orig, "testing", + GNUNET_CONFIGURATION_get_value_yesno (ctx->orig, "testing_old", single_variable)) { GNUNET_snprintf (uval, sizeof (uval), "/tmp/test-service-%s-%u", section, @@ -1391,7 +1391,7 @@ update_config (void *cls, const char *section, const char *option, value = uval; } else if ((GNUNET_YES == - GNUNET_CONFIGURATION_get_value_number (ctx->orig, "testing", + GNUNET_CONFIGURATION_get_value_number (ctx->orig, "testing_old", per_host_variable, &num_per_host)) && (num_per_host > 0)) @@ -1459,7 +1459,7 @@ GNUNET_TESTING_create_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg, uint32 } if ((GNUNET_OK == - GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "skew_variance", + GNUNET_CONFIGURATION_get_value_number (cfg, "testing_old", "skew_variance", &skew_variance)) && (skew_variance > 0)) { @@ -1471,12 +1471,12 @@ GNUNET_TESTING_create_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg, uint32 skew_variance + 1); /* Min is -skew_variance, Max is skew_variance */ skew_offset = skew_variance + actual_offset; /* Normal distribution around 0 */ - GNUNET_CONFIGURATION_set_value_number (uc.ret, "testing", "skew_offset", + GNUNET_CONFIGURATION_set_value_number (uc.ret, "testing_old", "skew_offset", skew_offset); } if (GNUNET_CONFIGURATION_get_value_string - (cfg, "testing", "control_host", &control_host) == GNUNET_OK) + (cfg, "testing_old", "control_host", &control_host) == GNUNET_OK) { if (hostname != NULL) GNUNET_asprintf (&allowed_hosts, "%s; 127.0.0.1; %s;", control_host, @@ -1886,26 +1886,26 @@ create_small_world_ring (struct GNUNET_TESTING_PeerGroup *pg, logNModifier = 0.5; /* FIXME: default value? */ if (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING", "PERCENTAGE", + GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING_OLD", "PERCENTAGE", &p_string)) { if (SSCANF (p_string, "%lf", &logNModifier) != 1) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"), - p_string, "LOGNMODIFIER", "TESTING"); + p_string, "LOGNMODIFIER", "TESTING_OLD"); GNUNET_free (p_string); } probability = 0.5; /* FIXME: default percentage? */ if (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING", "PROBABILITY", + GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING_OLD", "PROBABILITY", &p_string)) { if (SSCANF (p_string, "%lf", &probability) != 1) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"), - p_string, "PERCENTAGE", "TESTING"); + p_string, "PERCENTAGE", "TESTING_OLD"); GNUNET_free (p_string); } natLog = log (pg->total); @@ -1999,14 +1999,14 @@ create_nated_internet (struct GNUNET_TESTING_PeerGroup *pg, nat_percentage = 0.6; /* FIXME: default percentage? */ if (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING", "PERCENTAGE", + GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING_OLD", "PERCENTAGE", &p_string)) { if (SSCANF (p_string, "%lf", &nat_percentage) != 1) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"), - p_string, "PERCENTAGE", "TESTING"); + p_string, "PERCENTAGE", "TESTING_OLD"); GNUNET_free (p_string); } @@ -2056,14 +2056,14 @@ create_nated_internet_copy (struct GNUNET_TESTING_PeerGroup *pg, nat_percentage = 0.6; /* FIXME: default percentage? */ if (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING", "PERCENTAGE", + GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING_OLD", "PERCENTAGE", &p_string)) { if (SSCANF (p_string, "%lf", &nat_percentage) != 1) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"), - p_string, "PERCENTAGE", "TESTING"); + p_string, "PERCENTAGE", "TESTING_OLD"); GNUNET_free (p_string); } @@ -2143,14 +2143,14 @@ create_small_world (struct GNUNET_TESTING_PeerGroup *pg, percentage = 0.5; /* FIXME: default percentage? */ if (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING", "PERCENTAGE", + GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING_OLD", "PERCENTAGE", &p_string)) { if (SSCANF (p_string, "%lf", &percentage) != 1) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"), - p_string, "PERCENTAGE", "TESTING"); + p_string, "PERCENTAGE", "TESTING_OLD"); GNUNET_free (p_string); } if (percentage < 0.0) @@ -2158,19 +2158,19 @@ create_small_world (struct GNUNET_TESTING_PeerGroup *pg, GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _ ("Invalid value `%s' for option `%s' in section `%s': got %f, needed value greater than 0\n"), - "PERCENTAGE", "TESTING", percentage); + "PERCENTAGE", "TESTING_OLD", percentage); percentage = 0.5; } probability = 0.5; /* FIXME: default percentage? */ if (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING", "PROBABILITY", + GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING_OLD", "PROBABILITY", &p_string)) { if (SSCANF (p_string, "%lf", &probability) != 1) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"), - p_string, "PROBABILITY", "TESTING"); + p_string, "PROBABILITY", "TESTING_OLD"); GNUNET_free (p_string); } if (square * square != pg->total) @@ -2293,14 +2293,14 @@ create_erdos_renyi (struct GNUNET_TESTING_PeerGroup *pg, probability = 0.5; /* FIXME: default percentage? */ if (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING", "PROBABILITY", + GNUNET_CONFIGURATION_get_value_string (pg->cfg, "TESTING_OLD", "PROBABILITY", &p_string)) { if (SSCANF (p_string, "%lf", &probability) != 1) GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"), - p_string, "PROBABILITY", "TESTING"); + p_string, "PROBABILITY", "TESTING_OLD"); GNUNET_free (p_string); } connect_attempts = 0; @@ -3940,7 +3940,7 @@ GNUNET_TESTING_create_topology (struct GNUNET_TESTING_PeerGroup *pg, case GNUNET_TESTING_TOPOLOGY_FROM_FILE: GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating topology from file!\n"); if (GNUNET_OK == - GNUNET_CONFIGURATION_get_value_string (pg->cfg, "testing", + GNUNET_CONFIGURATION_get_value_string (pg->cfg, "testing_old", "topology_file", &filename)) num_connections = create_from_file (pg, filename, &add_connections, ALLOWED); @@ -3963,7 +3963,7 @@ GNUNET_TESTING_create_topology (struct GNUNET_TESTING_PeerGroup *pg, } if (GNUNET_YES == - GNUNET_CONFIGURATION_get_value_yesno (pg->cfg, "TESTING", "F2F")) + GNUNET_CONFIGURATION_get_value_yesno (pg->cfg, "TESTING_OLD", "F2F")) { ret = create_and_copy_friend_files (pg); if (ret != GNUNET_OK) @@ -4954,7 +4954,7 @@ schedule_get_statistics (void *cls, { stats_context->connected++; core_context->stats_handle = - GNUNET_STATISTICS_create ("testing", core_context->daemon->cfg); + GNUNET_STATISTICS_create ("testing_old", core_context->daemon->cfg); if (core_context->stats_handle == NULL) { internal_stats_cont (core_context, GNUNET_NO); @@ -5007,7 +5007,7 @@ stats_check_existing (struct GNUNET_TESTING_PeerGroup *pg, char *to_match; if (GNUNET_YES != - GNUNET_CONFIGURATION_get_value_yesno (pg->cfg, "testing", + GNUNET_CONFIGURATION_get_value_yesno (pg->cfg, "testing_old", "single_statistics_per_host")) return GNUNET_NO; /* Each peer has its own statistics instance, do nothing! */ @@ -5936,7 +5936,7 @@ GNUNET_TESTING_daemons_start (const struct GNUNET_CONFIGURATION_Handle *cfg, baseservicehome = NULL; if (GNUNET_YES == - GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING", "HOSTKEYSFILE", + GNUNET_CONFIGURATION_get_value_string (cfg, "TESTING_OLD", "HOSTKEYSFILE", &hostkeys_file)) { if (GNUNET_YES != GNUNET_DISK_file_test (hostkeys_file)) @@ -6857,7 +6857,7 @@ GNUNET_TESTING_hosts_load (const struct GNUNET_CONFIGURATION_Handle *cfg) /* Check for a hostfile containing user@host:port triples */ if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "hostfile", + GNUNET_CONFIGURATION_get_value_string (cfg, "testing_old", "hostfile", &hostfile)) return NULL; @@ -6967,7 +6967,7 @@ GNUNET_TESTING_daemons_stop (struct GNUNET_TESTING_PeerGroup *pg, shutdown_ctx = GNUNET_malloc (sizeof (struct ShutdownContext)); shutdown_ctx->delete_files = - GNUNET_CONFIGURATION_get_value_yesno (pg->cfg, "TESTING", "DELETE_FILES"); + GNUNET_CONFIGURATION_get_value_yesno (pg->cfg, "TESTING_OLD", "DELETE_FILES"); shutdown_ctx->cb = cb; shutdown_ctx->cb_cls = cb_cls; shutdown_ctx->total_peers = pg->total; diff --git a/src/testing/testing_peergroup.c b/src/testing_old/testing_peergroup.c similarity index 95% rename from src/testing/testing_peergroup.c rename to src/testing_old/testing_peergroup.c index 87504ed6d..d4451ccdf 100644 --- a/src/testing/testing_peergroup.c +++ b/src/testing_old/testing_peergroup.c @@ -793,61 +793,61 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg, pg_start_ctx = GNUNET_malloc (sizeof (struct PeerGroupStartupContext)); if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_number (cfg, "testing", "connect_attempts", + GNUNET_CONFIGURATION_get_value_number (cfg, "testing_old", "connect_attempts", &pg_start_ctx->connect_attempts)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", - "testing", "connect_attempts"); + "testing_old", "connect_attempts"); GNUNET_free (pg_start_ctx); return NULL; } if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "CONNECT_TIMEOUT", + GNUNET_CONFIGURATION_get_value_time (cfg, "testing_old", "CONNECT_TIMEOUT", &pg_start_ctx->connect_timeout)) { pg_start_ctx->connect_timeout = DEFAULT_CONNECT_TIMEOUT; } if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_number (cfg, "testing", + GNUNET_CONFIGURATION_get_value_number (cfg, "testing_old", "max_outstanding_connections", &pg_start_ctx->max_concurrent_connections)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", - "testing", "max_outstanding_connections"); + "testing_old", "max_outstanding_connections"); GNUNET_free (pg_start_ctx); return NULL; } if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_number (cfg, "testing", + GNUNET_CONFIGURATION_get_value_number (cfg, "testing_old", "max_concurrent_ssh", &pg_start_ctx->max_concurrent_ssh)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", - "testing", "max_concurrent_ssh"); + "testing_old", "max_concurrent_ssh"); GNUNET_free (pg_start_ctx); return NULL; } if (GNUNET_SYSERR == (pg_start_ctx->verbose = - GNUNET_CONFIGURATION_get_value_yesno (cfg, "testing", + GNUNET_CONFIGURATION_get_value_yesno (cfg, "testing_old", "use_progressbars"))) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", - "testing", "use_progressbars"); + "testing_old", "use_progressbars"); GNUNET_free (pg_start_ctx); return NULL; } if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_time (cfg, "testing", "PEERGROUP_TIMEOUT", + GNUNET_CONFIGURATION_get_value_time (cfg, "testing_old", "PEERGROUP_TIMEOUT", &rtimeout)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Must provide option %s:%s!\n", - "testing", "PEERGROUP_TIMEOUT"); + "testing_old", "PEERGROUP_TIMEOUT"); GNUNET_free (pg_start_ctx); return NULL; } @@ -857,20 +857,20 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg, /* Read topology related options from the configuration file */ temp_str = NULL; if ((GNUNET_YES == - GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "topology", + GNUNET_CONFIGURATION_get_value_string (cfg, "testing_old", "topology", &temp_str)) && (GNUNET_NO == GNUNET_TESTING_topology_get (&pg_start_ctx->topology, temp_str))) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid topology `%s' given for section %s option %s\n", - temp_str, "TESTING", "TOPOLOGY"); + temp_str, "TESTING_old", "TOPOLOGY"); pg_start_ctx->topology = GNUNET_TESTING_TOPOLOGY_CLIQUE; /* Defaults to NONE, so set better default here */ } GNUNET_free_non_null (temp_str); if (GNUNET_YES == - GNUNET_CONFIGURATION_get_value_string (cfg, "testing", + GNUNET_CONFIGURATION_get_value_string (cfg, "testing_old", "topology_output_file", &temp_str)) { pg_start_ctx->topology_output_file = @@ -891,7 +891,7 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg, } if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "percentage", + GNUNET_CONFIGURATION_get_value_string (cfg, "testing_old", "percentage", &temp_str)) pg_start_ctx->topology_percentage = 0.5; else @@ -901,7 +901,7 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg, } if (GNUNET_OK != - GNUNET_CONFIGURATION_get_value_string (cfg, "testing", "probability", + GNUNET_CONFIGURATION_get_value_string (cfg, "testing_old", "probability", &temp_str)) pg_start_ctx->topology_probability = 0.5; else @@ -911,19 +911,19 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg, } if ((GNUNET_YES == - GNUNET_CONFIGURATION_get_value_string (cfg, "testing", + GNUNET_CONFIGURATION_get_value_string (cfg, "testing_old", "connect_topology", &temp_str)) && (GNUNET_NO == GNUNET_TESTING_topology_get (&pg_start_ctx->connect_topology, temp_str))) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid connect topology `%s' given for section %s option %s\n", - temp_str, "TESTING", "CONNECT_TOPOLOGY"); + temp_str, "TESTING_old", "CONNECT_TOPOLOGY"); } GNUNET_free_non_null (temp_str); if ((GNUNET_YES == - GNUNET_CONFIGURATION_get_value_string (cfg, "testing", + GNUNET_CONFIGURATION_get_value_string (cfg, "testing_old", "connect_topology_option", &temp_str)) && (GNUNET_NO == @@ -932,13 +932,13 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg, { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid connect topology option `%s' given for section %s option %s\n", - temp_str, "TESTING", "CONNECT_TOPOLOGY_OPTION"); + temp_str, "TESTING_old", "CONNECT_TOPOLOGY_OPTION"); pg_start_ctx->connect_topology_option = GNUNET_TESTING_TOPOLOGY_OPTION_ALL; /* Defaults to NONE, set to ALL */ } GNUNET_free_non_null (temp_str); if (GNUNET_YES == - GNUNET_CONFIGURATION_get_value_string (cfg, "testing", + GNUNET_CONFIGURATION_get_value_string (cfg, "testing_old", "connect_topology_option_modifier", &temp_str)) { @@ -948,7 +948,7 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _ ("Invalid value `%s' for option `%s' in section `%s': expected float\n"), - temp_str, "connect_topology_option_modifier", "TESTING"); + temp_str, "connect_topology_option_modifier", "TESTING_old"); GNUNET_free (temp_str); GNUNET_free (pg_start_ctx); return NULL; @@ -957,14 +957,14 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg, } if (GNUNET_YES != - GNUNET_CONFIGURATION_get_value_string (cfg, "testing", + GNUNET_CONFIGURATION_get_value_string (cfg, "testing_old", "blacklist_transports", &pg_start_ctx->restrict_transports)) pg_start_ctx->restrict_transports = NULL; pg_start_ctx->restrict_topology = GNUNET_TESTING_TOPOLOGY_NONE; if ((GNUNET_YES == - GNUNET_CONFIGURATION_get_value_string (cfg, "testing", + GNUNET_CONFIGURATION_get_value_string (cfg, "testing_old", "blacklist_topology", &temp_str)) && (GNUNET_NO == GNUNET_TESTING_topology_get (&pg_start_ctx->restrict_topology, @@ -972,7 +972,7 @@ GNUNET_TESTING_peergroup_start (const struct GNUNET_CONFIGURATION_Handle *cfg, { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid topology `%s' given for section %s option %s\n", - temp_str, "TESTING", "BLACKLIST_TOPOLOGY"); + temp_str, "TESTING_OLD", "BLACKLIST_TOPOLOGY"); } GNUNET_free_non_null (temp_str); diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index 261be8619..4234625d6 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am @@ -36,7 +36,7 @@ endif test_gnunet_daemon_topology_SOURCES = \ test_gnunet_daemon_topology.c test_gnunet_daemon_topology_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.la \ + $(top_builddir)/src/testing_old/libgnunettesting_old.la \ $(top_builddir)/src/util/libgnunetutil.la EXTRA_DIST = \ -- 2.25.1