diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-06-23 08:31:26 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-06-23 08:31:26 +0000 |
commit | a12a7f3988674adf7c2704eef43ba7324886d6d0 (patch) | |
tree | cec87a19115fb625acee1779f0ad9283a6fe0363 | |
parent | e8f06b00f51a5d5115460cd4addaefcffe15f747 (diff) | |
download | gnunet-a12a7f3988674adf7c2704eef43ba7324886d6d0.tar.gz gnunet-a12a7f3988674adf7c2704eef43ba7324886d6d0.zip |
make test cases build, but not run
-rw-r--r-- | src/testing/Makefile.am | 125 | ||||
-rw-r--r-- | src/testing/test_testing_group_remote.c | 13 | ||||
-rw-r--r-- | src/testing/test_testing_topology_blacklist.c | 1 |
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 = \ | |||
30 | test_testing_topology_clique_minimum \ | 30 | test_testing_topology_clique_minimum \ |
31 | test_testing_topology_clique_dfs \ | 31 | test_testing_topology_clique_dfs \ |
32 | test_testing_topology_churn \ | 32 | test_testing_topology_churn \ |
33 | test_testing_topology_line | 33 | test_testing_topology_line \ |
34 | # test_testing_topology_blacklist \ | 34 | test_testing_topology_blacklist \ |
35 | # test_testing_group_remote \ | 35 | test_testing_group_remote \ |
36 | # test_testing_topology_ring \ | 36 | test_testing_topology_ring \ |
37 | # test_testing_topology_2d_torus \ | 37 | test_testing_topology_2d_torus \ |
38 | # test_testing_topology_small_world_ring \ | 38 | test_testing_topology_small_world_ring \ |
39 | # test_testing_topology_small_world_torus \ | 39 | test_testing_topology_small_world_torus \ |
40 | # test_testing_topology_erdos_renyi \ | 40 | test_testing_topology_erdos_renyi \ |
41 | # test_testing_topology_internat \ | 41 | test_testing_topology_internat \ |
42 | # test_testing_topology_scale_free | 42 | test_testing_topology_scale_free |
43 | 43 | ||
44 | TESTS = \ | 44 | TESTS = \ |
45 | test_testing \ | 45 | test_testing \ |
46 | test_testing_connect \ | 46 | test_testing_connect \ |
47 | test_testing_group \ | 47 | test_testing_group \ |
48 | test_testing_topology_clique \ | 48 | test_testing_topology_clique |
49 | test_testing_topology_clique_random \ | 49 | # test_testing_topology_clique_random \ |
50 | test_testing_topology_clique_minimum \ | 50 | # test_testing_topology_clique_minimum \ |
51 | test_testing_topology_clique_dfs \ | 51 | # test_testing_topology_clique_dfs \ |
52 | test_testing_topology_churn \ | 52 | # test_testing_topology_churn \ |
53 | test_testing_topology_line | 53 | # test_testing_topology_line |
54 | # test_testing_topology_blacklist \ | 54 | # test_testing_topology_blacklist \ |
55 | # test_testing_group_remote \ | 55 | # test_testing_group_remote \ |
56 | # test_testing_topology_ring \ | 56 | # test_testing_topology_ring \ |
@@ -85,11 +85,11 @@ test_testing_topology_clique_LDADD = \ | |||
85 | $(top_builddir)/src/testing/libgnunettesting.la \ | 85 | $(top_builddir)/src/testing/libgnunettesting.la \ |
86 | $(top_builddir)/src/util/libgnunetutil.la | 86 | $(top_builddir)/src/util/libgnunetutil.la |
87 | 87 | ||
88 | #test_testing_topology_blacklist_SOURCES = \ | 88 | test_testing_topology_blacklist_SOURCES = \ |
89 | # test_testing_topology_blacklist.c | 89 | test_testing_topology_blacklist.c |
90 | #test_testing_topology_blacklist_LDADD = \ | 90 | test_testing_topology_blacklist_LDADD = \ |
91 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 91 | $(top_builddir)/src/testing/libgnunettesting.la \ |
92 | # $(top_builddir)/src/util/libgnunetutil.la | 92 | $(top_builddir)/src/util/libgnunetutil.la |
93 | 93 | ||
94 | test_testing_topology_churn_SOURCES = \ | 94 | test_testing_topology_churn_SOURCES = \ |
95 | test_testing_topology_churn.c | 95 | test_testing_topology_churn.c |
@@ -122,53 +122,53 @@ test_testing_topology_line_LDADD = \ | |||
122 | $(top_builddir)/src/util/libgnunetutil.la | 122 | $(top_builddir)/src/util/libgnunetutil.la |
123 | 123 | ||
124 | 124 | ||
125 | #test_testing_group_remote_SOURCES = \ | 125 | test_testing_group_remote_SOURCES = \ |
126 | # test_testing_group_remote.c | 126 | test_testing_group_remote.c |
127 | #test_testing_group_remote_LDADD = \ | 127 | test_testing_group_remote_LDADD = \ |
128 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 128 | $(top_builddir)/src/testing/libgnunettesting.la \ |
129 | # $(top_builddir)/src/util/libgnunetutil.la | 129 | $(top_builddir)/src/util/libgnunetutil.la |
130 | 130 | ||
131 | #test_testing_topology_ring_SOURCES = \ | 131 | test_testing_topology_ring_SOURCES = \ |
132 | # test_testing_topology.c | 132 | test_testing_topology.c |
133 | #test_testing_topology_ring_LDADD = \ | 133 | test_testing_topology_ring_LDADD = \ |
134 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 134 | $(top_builddir)/src/testing/libgnunettesting.la \ |
135 | # $(top_builddir)/src/util/libgnunetutil.la | 135 | $(top_builddir)/src/util/libgnunetutil.la |
136 | 136 | ||
137 | #test_testing_topology_2d_torus_SOURCES = \ | 137 | test_testing_topology_2d_torus_SOURCES = \ |
138 | # test_testing_topology.c | 138 | test_testing_topology.c |
139 | #test_testing_topology_2d_torus_LDADD = \ | 139 | test_testing_topology_2d_torus_LDADD = \ |
140 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 140 | $(top_builddir)/src/testing/libgnunettesting.la \ |
141 | # $(top_builddir)/src/util/libgnunetutil.la | 141 | $(top_builddir)/src/util/libgnunetutil.la |
142 | 142 | ||
143 | #test_testing_topology_small_world_ring_SOURCES = \ | 143 | test_testing_topology_small_world_ring_SOURCES = \ |
144 | # test_testing_topology.c | 144 | test_testing_topology.c |
145 | #test_testing_topology_small_world_ring_LDADD = \ | 145 | test_testing_topology_small_world_ring_LDADD = \ |
146 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 146 | $(top_builddir)/src/testing/libgnunettesting.la \ |
147 | # $(top_builddir)/src/util/libgnunetutil.la | 147 | $(top_builddir)/src/util/libgnunetutil.la |
148 | 148 | ||
149 | #test_testing_topology_small_world_torus_SOURCES = \ | 149 | test_testing_topology_small_world_torus_SOURCES = \ |
150 | # test_testing_topology.c | 150 | test_testing_topology.c |
151 | #test_testing_topology_small_world_torus_LDADD = \ | 151 | test_testing_topology_small_world_torus_LDADD = \ |
152 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 152 | $(top_builddir)/src/testing/libgnunettesting.la \ |
153 | # $(top_builddir)/src/util/libgnunetutil.la | 153 | $(top_builddir)/src/util/libgnunetutil.la |
154 | 154 | ||
155 | #test_testing_topology_internat_SOURCES = \ | 155 | test_testing_topology_internat_SOURCES = \ |
156 | # test_testing_topology.c | 156 | test_testing_topology.c |
157 | #test_testing_topology_internat_LDADD = \ | 157 | test_testing_topology_internat_LDADD = \ |
158 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 158 | $(top_builddir)/src/testing/libgnunettesting.la \ |
159 | # $(top_builddir)/src/util/libgnunetutil.la | 159 | $(top_builddir)/src/util/libgnunetutil.la |
160 | 160 | ||
161 | #test_testing_topology_erdos_renyi_SOURCES = \ | 161 | test_testing_topology_erdos_renyi_SOURCES = \ |
162 | # test_testing_topology.c | 162 | test_testing_topology.c |
163 | #test_testing_topology_erdos_renyi_LDADD = \ | 163 | test_testing_topology_erdos_renyi_LDADD = \ |
164 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 164 | $(top_builddir)/src/testing/libgnunettesting.la \ |
165 | # $(top_builddir)/src/util/libgnunetutil.la | 165 | $(top_builddir)/src/util/libgnunetutil.la |
166 | 166 | ||
167 | #test_testing_topology_scale_free_SOURCES = \ | 167 | test_testing_topology_scale_free_SOURCES = \ |
168 | # test_testing_topology.c | 168 | test_testing_topology.c |
169 | #test_testing_topology_scale_free_LDADD = \ | 169 | test_testing_topology_scale_free_LDADD = \ |
170 | # $(top_builddir)/src/testing/libgnunettesting.la \ | 170 | $(top_builddir)/src/testing/libgnunettesting.la \ |
171 | # $(top_builddir)/src/util/libgnunetutil.la | 171 | $(top_builddir)/src/util/libgnunetutil.la |
172 | 172 | ||
173 | 173 | ||
174 | EXTRA_DIST = \ | 174 | EXTRA_DIST = \ |
@@ -187,5 +187,6 @@ EXTRA_DIST = \ | |||
187 | test_testing_data_topology_internat.conf \ | 187 | test_testing_data_topology_internat.conf \ |
188 | test_testing_data_topology_scale_free.conf \ | 188 | test_testing_data_topology_scale_free.conf \ |
189 | test_testing_data_topology_blacklist.conf \ | 189 | test_testing_data_topology_blacklist.conf \ |
190 | test_testing_data_topology_churn.conf | 190 | test_testing_data_topology_churn.conf \ |
191 | test_testing_data_topology_line.conf | ||
191 | 192 | ||
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, | |||
68 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); | 68 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); |
69 | ok = 0; | 69 | ok = 0; |
70 | } | 70 | } |
71 | else if (failed_peers == peers_left) | 71 | else if (peers_failed == peers_left) |
72 | { | 72 | { |
73 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Too many peers failed, ending test!\n"); | 73 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Too many peers failed, ending test!\n"); |
74 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); | 74 | GNUNET_TESTING_daemons_stop (pg, TIMEOUT); |
@@ -97,10 +97,17 @@ run (void *cls, | |||
97 | &hostnames); | 97 | &hostnames); |
98 | 98 | ||
99 | peers_left = num_peers; | 99 | peers_left = num_peers; |
100 | pg = GNUNET_TESTING_daemons_start (sched, cfg, | 100 | pg = GNUNET_TESTING_daemons_start (sched, |
101 | cfg, | ||
101 | peers_left, | 102 | peers_left, |
102 | TIMEOUT, | 103 | TIMEOUT, |
103 | &my_cb, NULL, NULL, NULL, hostnames); | 104 | NULL, |
105 | NULL, | ||
106 | &my_cb, | ||
107 | NULL, | ||
108 | NULL, | ||
109 | NULL, | ||
110 | hostnames); | ||
104 | GNUNET_assert (pg != NULL); | 111 | GNUNET_assert (pg != NULL); |
105 | } | 112 | } |
106 | 113 | ||
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 | |||
152 | topology_callback (void *cls, | 152 | topology_callback (void *cls, |
153 | const struct GNUNET_PeerIdentity *first, | 153 | const struct GNUNET_PeerIdentity *first, |
154 | const struct GNUNET_PeerIdentity *second, | 154 | const struct GNUNET_PeerIdentity *second, |
155 | uint32_t distance, | ||
155 | const struct GNUNET_CONFIGURATION_Handle *first_cfg, | 156 | const struct GNUNET_CONFIGURATION_Handle *first_cfg, |
156 | const struct GNUNET_CONFIGURATION_Handle *second_cfg, | 157 | const struct GNUNET_CONFIGURATION_Handle *second_cfg, |
157 | struct GNUNET_TESTING_Daemon *first_daemon, | 158 | struct GNUNET_TESTING_Daemon *first_daemon, |