[GNUnet-SVN] r11888 - gnunet/src/testing

[gnunet]

Author: nevans
Date: 2010-06-23 10:22:49 +0200 (Wed, 23 Jun 2010)
New Revision: 11888

Modified:
   gnunet/src/testing/Makefile.am
   gnunet/src/testing/testing.c
Log:
missing null check

Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am      2010-06-22 22:32:25 UTC (rev 11887)
+++ gnunet/src/testing/Makefile.am      2010-06-23 08:22:49 UTC (rev 11888)
@@ -25,7 +25,13 @@
  test_testing \
  test_testing_connect \
  test_testing_group \
- test_testing_topology_clique
+ 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_2d_torus \
@@ -39,7 +45,13 @@
  test_testing \
  test_testing_connect \
  test_testing_group \
- test_testing_topology_clique
+ 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_2d_torus \
@@ -71,8 +83,45 @@
  test_testing_topology.c
 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_churn_SOURCES = \
+ test_testing_topology_churn.c
+test_testing_topology_churn_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la 
+ 
+test_testing_topology_clique_random_SOURCES = \
+ test_testing_topology.c
+test_testing_topology_clique_random_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la  
 
+test_testing_topology_clique_minimum_SOURCES = \
+ test_testing_topology.c
+test_testing_topology_clique_minimum_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la
+ 
+test_testing_topology_clique_dfs_SOURCES = \
+ test_testing_topology.c
+test_testing_topology_clique_dfs_LDADD = \
+ $(top_builddir)/src/testing/libgnunettesting.la \
+ $(top_builddir)/src/util/libgnunetutil.la  
+
+test_testing_topology_line_SOURCES = \
+ test_testing_topology.c
+test_testing_topology_line_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 = \
@@ -127,11 +176,16 @@
  test_testing_connect_peer1.conf \
  test_testing_connect_peer2.conf \
  test_testing_data_topology_clique.conf \
+ test_testing_data_topology_clique_random.conf \
+ test_testing_data_topology_clique_minimum.conf \
+ test_testing_data_topology_clique_dfs.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
+ test_testing_data_topology_scale_free.conf \
+ test_testing_data_topology_blacklist.conf \
+ test_testing_data_topology_churn.conf
  

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2010-06-22 22:32:25 UTC (rev 11887)
+++ gnunet/src/testing/testing.c        2010-06-23 08:22:49 UTC (rev 11888)
@@ -529,8 +529,9 @@
         {
           if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
             {
-              d->dead_cb (d->dead_cb_cls,
-                          _("either `gnunet-arm' or `ssh' does not seem to 
terminate.\n"));
+              if (NULL != d->dead_cb)
+                d->dead_cb (d->dead_cb_cls,
+                            _("either `gnunet-arm' or `ssh' does not seem to 
terminate.\n"));
               if (d->th != NULL)
                 {
                   GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d);