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/transport/libgnunettransport.la \
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
-
+ 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_clique_random \
- test_testing_topology_clique_minimum \
- test_testing_topology_clique_dfs \
- test_testing_topology_churn \
- test_testing_topology_line
+ 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_erdos_renyi \
# test_testing_topology_internat \
# test_testing_topology_scale_free
+endif
test_testing_SOURCES = \
test_testing.c
$(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_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
$(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_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_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 = \
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_churn.conf \
+ test_testing_data_topology_none.conf