diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-06-09 15:39:34 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-06-09 15:39:34 +0000 |
commit | 2c3ba0f6b9e3104be83fa485091ebb077c1aebbf (patch) | |
tree | 1ff3b886fcc9c6dc2d0b93c3f4a513082309d938 /src | |
parent | e0033c1da56e1889775d7dccf92ea78ee52e4d5c (diff) | |
download | gnunet-2c3ba0f6b9e3104be83fa485091ebb077c1aebbf.tar.gz gnunet-2c3ba0f6b9e3104be83fa485091ebb077c1aebbf.zip |
-fixes
Diffstat (limited to 'src')
-rw-r--r-- | src/mesh/test_mesh_2dtorus.conf | 2 | ||||
-rw-r--r-- | src/mesh/test_mesh_small.conf | 3 | ||||
-rw-r--r-- | src/testing_old/Makefile.am | 58 | ||||
-rw-r--r-- | src/testing_old/testing_old.conf (renamed from src/testing_old/testing.conf) | 0 |
4 files changed, 33 insertions, 30 deletions
diff --git a/src/mesh/test_mesh_2dtorus.conf b/src/mesh/test_mesh_2dtorus.conf index 9a2227bed..94e89d705 100644 --- a/src/mesh/test_mesh_2dtorus.conf +++ b/src/mesh/test_mesh_2dtorus.conf | |||
@@ -59,7 +59,7 @@ HOSTNAME = localhost | |||
59 | # PREFIX = valgrind --leak-check=full | 59 | # PREFIX = valgrind --leak-check=full |
60 | # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | 60 | # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args |
61 | 61 | ||
62 | [testing] | 62 | [testing_old] |
63 | NUM_PEERS = 16 | 63 | NUM_PEERS = 16 |
64 | WEAKRANDOM = YES | 64 | WEAKRANDOM = YES |
65 | TOPOLOGY = 2D_TORUS | 65 | TOPOLOGY = 2D_TORUS |
diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf index 005c49018..75af8b135 100644 --- a/src/mesh/test_mesh_small.conf +++ b/src/mesh/test_mesh_small.conf | |||
@@ -62,6 +62,9 @@ HOSTNAME = localhost | |||
62 | # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | 62 | # PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args |
63 | 63 | ||
64 | [testing] | 64 | [testing] |
65 | WEAKRANDOM = YES | ||
66 | |||
67 | [testing_old] | ||
65 | NUM_PEERS = 5 | 68 | NUM_PEERS = 5 |
66 | WEAKRANDOM = YES | 69 | WEAKRANDOM = YES |
67 | TOPOLOGY = NONE | 70 | TOPOLOGY = NONE |
diff --git a/src/testing_old/Makefile.am b/src/testing_old/Makefile.am index 298483189..9345760ed 100644 --- a/src/testing_old/Makefile.am +++ b/src/testing_old/Makefile.am | |||
@@ -34,14 +34,14 @@ if HAVE_EXPENSIVE_TESTS | |||
34 | endif | 34 | endif |
35 | 35 | ||
36 | lib_LTLIBRARIES = \ | 36 | lib_LTLIBRARIES = \ |
37 | libgnunettestingold.la | 37 | libgnunettesting_old.la |
38 | 38 | ||
39 | libgnunettestingold_la_SOURCES = \ | 39 | libgnunettesting_old_la_SOURCES = \ |
40 | helper.c \ | 40 | helper.c \ |
41 | testing.c \ | 41 | testing.c \ |
42 | testing_group.c \ | 42 | testing_group.c \ |
43 | testing_peergroup.c | 43 | testing_peergroup.c |
44 | libgnunettestingold_la_LIBADD = $(XLIB) \ | 44 | libgnunettesting_old_la_LIBADD = $(XLIB) \ |
45 | $(top_builddir)/src/core/libgnunetcore.la \ | 45 | $(top_builddir)/src/core/libgnunetcore.la \ |
46 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 46 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
47 | $(top_builddir)/src/transport/libgnunettransport.la \ | 47 | $(top_builddir)/src/transport/libgnunettransport.la \ |
@@ -49,7 +49,7 @@ libgnunettestingold_la_LIBADD = $(XLIB) \ | |||
49 | -lm \ | 49 | -lm \ |
50 | $(top_builddir)/src/util/libgnunetutil.la \ | 50 | $(top_builddir)/src/util/libgnunetutil.la \ |
51 | $(LTLIBINTL) | 51 | $(LTLIBINTL) |
52 | libgnunettestingold_la_LDFLAGS = \ | 52 | libgnunettesting_old_la_LDFLAGS = \ |
53 | $(GN_LIB_LDFLAGS) \ | 53 | $(GN_LIB_LDFLAGS) \ |
54 | -version-info 0:1:0 | 54 | -version-info 0:1:0 |
55 | 55 | ||
@@ -97,94 +97,94 @@ endif | |||
97 | gnunet_testing_SOURCES = \ | 97 | gnunet_testing_SOURCES = \ |
98 | gnunet-testing.c | 98 | gnunet-testing.c |
99 | gnunet_testing_LDADD = \ | 99 | gnunet_testing_LDADD = \ |
100 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 100 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
101 | $(top_builddir)/src/util/libgnunetutil.la \ | 101 | $(top_builddir)/src/util/libgnunetutil.la \ |
102 | $(GN_LIBINTL) | 102 | $(GN_LIBINTL) |
103 | gnunet_testing_DEPENDENCIES = \ | 103 | gnunet_testing_DEPENDENCIES = \ |
104 | libgnunettestingold.la | 104 | libgnunettesting_old.la |
105 | 105 | ||
106 | 106 | ||
107 | test_testing_SOURCES = \ | 107 | test_testing_SOURCES = \ |
108 | test_testing.c | 108 | test_testing.c |
109 | test_testing_LDADD = \ | 109 | test_testing_LDADD = \ |
110 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 110 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
111 | $(top_builddir)/src/util/libgnunetutil.la | 111 | $(top_builddir)/src/util/libgnunetutil.la |
112 | 112 | ||
113 | test_testing_connect_SOURCES = \ | 113 | test_testing_connect_SOURCES = \ |
114 | test_testing_connect.c | 114 | test_testing_connect.c |
115 | test_testing_connect_LDADD = \ | 115 | test_testing_connect_LDADD = \ |
116 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 116 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
117 | $(top_builddir)/src/util/libgnunetutil.la | 117 | $(top_builddir)/src/util/libgnunetutil.la |
118 | 118 | ||
119 | test_testing_reconnect_SOURCES = \ | 119 | test_testing_reconnect_SOURCES = \ |
120 | test_testing_reconnect.c | 120 | test_testing_reconnect.c |
121 | test_testing_reconnect_LDADD = \ | 121 | test_testing_reconnect_LDADD = \ |
122 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 122 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
123 | $(top_builddir)/src/util/libgnunetutil.la | 123 | $(top_builddir)/src/util/libgnunetutil.la |
124 | 124 | ||
125 | test_testing_group_SOURCES = \ | 125 | test_testing_group_SOURCES = \ |
126 | test_testing_group.c | 126 | test_testing_group.c |
127 | test_testing_group_LDADD = \ | 127 | test_testing_group_LDADD = \ |
128 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 128 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
129 | $(top_builddir)/src/util/libgnunetutil.la | 129 | $(top_builddir)/src/util/libgnunetutil.la |
130 | 130 | ||
131 | test_testing_peergroup_SOURCES = \ | 131 | test_testing_peergroup_SOURCES = \ |
132 | test_testing_peergroup.c | 132 | test_testing_peergroup.c |
133 | test_testing_peergroup_LDADD = \ | 133 | test_testing_peergroup_LDADD = \ |
134 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 134 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
135 | $(top_builddir)/src/util/libgnunetutil.la | 135 | $(top_builddir)/src/util/libgnunetutil.la |
136 | 136 | ||
137 | test_testing_topology_clique_SOURCES = \ | 137 | test_testing_topology_clique_SOURCES = \ |
138 | test_testing_topology.c | 138 | test_testing_topology.c |
139 | test_testing_topology_clique_LDADD = \ | 139 | test_testing_topology_clique_LDADD = \ |
140 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 140 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
141 | $(top_builddir)/src/core/libgnunetcore.la \ | 141 | $(top_builddir)/src/core/libgnunetcore.la \ |
142 | $(top_builddir)/src/util/libgnunetutil.la | 142 | $(top_builddir)/src/util/libgnunetutil.la |
143 | 143 | ||
144 | test_testing_topology_stability_SOURCES = \ | 144 | test_testing_topology_stability_SOURCES = \ |
145 | test_testing_topology.c | 145 | test_testing_topology.c |
146 | test_testing_topology_stability_LDADD = \ | 146 | test_testing_topology_stability_LDADD = \ |
147 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 147 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
148 | $(top_builddir)/src/core/libgnunetcore.la \ | 148 | $(top_builddir)/src/core/libgnunetcore.la \ |
149 | $(top_builddir)/src/util/libgnunetutil.la | 149 | $(top_builddir)/src/util/libgnunetutil.la |
150 | 150 | ||
151 | test_testing_topology_blacklist_SOURCES = \ | 151 | test_testing_topology_blacklist_SOURCES = \ |
152 | test_testing_topology_blacklist.c | 152 | test_testing_topology_blacklist.c |
153 | test_testing_topology_blacklist_LDADD = \ | 153 | test_testing_topology_blacklist_LDADD = \ |
154 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 154 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
155 | $(top_builddir)/src/util/libgnunetutil.la | 155 | $(top_builddir)/src/util/libgnunetutil.la |
156 | 156 | ||
157 | test_testing_topology_churn_SOURCES = \ | 157 | test_testing_topology_churn_SOURCES = \ |
158 | test_testing_topology_churn.c | 158 | test_testing_topology_churn.c |
159 | test_testing_topology_churn_LDADD = \ | 159 | test_testing_topology_churn_LDADD = \ |
160 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 160 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
161 | $(top_builddir)/src/util/libgnunetutil.la | 161 | $(top_builddir)/src/util/libgnunetutil.la |
162 | 162 | ||
163 | test_testing_topology_clique_random_SOURCES = \ | 163 | test_testing_topology_clique_random_SOURCES = \ |
164 | test_testing_topology.c | 164 | test_testing_topology.c |
165 | test_testing_topology_clique_random_LDADD = \ | 165 | test_testing_topology_clique_random_LDADD = \ |
166 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 166 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
167 | $(top_builddir)/src/core/libgnunetcore.la \ | 167 | $(top_builddir)/src/core/libgnunetcore.la \ |
168 | $(top_builddir)/src/util/libgnunetutil.la | 168 | $(top_builddir)/src/util/libgnunetutil.la |
169 | 169 | ||
170 | test_testing_topology_clique_minimum_SOURCES = \ | 170 | test_testing_topology_clique_minimum_SOURCES = \ |
171 | test_testing_topology.c | 171 | test_testing_topology.c |
172 | test_testing_topology_clique_minimum_LDADD = \ | 172 | test_testing_topology_clique_minimum_LDADD = \ |
173 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 173 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
174 | $(top_builddir)/src/core/libgnunetcore.la \ | 174 | $(top_builddir)/src/core/libgnunetcore.la \ |
175 | $(top_builddir)/src/util/libgnunetutil.la | 175 | $(top_builddir)/src/util/libgnunetutil.la |
176 | 176 | ||
177 | test_testing_topology_clique_dfs_SOURCES = \ | 177 | test_testing_topology_clique_dfs_SOURCES = \ |
178 | test_testing_topology.c | 178 | test_testing_topology.c |
179 | test_testing_topology_clique_dfs_LDADD = \ | 179 | test_testing_topology_clique_dfs_LDADD = \ |
180 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 180 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
181 | $(top_builddir)/src/core/libgnunetcore.la \ | 181 | $(top_builddir)/src/core/libgnunetcore.la \ |
182 | $(top_builddir)/src/util/libgnunetutil.la | 182 | $(top_builddir)/src/util/libgnunetutil.la |
183 | 183 | ||
184 | test_testing_topology_line_SOURCES = \ | 184 | test_testing_topology_line_SOURCES = \ |
185 | test_testing_topology.c | 185 | test_testing_topology.c |
186 | test_testing_topology_line_LDADD = \ | 186 | test_testing_topology_line_LDADD = \ |
187 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 187 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
188 | $(top_builddir)/src/core/libgnunetcore.la \ | 188 | $(top_builddir)/src/core/libgnunetcore.la \ |
189 | $(top_builddir)/src/util/libgnunetutil.la | 189 | $(top_builddir)/src/util/libgnunetutil.la |
190 | 190 | ||
@@ -192,68 +192,68 @@ test_testing_topology_line_LDADD = \ | |||
192 | test_testing_group_remote_SOURCES = \ | 192 | test_testing_group_remote_SOURCES = \ |
193 | test_testing_group_remote.c | 193 | test_testing_group_remote.c |
194 | test_testing_group_remote_LDADD = \ | 194 | test_testing_group_remote_LDADD = \ |
195 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 195 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
196 | $(top_builddir)/src/util/libgnunetutil.la | 196 | $(top_builddir)/src/util/libgnunetutil.la |
197 | 197 | ||
198 | test_testing_2dtorus_SOURCES = \ | 198 | test_testing_2dtorus_SOURCES = \ |
199 | test_testing_2dtorus.c | 199 | test_testing_2dtorus.c |
200 | test_testing_2dtorus_LDADD = \ | 200 | test_testing_2dtorus_LDADD = \ |
201 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 201 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
202 | $(top_builddir)/src/util/libgnunetutil.la | 202 | $(top_builddir)/src/util/libgnunetutil.la |
203 | 203 | ||
204 | test_testing_topology_ring_SOURCES = \ | 204 | test_testing_topology_ring_SOURCES = \ |
205 | test_testing_topology.c | 205 | test_testing_topology.c |
206 | test_testing_topology_ring_LDADD = \ | 206 | test_testing_topology_ring_LDADD = \ |
207 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 207 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
208 | $(top_builddir)/src/core/libgnunetcore.la \ | 208 | $(top_builddir)/src/core/libgnunetcore.la \ |
209 | $(top_builddir)/src/util/libgnunetutil.la | 209 | $(top_builddir)/src/util/libgnunetutil.la |
210 | 210 | ||
211 | test_testing_topology_2d_torus_SOURCES = \ | 211 | test_testing_topology_2d_torus_SOURCES = \ |
212 | test_testing_topology.c | 212 | test_testing_topology.c |
213 | test_testing_topology_2d_torus_LDADD = \ | 213 | test_testing_topology_2d_torus_LDADD = \ |
214 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 214 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
215 | $(top_builddir)/src/core/libgnunetcore.la \ | 215 | $(top_builddir)/src/core/libgnunetcore.la \ |
216 | $(top_builddir)/src/util/libgnunetutil.la | 216 | $(top_builddir)/src/util/libgnunetutil.la |
217 | 217 | ||
218 | test_testing_topology_small_world_ring_SOURCES = \ | 218 | test_testing_topology_small_world_ring_SOURCES = \ |
219 | test_testing_topology.c | 219 | test_testing_topology.c |
220 | test_testing_topology_small_world_ring_LDADD = \ | 220 | test_testing_topology_small_world_ring_LDADD = \ |
221 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 221 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
222 | $(top_builddir)/src/core/libgnunetcore.la \ | 222 | $(top_builddir)/src/core/libgnunetcore.la \ |
223 | $(top_builddir)/src/util/libgnunetutil.la | 223 | $(top_builddir)/src/util/libgnunetutil.la |
224 | 224 | ||
225 | test_testing_topology_small_world_torus_SOURCES = \ | 225 | test_testing_topology_small_world_torus_SOURCES = \ |
226 | test_testing_topology.c | 226 | test_testing_topology.c |
227 | test_testing_topology_small_world_torus_LDADD = \ | 227 | test_testing_topology_small_world_torus_LDADD = \ |
228 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 228 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
229 | $(top_builddir)/src/core/libgnunetcore.la \ | 229 | $(top_builddir)/src/core/libgnunetcore.la \ |
230 | $(top_builddir)/src/util/libgnunetutil.la | 230 | $(top_builddir)/src/util/libgnunetutil.la |
231 | 231 | ||
232 | test_testing_topology_internat_SOURCES = \ | 232 | test_testing_topology_internat_SOURCES = \ |
233 | test_testing_topology.c | 233 | test_testing_topology.c |
234 | test_testing_topology_internat_LDADD = \ | 234 | test_testing_topology_internat_LDADD = \ |
235 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 235 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
236 | $(top_builddir)/src/core/libgnunetcore.la \ | 236 | $(top_builddir)/src/core/libgnunetcore.la \ |
237 | $(top_builddir)/src/util/libgnunetutil.la | 237 | $(top_builddir)/src/util/libgnunetutil.la |
238 | 238 | ||
239 | test_testing_topology_erdos_renyi_SOURCES = \ | 239 | test_testing_topology_erdos_renyi_SOURCES = \ |
240 | test_testing_topology.c | 240 | test_testing_topology.c |
241 | test_testing_topology_erdos_renyi_LDADD = \ | 241 | test_testing_topology_erdos_renyi_LDADD = \ |
242 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 242 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
243 | $(top_builddir)/src/core/libgnunetcore.la \ | 243 | $(top_builddir)/src/core/libgnunetcore.la \ |
244 | $(top_builddir)/src/util/libgnunetutil.la | 244 | $(top_builddir)/src/util/libgnunetutil.la |
245 | 245 | ||
246 | test_testing_topology_scale_free_SOURCES = \ | 246 | test_testing_topology_scale_free_SOURCES = \ |
247 | test_testing_topology.c | 247 | test_testing_topology.c |
248 | test_testing_topology_scale_free_LDADD = \ | 248 | test_testing_topology_scale_free_LDADD = \ |
249 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 249 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
250 | $(top_builddir)/src/core/libgnunetcore.la \ | 250 | $(top_builddir)/src/core/libgnunetcore.la \ |
251 | $(top_builddir)/src/util/libgnunetutil.la | 251 | $(top_builddir)/src/util/libgnunetutil.la |
252 | 252 | ||
253 | test_testing_topology_none_SOURCES = \ | 253 | test_testing_topology_none_SOURCES = \ |
254 | test_testing_topology.c | 254 | test_testing_topology.c |
255 | test_testing_topology_none_LDADD = \ | 255 | test_testing_topology_none_LDADD = \ |
256 | $(top_builddir)/src/testing_old/libgnunettestingold.la \ | 256 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ |
257 | $(top_builddir)/src/core/libgnunetcore.la \ | 257 | $(top_builddir)/src/core/libgnunetcore.la \ |
258 | $(top_builddir)/src/util/libgnunetutil.la | 258 | $(top_builddir)/src/util/libgnunetutil.la |
259 | 259 | ||
diff --git a/src/testing_old/testing.conf b/src/testing_old/testing_old.conf index 7e25f8c13..7e25f8c13 100644 --- a/src/testing_old/testing.conf +++ b/src/testing_old/testing_old.conf | |||