diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-03-07 19:53:47 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-03-07 19:53:47 +0000 |
commit | 4d10e320ee851b268875c745c4de309e9327a6c4 (patch) | |
tree | eea7ff789f5dc314f9477ff01ec1cd27ed044e00 /src/ats-tests | |
parent | bc78e0025e4858ebb1897aa113a8d2a8dfe65e7a (diff) | |
download | gnunet-4d10e320ee851b268875c745c4de309e9327a6c4.tar.gz gnunet-4d10e320ee851b268875c745c4de309e9327a6c4.zip |
-one more ATS header to be included
Diffstat (limited to 'src/ats-tests')
-rw-r--r-- | src/ats-tests/Makefile.am | 61 |
1 files changed, 31 insertions, 30 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index 22992c40e..a8173fb1d 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am | |||
@@ -35,7 +35,7 @@ TESTING_TESTS = \ | |||
35 | endif | 35 | endif |
36 | 36 | ||
37 | lib_LTLIBRARIES = \ | 37 | lib_LTLIBRARIES = \ |
38 | libgnunetatstesting.la | 38 | libgnunetatstesting.la |
39 | 39 | ||
40 | check_PROGRAMS = \ | 40 | check_PROGRAMS = \ |
41 | $(TESTING_TESTS) | 41 | $(TESTING_TESTS) |
@@ -47,9 +47,10 @@ endif | |||
47 | 47 | ||
48 | noinst_PROGRAMS = \ | 48 | noinst_PROGRAMS = \ |
49 | gnunet-ats-sim gnunet-solver-eval | 49 | gnunet-ats-sim gnunet-solver-eval |
50 | 50 | ||
51 | libgnunetatstesting_la_SOURCES = \ | 51 | libgnunetatstesting_la_SOURCES = \ |
52 | ats-testing.c ats-testing-log.c ats-testing-traffic.c \ | 52 | ats-testing.c ats-testing.h \ |
53 | ats-testing-log.c ats-testing-traffic.c \ | ||
53 | ats-testing-experiment.c ats-testing-preferences.c | 54 | ats-testing-experiment.c ats-testing-preferences.c |
54 | libgnunetatstesting_la_LIBADD = \ | 55 | libgnunetatstesting_la_LIBADD = \ |
55 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 56 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
@@ -60,28 +61,28 @@ libgnunetatstesting_la_DEPENDENCIES = \ | |||
60 | $(top_builddir)/src/ats/libgnunetats.la | 61 | $(top_builddir)/src/ats/libgnunetats.la |
61 | libgnunetatstesting_la_LDFLAGS = \ | 62 | libgnunetatstesting_la_LDFLAGS = \ |
62 | $(GN_LIB_LDFLAGS) | 63 | $(GN_LIB_LDFLAGS) |
63 | 64 | ||
64 | gnunet_ats_sim_SOURCES = \ | 65 | gnunet_ats_sim_SOURCES = \ |
65 | gnunet-ats-sim.c | 66 | gnunet-ats-sim.c |
66 | gnunet_ats_sim_LDADD = \ | 67 | gnunet_ats_sim_LDADD = \ |
67 | $(top_builddir)/src/util/libgnunetutil.la \ | 68 | $(top_builddir)/src/util/libgnunetutil.la \ |
68 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | 69 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ |
69 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 70 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
70 | $(top_builddir)/src/ats/libgnunetats.la \ | 71 | $(top_builddir)/src/ats/libgnunetats.la \ |
71 | $(top_builddir)/src/core/libgnunetcore.la \ | 72 | $(top_builddir)/src/core/libgnunetcore.la \ |
72 | $(top_builddir)/src/transport/libgnunettransport.la | 73 | $(top_builddir)/src/transport/libgnunettransport.la |
73 | gnunet_ats_sim_DEPENDENCIES = \ | 74 | gnunet_ats_sim_DEPENDENCIES = \ |
74 | libgnunetatstesting.la \ | 75 | libgnunetatstesting.la \ |
75 | $(top_builddir)/src/util/libgnunetutil.la | 76 | $(top_builddir)/src/util/libgnunetutil.la |
76 | 77 | ||
77 | 78 | ||
78 | gnunet_solver_eval_SOURCES = \ | 79 | gnunet_solver_eval_SOURCES = \ |
79 | gnunet-solver-eval.c | 80 | gnunet-solver-eval.c |
80 | gnunet_solver_eval_LDADD = \ | 81 | gnunet_solver_eval_LDADD = \ |
81 | $(top_builddir)/src/util/libgnunetutil.la \ | 82 | $(top_builddir)/src/util/libgnunetutil.la \ |
82 | $(top_builddir)/src/ats/libgnunetats.la \ | 83 | $(top_builddir)/src/ats/libgnunetats.la \ |
83 | $(top_builddir)/src/core/libgnunetcore.la \ | 84 | $(top_builddir)/src/core/libgnunetcore.la \ |
84 | $(top_builddir)/src/transport/libgnunettransport.la | 85 | $(top_builddir)/src/transport/libgnunettransport.la |
85 | gnunet_solver_eval_DEPENDENCIES = \ | 86 | gnunet_solver_eval_DEPENDENCIES = \ |
86 | $(top_builddir)/src/util/libgnunetutil.la | 87 | $(top_builddir)/src/util/libgnunetutil.la |
87 | 88 | ||
@@ -97,7 +98,7 @@ perf_ats_proportional_core_none_LDADD = \ | |||
97 | $(top_builddir)/src/transport/libgnunettransport.la | 98 | $(top_builddir)/src/transport/libgnunettransport.la |
98 | perf_ats_proportional_core_DEPENDENCIES = \ | 99 | perf_ats_proportional_core_DEPENDENCIES = \ |
99 | libgnunetatstesting.la \ | 100 | libgnunetatstesting.la \ |
100 | $(top_builddir)/src/util/libgnunetutil.la | 101 | $(top_builddir)/src/util/libgnunetutil.la |
101 | 102 | ||
102 | perf_ats_proportional_transport_none_SOURCES = \ | 103 | perf_ats_proportional_transport_none_SOURCES = \ |
103 | perf_ats.c | 104 | perf_ats.c |
@@ -110,7 +111,7 @@ perf_ats_proportional_transport_none_LDADD = \ | |||
110 | $(top_builddir)/src/transport/libgnunettransport.la | 111 | $(top_builddir)/src/transport/libgnunettransport.la |
111 | perf_ats_proportional_transport_none_DEPENDENCIES = \ | 112 | perf_ats_proportional_transport_none_DEPENDENCIES = \ |
112 | libgnunetatstesting.la \ | 113 | libgnunetatstesting.la \ |
113 | $(top_builddir)/src/util/libgnunetutil.la | 114 | $(top_builddir)/src/util/libgnunetutil.la |
114 | 115 | ||
115 | perf_ats_proportional_core_bandwidth_SOURCES = \ | 116 | perf_ats_proportional_core_bandwidth_SOURCES = \ |
116 | perf_ats.c | 117 | perf_ats.c |
@@ -123,7 +124,7 @@ perf_ats_proportional_core_bandwidth_LDADD = \ | |||
123 | $(top_builddir)/src/transport/libgnunettransport.la | 124 | $(top_builddir)/src/transport/libgnunettransport.la |
124 | perf_ats_proportional_core_bandwidth_DEPENDENCIES = \ | 125 | perf_ats_proportional_core_bandwidth_DEPENDENCIES = \ |
125 | libgnunetatstesting.la \ | 126 | libgnunetatstesting.la \ |
126 | $(top_builddir)/src/util/libgnunetutil.la | 127 | $(top_builddir)/src/util/libgnunetutil.la |
127 | 128 | ||
128 | perf_ats_proportional_transport_bandwidth_SOURCES = \ | 129 | perf_ats_proportional_transport_bandwidth_SOURCES = \ |
129 | perf_ats.c | 130 | perf_ats.c |
@@ -136,7 +137,7 @@ perf_ats_proportional_transport_bandwidth_LDADD = \ | |||
136 | $(top_builddir)/src/transport/libgnunettransport.la | 137 | $(top_builddir)/src/transport/libgnunettransport.la |
137 | perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \ | 138 | perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \ |
138 | libgnunetatstesting.la \ | 139 | libgnunetatstesting.la \ |
139 | $(top_builddir)/src/util/libgnunetutil.la | 140 | $(top_builddir)/src/util/libgnunetutil.la |
140 | 141 | ||
141 | perf_ats_proportional_core_latency_SOURCES = \ | 142 | perf_ats_proportional_core_latency_SOURCES = \ |
142 | perf_ats.c | 143 | perf_ats.c |
@@ -149,8 +150,8 @@ perf_ats_proportional_core_latency_LDADD = \ | |||
149 | $(top_builddir)/src/transport/libgnunettransport.la | 150 | $(top_builddir)/src/transport/libgnunettransport.la |
150 | perf_ats_proportional_core_latency_DEPENDENCIES = \ | 151 | perf_ats_proportional_core_latency_DEPENDENCIES = \ |
151 | libgnunetatstesting.la \ | 152 | libgnunetatstesting.la \ |
152 | $(top_builddir)/src/util/libgnunetutil.la | 153 | $(top_builddir)/src/util/libgnunetutil.la |
153 | 154 | ||
154 | perf_ats_proportional_transport_latency_SOURCES = \ | 155 | perf_ats_proportional_transport_latency_SOURCES = \ |
155 | perf_ats.c | 156 | perf_ats.c |
156 | perf_ats_proportional_transport_latency_LDADD = \ | 157 | perf_ats_proportional_transport_latency_LDADD = \ |
@@ -162,7 +163,7 @@ perf_ats_proportional_transport_latency_LDADD = \ | |||
162 | $(top_builddir)/src/transport/libgnunettransport.la | 163 | $(top_builddir)/src/transport/libgnunettransport.la |
163 | perf_ats_proportional_transport_latency_DEPENDENCIES = \ | 164 | perf_ats_proportional_transport_latency_DEPENDENCIES = \ |
164 | libgnunetatstesting.la \ | 165 | libgnunetatstesting.la \ |
165 | $(top_builddir)/src/util/libgnunetutil.la | 166 | $(top_builddir)/src/util/libgnunetutil.la |
166 | 167 | ||
167 | if HAVE_LIBGLPK | 168 | if HAVE_LIBGLPK |
168 | perf_ats_mlp_core_none_SOURCES = \ | 169 | perf_ats_mlp_core_none_SOURCES = \ |
@@ -176,8 +177,8 @@ perf_ats_mlp_core_none_LDADD = \ | |||
176 | $(top_builddir)/src/transport/libgnunettransport.la | 177 | $(top_builddir)/src/transport/libgnunettransport.la |
177 | perf_ats_mlp_core_none_DEPENDENCIES = \ | 178 | perf_ats_mlp_core_none_DEPENDENCIES = \ |
178 | libgnunetatstesting.la \ | 179 | libgnunetatstesting.la \ |
179 | $(top_builddir)/src/util/libgnunetutil.la | 180 | $(top_builddir)/src/util/libgnunetutil.la |
180 | 181 | ||
181 | perf_ats_mlp_transport_none_SOURCES = \ | 182 | perf_ats_mlp_transport_none_SOURCES = \ |
182 | perf_ats.c | 183 | perf_ats.c |
183 | perf_ats_mlp_transport_none_LDADD = \ | 184 | perf_ats_mlp_transport_none_LDADD = \ |
@@ -189,7 +190,7 @@ perf_ats_mlp_transport_none_LDADD = \ | |||
189 | $(top_builddir)/src/transport/libgnunettransport.la | 190 | $(top_builddir)/src/transport/libgnunettransport.la |
190 | perf_ats_mlp_transport_none_DEPENDENCIES = \ | 191 | perf_ats_mlp_transport_none_DEPENDENCIES = \ |
191 | libgnunetatstesting.la \ | 192 | libgnunetatstesting.la \ |
192 | $(top_builddir)/src/util/libgnunetutil.la | 193 | $(top_builddir)/src/util/libgnunetutil.la |
193 | 194 | ||
194 | perf_ats_mlp_core_bandwidth_SOURCES = \ | 195 | perf_ats_mlp_core_bandwidth_SOURCES = \ |
195 | perf_ats.c | 196 | perf_ats.c |
@@ -202,7 +203,7 @@ perf_ats_mlp_core_bandwidth_LDADD = \ | |||
202 | $(top_builddir)/src/transport/libgnunettransport.la | 203 | $(top_builddir)/src/transport/libgnunettransport.la |
203 | perf_ats_mlp_core_bandwidth_DEPENDENCIES = \ | 204 | perf_ats_mlp_core_bandwidth_DEPENDENCIES = \ |
204 | libgnunetatstesting.la \ | 205 | libgnunetatstesting.la \ |
205 | $(top_builddir)/src/util/libgnunetutil.la | 206 | $(top_builddir)/src/util/libgnunetutil.la |
206 | 207 | ||
207 | perf_ats_mlp_transport_bandwidth_SOURCES = \ | 208 | perf_ats_mlp_transport_bandwidth_SOURCES = \ |
208 | perf_ats.c | 209 | perf_ats.c |
@@ -215,7 +216,7 @@ perf_ats_mlp_transport_bandwidth_LDADD = \ | |||
215 | $(top_builddir)/src/transport/libgnunettransport.la | 216 | $(top_builddir)/src/transport/libgnunettransport.la |
216 | perf_ats_mlp_transport_bandwidth_DEPENDENCIES = \ | 217 | perf_ats_mlp_transport_bandwidth_DEPENDENCIES = \ |
217 | libgnunetatstesting.la \ | 218 | libgnunetatstesting.la \ |
218 | $(top_builddir)/src/util/libgnunetutil.la | 219 | $(top_builddir)/src/util/libgnunetutil.la |
219 | 220 | ||
220 | perf_ats_mlp_core_latency_SOURCES = \ | 221 | perf_ats_mlp_core_latency_SOURCES = \ |
221 | perf_ats.c | 222 | perf_ats.c |
@@ -228,7 +229,7 @@ perf_ats_mlp_core_latency_LDADD = \ | |||
228 | $(top_builddir)/src/transport/libgnunettransport.la | 229 | $(top_builddir)/src/transport/libgnunettransport.la |
229 | perf_ats_mlp_core_latency_DEPENDENCIES = \ | 230 | perf_ats_mlp_core_latency_DEPENDENCIES = \ |
230 | libgnunetatstesting.la \ | 231 | libgnunetatstesting.la \ |
231 | $(top_builddir)/src/util/libgnunetutil.la | 232 | $(top_builddir)/src/util/libgnunetutil.la |
232 | 233 | ||
233 | perf_ats_mlp_transport_latency_SOURCES = \ | 234 | perf_ats_mlp_transport_latency_SOURCES = \ |
234 | perf_ats.c | 235 | perf_ats.c |
@@ -241,7 +242,7 @@ perf_ats_mlp_transport_latency_LDADD = \ | |||
241 | $(top_builddir)/src/transport/libgnunettransport.la | 242 | $(top_builddir)/src/transport/libgnunettransport.la |
242 | perf_ats_mlp_transport_latencyDEPENDENCIES = \ | 243 | perf_ats_mlp_transport_latencyDEPENDENCIES = \ |
243 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ | 244 | $(top_builddir)/src/ats-tests/libgnunetatstesting.la \ |
244 | $(top_builddir)/src/util/libgnunetutil.la | 245 | $(top_builddir)/src/util/libgnunetutil.la |
245 | endif | 246 | endif |
246 | 247 | ||
247 | perf_ats_ril_core_none_SOURCES = \ | 248 | perf_ats_ril_core_none_SOURCES = \ |
@@ -255,7 +256,7 @@ perf_ats_ril_core_none_LDADD = \ | |||
255 | $(top_builddir)/src/transport/libgnunettransport.la | 256 | $(top_builddir)/src/transport/libgnunettransport.la |
256 | perf_ats_ril_core_none_DEPENDENCIES = \ | 257 | perf_ats_ril_core_none_DEPENDENCIES = \ |
257 | libgnunetatstesting.la \ | 258 | libgnunetatstesting.la \ |
258 | $(top_builddir)/src/util/libgnunetutil.la | 259 | $(top_builddir)/src/util/libgnunetutil.la |
259 | 260 | ||
260 | perf_ats_ril_transport_none_SOURCES = \ | 261 | perf_ats_ril_transport_none_SOURCES = \ |
261 | perf_ats.c | 262 | perf_ats.c |
@@ -268,7 +269,7 @@ perf_ats_ril_transport_none_LDADD = \ | |||
268 | $(top_builddir)/src/transport/libgnunettransport.la | 269 | $(top_builddir)/src/transport/libgnunettransport.la |
269 | perf_ats_ril_transport_none_DEPENDENCIES = \ | 270 | perf_ats_ril_transport_none_DEPENDENCIES = \ |
270 | libgnunetatstesting.la \ | 271 | libgnunetatstesting.la \ |
271 | $(top_builddir)/src/util/libgnunetutil.la | 272 | $(top_builddir)/src/util/libgnunetutil.la |
272 | 273 | ||
273 | perf_ats_ril_core_bandwidth_SOURCES = \ | 274 | perf_ats_ril_core_bandwidth_SOURCES = \ |
274 | perf_ats.c | 275 | perf_ats.c |
@@ -281,7 +282,7 @@ perf_ats_ril_core_bandwidth_LDADD = \ | |||
281 | $(top_builddir)/src/transport/libgnunettransport.la | 282 | $(top_builddir)/src/transport/libgnunettransport.la |
282 | perf_ats_ril_core_bandwidth_DEPENDENCIES = \ | 283 | perf_ats_ril_core_bandwidth_DEPENDENCIES = \ |
283 | libgnunetatstesting.la \ | 284 | libgnunetatstesting.la \ |
284 | $(top_builddir)/src/util/libgnunetutil.la | 285 | $(top_builddir)/src/util/libgnunetutil.la |
285 | 286 | ||
286 | perf_ats_ril_transport_bandwidth_SOURCES = \ | 287 | perf_ats_ril_transport_bandwidth_SOURCES = \ |
287 | perf_ats.c | 288 | perf_ats.c |
@@ -294,8 +295,8 @@ perf_ats_ril_transport_bandwidth_LDADD = \ | |||
294 | $(top_builddir)/src/transport/libgnunettransport.la | 295 | $(top_builddir)/src/transport/libgnunettransport.la |
295 | perf_ats_ril_transport_DEPENDENCIES = \ | 296 | perf_ats_ril_transport_DEPENDENCIES = \ |
296 | libgnunetatstesting.la \ | 297 | libgnunetatstesting.la \ |
297 | $(top_builddir)/src/util/libgnunetutil.la | 298 | $(top_builddir)/src/util/libgnunetutil.la |
298 | 299 | ||
299 | 300 | ||
300 | perf_ats_ril_core_latency_SOURCES = \ | 301 | perf_ats_ril_core_latency_SOURCES = \ |
301 | perf_ats.c | 302 | perf_ats.c |
@@ -308,8 +309,8 @@ perf_ats_ril_core_latency_LDADD = \ | |||
308 | $(top_builddir)/src/transport/libgnunettransport.la | 309 | $(top_builddir)/src/transport/libgnunettransport.la |
309 | perf_ats_ril_core_latency_DEPENDENCIES = \ | 310 | perf_ats_ril_core_latency_DEPENDENCIES = \ |
310 | libgnunetatstesting.la \ | 311 | libgnunetatstesting.la \ |
311 | $(top_builddir)/src/util/libgnunetutil.la | 312 | $(top_builddir)/src/util/libgnunetutil.la |
312 | 313 | ||
313 | perf_ats_ril_transport_latency_SOURCES = \ | 314 | perf_ats_ril_transport_latency_SOURCES = \ |
314 | perf_ats.c | 315 | perf_ats.c |
315 | perf_ats_ril_transport_latency_LDADD = \ | 316 | perf_ats_ril_transport_latency_LDADD = \ |
@@ -321,7 +322,7 @@ perf_ats_ril_transport_latency_LDADD = \ | |||
321 | $(top_builddir)/src/transport/libgnunettransport.la | 322 | $(top_builddir)/src/transport/libgnunettransport.la |
322 | perf_ats_ril_transport_latency_DEPENDENCIES = \ | 323 | perf_ats_ril_transport_latency_DEPENDENCIES = \ |
323 | libgnunetatstesting.la \ | 324 | libgnunetatstesting.la \ |
324 | $(top_builddir)/src/util/libgnunetutil.la | 325 | $(top_builddir)/src/util/libgnunetutil.la |
325 | 326 | ||
326 | EXTRA_DIST = \ | 327 | EXTRA_DIST = \ |
327 | gnunet_ats_sim_default.conf \ | 328 | gnunet_ats_sim_default.conf \ |