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 ec6c739b857038d4d090fc5c21f9f0eb929a949f..bd4495035ece6d198e8413ac2ccc6e053e541251 100644 (file)
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -13,18 +13,21 @@ 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_stability \
  test_testing_topology_clique \
  test_testing_topology_clique_random \
  test_testing_topology_clique_minimum \
@@ -39,13 +42,16 @@ 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_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
@@ -85,6 +92,12 @@ 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 = \
@@ -169,6 +182,12 @@ test_testing_topology_scale_free_SOURCES = \
 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 = \
@@ -188,5 +207,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