style improvments wrt Mantis 1614 patch

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

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 2cfa330b37b7becc147fcd7247ecf87da9674ace..bd4495035ece6d198e8413ac2ccc6e053e541251 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -13,33 +13,51 @@ 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 
+ 
+#noinst_PROGRAMS = ${check_PROGRAMS}
 
 check_PROGRAMS = \
  test_testing \
  test_testing_connect \
  test_testing_group \
- test_testing_topology_clique
-# 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
- 
+ 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_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 !DISABLE_TEST_RUN 
 TESTS = \
  test_testing \
  test_testing_connect \
  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 \
+# 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 \
@@ -48,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
@@ -70,56 +89,105 @@ test_testing_group_LDADD = \
 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 = \
  $(top_builddir)/src/testing/libgnunettesting.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_topology_clique_minimum_SOURCES = \
+ test_testing_topology.c
+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 = \
+ $(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/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/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_topology_ring_SOURCES = \
+ test_testing_topology.c
+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_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_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_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 = \
-# $(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 = \
+ $(top_builddir)/src/testing/libgnunettesting.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/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/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_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 = \
@@ -127,11 +195,17 @@ EXTRA_DIST = \
  test_testing_connect_peer1.conf \
  test_testing_connect_peer2.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_scale_free.conf \
+ test_testing_data_topology_blacklist.conf \
+ test_testing_data_topology_churn.conf \
+ test_testing_data_topology_none.conf