add now instead of add delayed

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

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 18144c514325a399266611442fe950d44dcd4428..2cfa330b37b7becc147fcd7247ecf87da9674ace 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -18,18 +18,36 @@ libgnunettesting_la_SOURCES = \
 libgnunettesting_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/core/libgnunetcore.la \
  $(top_builddir)/src/transport/libgnunettransport.la \
+ -lm \
  $(top_builddir)/src/util/libgnunetutil.la 
 
 check_PROGRAMS = \
  test_testing \
  test_testing_connect \
- test_testing_group
-
+ 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
+ 
 TESTS = \
  test_testing \
  test_testing_connect \
- test_testing_group
-#$(check_PROGRAMS)
+ 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_SOURCES = \
  test_testing.c
@@ -48,8 +66,72 @@ test_testing_group_SOURCES = \
 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_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_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
+ 
+#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
+ 
+ 
 EXTRA_DIST = \
  test_testing_data.conf \
  test_testing_connect_peer1.conf \
- test_testing_connect_peer2.conf 
+ test_testing_connect_peer2.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 \
+ test_testing_data_topology_scale_free.conf
+