clique topology optimization, progress meter for connecting

[oweals/gnunet.git] / src / testing / Makefile.am

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index ec6c739b857038d4d090fc5c21f9f0eb929a949f..8084a9779855a2f650bf8a90906a3f445d0fda41 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -13,10 +13,10 @@ lib_LTLIBRARIES = libgnunettesting.la
 
 libgnunettesting_la_SOURCES = \
   testing.c  \
-  testing_group.c \
-  testing_testbed.c 
+  testing_group.c 
 libgnunettesting_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/core/libgnunetcore.la \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
  -lm \
  $(top_builddir)/src/util/libgnunetutil.la 
@@ -24,7 +24,9 @@ libgnunettesting_la_LIBADD = $(XLIB) \
 check_PROGRAMS = \
  test_testing \
  test_testing_connect \
+ test_testing_reconnect \
  test_testing_group \
+ test_testing_topology_stability \
  test_testing_topology_clique \
  test_testing_topology_clique_random \
  test_testing_topology_clique_minimum \
@@ -39,13 +41,17 @@ check_PROGRAMS = \
  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 !DISABLE_TEST_RUN 
 TESTS = \
  test_testing \
  test_testing_connect \
+ test_testing_reconnect \
  test_testing_group \
  test_testing_topology_clique
+# test_testing_topology_stability \
 # test_testing_topology_clique_random \
 # test_testing_topology_clique_minimum \
 # test_testing_topology_clique_dfs \
@@ -60,6 +66,7 @@ TESTS = \
 # test_testing_topology_erdos_renyi \
 # test_testing_topology_internat \
 # test_testing_topology_scale_free
+endif
 
 test_testing_SOURCES = \
  test_testing.c
@@ -73,30 +80,42 @@ 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_topology_clique_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.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/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 = \
@@ -108,7 +127,7 @@ test_testing_topology_clique_minimum_SOURCES = \
 test_testing_topology_clique_minimum_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 test_testing_topology_clique_dfs_SOURCES = \
  test_testing_topology.c
 test_testing_topology_clique_dfs_LDADD = \
@@ -120,7 +139,7 @@ test_testing_topology_line_SOURCES = \
 test_testing_topology_line_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
-   
+
 
 test_testing_group_remote_SOURCES = \
  test_testing_group_remote.c
@@ -133,25 +152,25 @@ test_testing_topology_ring_SOURCES = \
 test_testing_topology_ring_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.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/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/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/util/libgnunetutil.la
- 
+
 test_testing_topology_internat_SOURCES = \
   test_testing_topology.c
 test_testing_topology_internat_LDADD = \
@@ -163,14 +182,20 @@ test_testing_topology_erdos_renyi_SOURCES = \
 test_testing_topology_erdos_renyi_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.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/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/util/libgnunetutil.la
+
+
 EXTRA_DIST = \
  test_testing_data.conf \
  test_testing_connect_peer1.conf \
@@ -188,5 +213,5 @@ EXTRA_DIST = \
  test_testing_data_topology_scale_free.conf \
  test_testing_data_topology_blacklist.conf \
  test_testing_data_topology_churn.conf \
- test_testing_data_topology_line.conf
- 
+ test_testing_data_topology_none.conf
+