diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-06-23 08:22:49 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-06-23 08:22:49 +0000 |
commit | e8f06b00f51a5d5115460cd4addaefcffe15f747 (patch) | |
tree | e6b4b87bb3c51abbff1fee6680a8a0ac29cc8b69 /src/testing | |
parent | b0018d4e5f9ec0f7976c2ac99963e15792dad830 (diff) | |
download | gnunet-e8f06b00f51a5d5115460cd4addaefcffe15f747.tar.gz gnunet-e8f06b00f51a5d5115460cd4addaefcffe15f747.zip |
missing null check
Diffstat (limited to 'src/testing')
-rw-r--r-- | src/testing/Makefile.am | 60 | ||||
-rw-r--r-- | src/testing/testing.c | 5 |
2 files changed, 60 insertions, 5 deletions
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 2cfa330b3..6003e675e 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am | |||
@@ -25,7 +25,13 @@ check_PROGRAMS = \ | |||
25 | test_testing \ | 25 | test_testing \ |
26 | test_testing_connect \ | 26 | test_testing_connect \ |
27 | test_testing_group \ | 27 | test_testing_group \ |
28 | test_testing_topology_clique | 28 | test_testing_topology_clique \ |
29 | test_testing_topology_clique_random \ | ||
30 | test_testing_topology_clique_minimum \ | ||
31 | test_testing_topology_clique_dfs \ | ||
32 | test_testing_topology_churn \ | ||
33 | test_testing_topology_line | ||
34 | # test_testing_topology_blacklist \ | ||
29 | # test_testing_group_remote \ | 35 | # test_testing_group_remote \ |
30 | # test_testing_topology_ring \ | 36 | # test_testing_topology_ring \ |
31 | # test_testing_topology_2d_torus \ | 37 | # test_testing_topology_2d_torus \ |
@@ -39,7 +45,13 @@ TESTS = \ | |||
39 | test_testing \ | 45 | test_testing \ |
40 | test_testing_connect \ | 46 | test_testing_connect \ |
41 | test_testing_group \ | 47 | test_testing_group \ |
42 | test_testing_topology_clique | 48 | test_testing_topology_clique \ |
49 | test_testing_topology_clique_random \ | ||
50 | test_testing_topology_clique_minimum \ | ||
51 | test_testing_topology_clique_dfs \ | ||
52 | test_testing_topology_churn \ | ||
53 | test_testing_topology_line | ||
54 | # test_testing_topology_blacklist \ | ||
43 | # test_testing_group_remote \ | 55 | # test_testing_group_remote \ |
44 | # test_testing_topology_ring \ | 56 | # test_testing_topology_ring \ |
45 | # test_testing_topology_2d_torus \ | 57 | # test_testing_topology_2d_torus \ |
@@ -71,7 +83,44 @@ test_testing_topology_clique_SOURCES = \ | |||
71 | test_testing_topology.c | 83 | test_testing_topology.c |
72 | test_testing_topology_clique_LDADD = \ | 84 | test_testing_topology_clique_LDADD = \ |
73 | $(top_builddir)/src/testing/libgnunettesting.la \ | 85 | $(top_builddir)/src/testing/libgnunettesting.la \ |
86 | $(top_builddir)/src/util/libgnunetutil.la | ||
87 | |||
88 | #test_testing_topology_blacklist_SOURCES = \ | ||
89 | # test_testing_topology_blacklist.c | ||
90 | #test_testing_topology_blacklist_LDADD = \ | ||
91 | # $(top_builddir)/src/testing/libgnunettesting.la \ | ||
92 | # $(top_builddir)/src/util/libgnunetutil.la | ||
93 | |||
94 | test_testing_topology_churn_SOURCES = \ | ||
95 | test_testing_topology_churn.c | ||
96 | test_testing_topology_churn_LDADD = \ | ||
97 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
98 | $(top_builddir)/src/util/libgnunetutil.la | ||
99 | |||
100 | test_testing_topology_clique_random_SOURCES = \ | ||
101 | test_testing_topology.c | ||
102 | test_testing_topology_clique_random_LDADD = \ | ||
103 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
104 | $(top_builddir)/src/util/libgnunetutil.la | ||
105 | |||
106 | test_testing_topology_clique_minimum_SOURCES = \ | ||
107 | test_testing_topology.c | ||
108 | test_testing_topology_clique_minimum_LDADD = \ | ||
109 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
110 | $(top_builddir)/src/util/libgnunetutil.la | ||
111 | |||
112 | test_testing_topology_clique_dfs_SOURCES = \ | ||
113 | test_testing_topology.c | ||
114 | test_testing_topology_clique_dfs_LDADD = \ | ||
115 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
116 | $(top_builddir)/src/util/libgnunetutil.la | ||
117 | |||
118 | test_testing_topology_line_SOURCES = \ | ||
119 | test_testing_topology.c | ||
120 | test_testing_topology_line_LDADD = \ | ||
121 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
74 | $(top_builddir)/src/util/libgnunetutil.la | 122 | $(top_builddir)/src/util/libgnunetutil.la |
123 | |||
75 | 124 | ||
76 | #test_testing_group_remote_SOURCES = \ | 125 | #test_testing_group_remote_SOURCES = \ |
77 | # test_testing_group_remote.c | 126 | # test_testing_group_remote.c |
@@ -127,11 +176,16 @@ EXTRA_DIST = \ | |||
127 | test_testing_connect_peer1.conf \ | 176 | test_testing_connect_peer1.conf \ |
128 | test_testing_connect_peer2.conf \ | 177 | test_testing_connect_peer2.conf \ |
129 | test_testing_data_topology_clique.conf \ | 178 | test_testing_data_topology_clique.conf \ |
179 | test_testing_data_topology_clique_random.conf \ | ||
180 | test_testing_data_topology_clique_minimum.conf \ | ||
181 | test_testing_data_topology_clique_dfs.conf \ | ||
130 | test_testing_data_topology_ring.conf \ | 182 | test_testing_data_topology_ring.conf \ |
131 | test_testing_data_topology_2d_torus.conf \ | 183 | test_testing_data_topology_2d_torus.conf \ |
132 | test_testing_data_topology_small_world_ring.conf \ | 184 | test_testing_data_topology_small_world_ring.conf \ |
133 | test_testing_data_topology_small_world_torus.conf \ | 185 | test_testing_data_topology_small_world_torus.conf \ |
134 | test_testing_data_topology_erdos_renyi.conf \ | 186 | test_testing_data_topology_erdos_renyi.conf \ |
135 | test_testing_data_topology_internat.conf \ | 187 | test_testing_data_topology_internat.conf \ |
136 | test_testing_data_topology_scale_free.conf | 188 | test_testing_data_topology_scale_free.conf \ |
189 | test_testing_data_topology_blacklist.conf \ | ||
190 | test_testing_data_topology_churn.conf | ||
137 | 191 | ||
diff --git a/src/testing/testing.c b/src/testing/testing.c index 58d09806b..c21650300 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c | |||
@@ -529,8 +529,9 @@ start_fsm (void *cls, | |||
529 | { | 529 | { |
530 | if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0) | 530 | if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0) |
531 | { | 531 | { |
532 | d->dead_cb (d->dead_cb_cls, | 532 | if (NULL != d->dead_cb) |
533 | _("either `gnunet-arm' or `ssh' does not seem to terminate.\n")); | 533 | d->dead_cb (d->dead_cb_cls, |
534 | _("either `gnunet-arm' or `ssh' does not seem to terminate.\n")); | ||
534 | if (d->th != NULL) | 535 | if (d->th != NULL) |
535 | { | 536 | { |
536 | GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d); | 537 | GNUNET_TRANSPORT_get_hello_cancel(d->th, &process_hello, d); |