add support for multi topology testing to makefile (all work for me, but only clique is currently a testcase)

1 files changed, 60 insertions, 4 deletions

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 8b1dceb15..ebe777b0f 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -26,12 +26,24 @@ check_PROGRAMS = \
  test_testing_connect \
  test_testing_group \
  test_testing_topology_clique
-
+# 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
+ 
 TESTS = \
  test_testing \
  test_testing_connect \
  test_testing_group \
- test_testing_topology_clique
+ test_testing_topology_clique 
+# 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
 #$(check_PROGRAMS)
 
 test_testing_SOURCES = \
@@ -53,13 +65,57 @@ test_testing_group_LDADD = \
  $(top_builddir)/src/util/libgnunetutil.la  
  
 test_testing_topology_clique_SOURCES = \
- test_testing_topology_clique.c
+ test_testing_topology.c
 test_testing_topology_clique_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_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 = \
+# $(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
+ 
+ 
 EXTRA_DIST = \
  test_testing_data.conf \
  test_testing_connect_peer1.conf \
  test_testing_connect_peer2.conf \
- test_testing_data_topology_clique.conf
+ test_testing_data_topology_clique.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
+