make test cases build, but not run

3 files changed, 74 insertions, 65 deletions

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 6003e675e..ec6c739b8 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -30,27 +30,27 @@ check_PROGRAMS = \
  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_scale_free
  
 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 \
@@ -85,11 +85,11 @@ test_testing_topology_clique_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_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
@@ -122,53 +122,53 @@ test_testing_topology_line_LDADD = \
  $(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
  
  
 EXTRA_DIST = \
@@ -187,5 +187,6 @@ 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_line.conf
  
diff --git a/src/testing/test_testing_group_remote.c b/src/testing/test_testing_group_remote.c
index f2ad8f3d3..74841fb43 100644
--- a/src/testing/test_testing_group_remote.c
+++ b/src/testing/test_testing_group_remote.c
@@ -68,7 +68,7 @@ my_cb (void *cls,
       GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
       ok = 0;
     }
-  else if (failed_peers == peers_left)
+  else if (peers_failed == peers_left)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Too many peers failed, ending test!\n");
       GNUNET_TESTING_daemons_stop (pg, TIMEOUT);
@@ -97,10 +97,17 @@ run (void *cls,
                                          &hostnames);
 
   peers_left = num_peers;
-  pg = GNUNET_TESTING_daemons_start (sched, cfg,
+  pg = GNUNET_TESTING_daemons_start (sched,
+                                     cfg,
                                      peers_left,
                                      TIMEOUT,
-                                     &my_cb, NULL, NULL, NULL, hostnames);
+                                     NULL,
+                                     NULL,
+                                     &my_cb,
+                                     NULL,
+                                     NULL,
+                                     NULL,
+                                     hostnames);
   GNUNET_assert (pg != NULL);
 }
 
diff --git a/src/testing/test_testing_topology_blacklist.c b/src/testing/test_testing_topology_blacklist.c
index 08a30a347..22d2265c5 100644
--- a/src/testing/test_testing_topology_blacklist.c
+++ b/src/testing/test_testing_topology_blacklist.c
@@ -152,6 +152,7 @@ void
 topology_callback (void *cls,
                    const struct GNUNET_PeerIdentity *first,
                    const struct GNUNET_PeerIdentity *second,
+                   uint32_t distance,
                    const struct GNUNET_CONFIGURATION_Handle *first_cfg,
                    const struct GNUNET_CONFIGURATION_Handle *second_cfg,
                    struct GNUNET_TESTING_Daemon *first_daemon,