diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-12-23 19:59:19 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-12-23 19:59:19 +0000 |
commit | 24ab114f7fb0127e14c358f276bc3ba016998dc1 (patch) | |
tree | 03bbbf4b370eacfe2a0b006a469fb31d975e284f /src/ats-tests | |
parent | 57be3d66fe1ef0776f90175cf5c6970eeba4a904 (diff) | |
download | gnunet-24ab114f7fb0127e14c358f276bc3ba016998dc1.tar.gz gnunet-24ab114f7fb0127e14c358f276bc3ba016998dc1.zip |
-fix
Diffstat (limited to 'src/ats-tests')
-rw-r--r-- | src/ats-tests/Makefile.am | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index f943f0564..1cdeb6b5b 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am | |||
@@ -5,7 +5,7 @@ pkgcfgdir= $(pkgdatadir)/config.d/ | |||
5 | libexecdir= $(pkglibdir)/libexec/ | 5 | libexecdir= $(pkglibdir)/libexec/ |
6 | 6 | ||
7 | if MINGW | 7 | if MINGW |
8 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols | 8 | WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols |
9 | endif | 9 | endif |
10 | 10 | ||
11 | if USE_COVERAGE | 11 | if USE_COVERAGE |
@@ -18,7 +18,7 @@ if HAVE_LIBGLPK | |||
18 | perf_ats_mlp_transport_bandwidth \ | 18 | perf_ats_mlp_transport_bandwidth \ |
19 | perf_ats_mlp_core_bandwidth \ | 19 | perf_ats_mlp_core_bandwidth \ |
20 | perf_ats_mlp_transport_latency \ | 20 | perf_ats_mlp_transport_latency \ |
21 | perf_ats_mlp_core_latency | 21 | perf_ats_mlp_core_latency |
22 | endif | 22 | endif |
23 | 23 | ||
24 | if HAVE_TESTING | 24 | if HAVE_TESTING |
@@ -29,30 +29,30 @@ TESTING_TESTS = \ | |||
29 | perf_ats_proportional_core_bandwidth \ | 29 | perf_ats_proportional_core_bandwidth \ |
30 | perf_ats_proportional_transport_latency \ | 30 | perf_ats_proportional_transport_latency \ |
31 | perf_ats_proportional_core_latency | 31 | perf_ats_proportional_core_latency |
32 | # $(PERF_MLP) | 32 | # $(PERF_MLP) |
33 | #perf_ats_ril_transport_none \ | 33 | #perf_ats_ril_transport_none \ |
34 | #perf_ats_ril_core_none \ | 34 | #perf_ats_ril_core_none \ |
35 | #perf_ats_ril_transport_bandwidth \ | 35 | #perf_ats_ril_transport_bandwidth \ |
36 | #perf_ats_ril_core_bandwidth \ | 36 | #perf_ats_ril_core_bandwidth \ |
37 | #perf_ats_ril_transport_latency \ | 37 | #perf_ats_ril_transport_latency \ |
38 | #perf_ats_ril_core_latency | 38 | #perf_ats_ril_core_latency |
39 | endif | 39 | endif |
40 | 40 | ||
41 | check_PROGRAMS = \ | 41 | check_PROGRAMS = \ |
42 | $(TESTING_TESTS) | 42 | $(TESTING_TESTS) |
43 | 43 | ||
44 | if ENABLE_TEST_RUN | 44 | if ENABLE_TEST_RUN |
45 | TESTS = $(check_PROGRAMS) | 45 | TESTS = $(check_PROGRAMS) |
46 | endif | 46 | endif |
47 | 47 | ||
48 | perf_ats_proportional_core_none_SOURCES = \ | 48 | perf_ats_proportional_core_none_SOURCES = \ |
49 | perf_ats.c perf_ats_logging.c | 49 | perf_ats.c perf_ats_logging.c perf_ats.h |
50 | perf_ats_proportional_core_none_LDADD = \ | 50 | perf_ats_proportional_core_none_LDADD = \ |
51 | $(top_builddir)/src/util/libgnunetutil.la \ | 51 | $(top_builddir)/src/util/libgnunetutil.la \ |
52 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 52 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
53 | $(top_builddir)/src/ats/libgnunetats.la \ | 53 | $(top_builddir)/src/ats/libgnunetats.la \ |
54 | $(top_builddir)/src/core/libgnunetcore.la \ | 54 | $(top_builddir)/src/core/libgnunetcore.la \ |
55 | $(top_builddir)/src/transport/libgnunettransport.la | 55 | $(top_builddir)/src/transport/libgnunettransport.la |
56 | 56 | ||
57 | perf_ats_proportional_transport_none_SOURCES = \ | 57 | perf_ats_proportional_transport_none_SOURCES = \ |
58 | perf_ats.c perf_ats_logging.c | 58 | perf_ats.c perf_ats_logging.c |
@@ -61,7 +61,7 @@ perf_ats_proportional_transport_none_LDADD = \ | |||
61 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 61 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
62 | $(top_builddir)/src/ats/libgnunetats.la \ | 62 | $(top_builddir)/src/ats/libgnunetats.la \ |
63 | $(top_builddir)/src/core/libgnunetcore.la \ | 63 | $(top_builddir)/src/core/libgnunetcore.la \ |
64 | $(top_builddir)/src/transport/libgnunettransport.la | 64 | $(top_builddir)/src/transport/libgnunettransport.la |
65 | 65 | ||
66 | perf_ats_proportional_core_bandwidth_SOURCES = \ | 66 | perf_ats_proportional_core_bandwidth_SOURCES = \ |
67 | perf_ats.c perf_ats_logging.c | 67 | perf_ats.c perf_ats_logging.c |
@@ -70,7 +70,7 @@ perf_ats_proportional_core_bandwidth_LDADD = \ | |||
70 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 70 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
71 | $(top_builddir)/src/ats/libgnunetats.la \ | 71 | $(top_builddir)/src/ats/libgnunetats.la \ |
72 | $(top_builddir)/src/core/libgnunetcore.la \ | 72 | $(top_builddir)/src/core/libgnunetcore.la \ |
73 | $(top_builddir)/src/transport/libgnunettransport.la | 73 | $(top_builddir)/src/transport/libgnunettransport.la |
74 | 74 | ||
75 | perf_ats_proportional_transport_bandwidth_SOURCES = \ | 75 | perf_ats_proportional_transport_bandwidth_SOURCES = \ |
76 | perf_ats.c perf_ats_logging.c | 76 | perf_ats.c perf_ats_logging.c |
@@ -79,7 +79,7 @@ perf_ats_proportional_transport_bandwidth_LDADD = \ | |||
79 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 79 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
80 | $(top_builddir)/src/ats/libgnunetats.la \ | 80 | $(top_builddir)/src/ats/libgnunetats.la \ |
81 | $(top_builddir)/src/core/libgnunetcore.la \ | 81 | $(top_builddir)/src/core/libgnunetcore.la \ |
82 | $(top_builddir)/src/transport/libgnunettransport.la | 82 | $(top_builddir)/src/transport/libgnunettransport.la |
83 | 83 | ||
84 | perf_ats_proportional_core_latency_SOURCES = \ | 84 | perf_ats_proportional_core_latency_SOURCES = \ |
85 | perf_ats.c perf_ats_logging.c | 85 | perf_ats.c perf_ats_logging.c |
@@ -88,126 +88,126 @@ perf_ats_proportional_core_latency_LDADD = \ | |||
88 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 88 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
89 | $(top_builddir)/src/ats/libgnunetats.la \ | 89 | $(top_builddir)/src/ats/libgnunetats.la \ |
90 | $(top_builddir)/src/core/libgnunetcore.la \ | 90 | $(top_builddir)/src/core/libgnunetcore.la \ |
91 | $(top_builddir)/src/transport/libgnunettransport.la | 91 | $(top_builddir)/src/transport/libgnunettransport.la |
92 | 92 | ||
93 | perf_ats_proportional_transport_latency_SOURCES = \ | 93 | perf_ats_proportional_transport_latency_SOURCES = \ |
94 | perf_ats.c perf_ats_logging.c | 94 | perf_ats.c perf_ats_logging.c |
95 | perf_ats_proportional_transport_latency_LDADD = \ | 95 | perf_ats_proportional_transport_latency_LDADD = \ |
96 | $(top_builddir)/src/util/libgnunetutil.la \ | 96 | $(top_builddir)/src/util/libgnunetutil.la \ |
97 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 97 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
98 | $(top_builddir)/src/ats/libgnunetats.la \ | 98 | $(top_builddir)/src/ats/libgnunetats.la \ |
99 | $(top_builddir)/src/core/libgnunetcore.la \ | 99 | $(top_builddir)/src/core/libgnunetcore.la \ |
100 | $(top_builddir)/src/transport/libgnunettransport.la | 100 | $(top_builddir)/src/transport/libgnunettransport.la |
101 | 101 | ||
102 | if HAVE_LIBGLPK | 102 | if HAVE_LIBGLPK |
103 | perf_ats_mlp_core_none_SOURCES = \ | 103 | perf_ats_mlp_core_none_SOURCES = \ |
104 | perf_ats.c perf_ats_logging.c | 104 | perf_ats.c perf_ats_logging.c |
105 | perf_ats_mlp_core_none_LDADD = \ | 105 | perf_ats_mlp_core_none_LDADD = \ |
106 | $(top_builddir)/src/util/libgnunetutil.la \ | 106 | $(top_builddir)/src/util/libgnunetutil.la \ |
107 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 107 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
108 | $(top_builddir)/src/ats/libgnunetats.la \ | 108 | $(top_builddir)/src/ats/libgnunetats.la \ |
109 | $(top_builddir)/src/core/libgnunetcore.la \ | 109 | $(top_builddir)/src/core/libgnunetcore.la \ |
110 | $(top_builddir)/src/transport/libgnunettransport.la | 110 | $(top_builddir)/src/transport/libgnunettransport.la |
111 | 111 | ||
112 | perf_ats_mlp_transport_none_SOURCES = \ | 112 | perf_ats_mlp_transport_none_SOURCES = \ |
113 | perf_ats.c perf_ats_logging.c | 113 | perf_ats.c perf_ats_logging.c |
114 | perf_ats_mlp_transport_none_LDADD = \ | 114 | perf_ats_mlp_transport_none_LDADD = \ |
115 | $(top_builddir)/src/util/libgnunetutil.la \ | 115 | $(top_builddir)/src/util/libgnunetutil.la \ |
116 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 116 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
117 | $(top_builddir)/src/ats/libgnunetats.la \ | 117 | $(top_builddir)/src/ats/libgnunetats.la \ |
118 | $(top_builddir)/src/core/libgnunetcore.la \ | 118 | $(top_builddir)/src/core/libgnunetcore.la \ |
119 | $(top_builddir)/src/transport/libgnunettransport.la | 119 | $(top_builddir)/src/transport/libgnunettransport.la |
120 | 120 | ||
121 | perf_ats_mlp_core_bandwidth_SOURCES = \ | 121 | perf_ats_mlp_core_bandwidth_SOURCES = \ |
122 | perf_ats.c perf_ats_logging.c | 122 | perf_ats.c perf_ats_logging.c |
123 | perf_ats_mlp_core_bandwidth_LDADD = \ | 123 | perf_ats_mlp_core_bandwidth_LDADD = \ |
124 | $(top_builddir)/src/util/libgnunetutil.la \ | 124 | $(top_builddir)/src/util/libgnunetutil.la \ |
125 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 125 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
126 | $(top_builddir)/src/ats/libgnunetats.la \ | 126 | $(top_builddir)/src/ats/libgnunetats.la \ |
127 | $(top_builddir)/src/core/libgnunetcore.la \ | 127 | $(top_builddir)/src/core/libgnunetcore.la \ |
128 | $(top_builddir)/src/transport/libgnunettransport.la | 128 | $(top_builddir)/src/transport/libgnunettransport.la |
129 | 129 | ||
130 | perf_ats_mlp_transport_bandwidth_SOURCES = \ | 130 | perf_ats_mlp_transport_bandwidth_SOURCES = \ |
131 | perf_ats.c perf_ats_logging.c | 131 | perf_ats.c perf_ats_logging.c |
132 | perf_ats_mlp_transport_bandwidth_LDADD = \ | 132 | perf_ats_mlp_transport_bandwidth_LDADD = \ |
133 | $(top_builddir)/src/util/libgnunetutil.la \ | 133 | $(top_builddir)/src/util/libgnunetutil.la \ |
134 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 134 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
135 | $(top_builddir)/src/ats/libgnunetats.la \ | 135 | $(top_builddir)/src/ats/libgnunetats.la \ |
136 | $(top_builddir)/src/core/libgnunetcore.la \ | 136 | $(top_builddir)/src/core/libgnunetcore.la \ |
137 | $(top_builddir)/src/transport/libgnunettransport.la | 137 | $(top_builddir)/src/transport/libgnunettransport.la |
138 | 138 | ||
139 | perf_ats_mlp_core_latency_SOURCES = \ | 139 | perf_ats_mlp_core_latency_SOURCES = \ |
140 | perf_ats.c perf_ats_logging.c | 140 | perf_ats.c perf_ats_logging.c |
141 | perf_ats_mlp_core_latency_LDADD = \ | 141 | perf_ats_mlp_core_latency_LDADD = \ |
142 | $(top_builddir)/src/util/libgnunetutil.la \ | 142 | $(top_builddir)/src/util/libgnunetutil.la \ |
143 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 143 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
144 | $(top_builddir)/src/ats/libgnunetats.la \ | 144 | $(top_builddir)/src/ats/libgnunetats.la \ |
145 | $(top_builddir)/src/core/libgnunetcore.la \ | 145 | $(top_builddir)/src/core/libgnunetcore.la \ |
146 | $(top_builddir)/src/transport/libgnunettransport.la | 146 | $(top_builddir)/src/transport/libgnunettransport.la |
147 | 147 | ||
148 | perf_ats_mlp_transport_latency_SOURCES = \ | 148 | perf_ats_mlp_transport_latency_SOURCES = \ |
149 | perf_ats.c perf_ats_logging.c | 149 | perf_ats.c perf_ats_logging.c |
150 | perf_ats_mlp_transport_latency_LDADD = \ | 150 | perf_ats_mlp_transport_latency_LDADD = \ |
151 | $(top_builddir)/src/util/libgnunetutil.la \ | 151 | $(top_builddir)/src/util/libgnunetutil.la \ |
152 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 152 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
153 | $(top_builddir)/src/ats/libgnunetats.la \ | 153 | $(top_builddir)/src/ats/libgnunetats.la \ |
154 | $(top_builddir)/src/core/libgnunetcore.la \ | 154 | $(top_builddir)/src/core/libgnunetcore.la \ |
155 | $(top_builddir)/src/transport/libgnunettransport.la | 155 | $(top_builddir)/src/transport/libgnunettransport.la |
156 | endif | 156 | endif |
157 | 157 | ||
158 | perf_ats_ril_core_none_SOURCES = \ | 158 | perf_ats_ril_core_none_SOURCES = \ |
159 | perf_ats.c perf_ats_logging.c | 159 | perf_ats.c perf_ats_logging.c |
160 | perf_ats_ril_core_none_LDADD = \ | 160 | perf_ats_ril_core_none_LDADD = \ |
161 | $(top_builddir)/src/util/libgnunetutil.la \ | 161 | $(top_builddir)/src/util/libgnunetutil.la \ |
162 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 162 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
163 | $(top_builddir)/src/ats/libgnunetats.la \ | 163 | $(top_builddir)/src/ats/libgnunetats.la \ |
164 | $(top_builddir)/src/core/libgnunetcore.la \ | 164 | $(top_builddir)/src/core/libgnunetcore.la \ |
165 | $(top_builddir)/src/transport/libgnunettransport.la | 165 | $(top_builddir)/src/transport/libgnunettransport.la |
166 | 166 | ||
167 | perf_ats_ril_transport_none_SOURCES = \ | 167 | perf_ats_ril_transport_none_SOURCES = \ |
168 | perf_ats.c perf_ats_logging.c | 168 | perf_ats.c perf_ats_logging.c |
169 | perf_ats_ril_transport_none_LDADD = \ | 169 | perf_ats_ril_transport_none_LDADD = \ |
170 | $(top_builddir)/src/util/libgnunetutil.la \ | 170 | $(top_builddir)/src/util/libgnunetutil.la \ |
171 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 171 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
172 | $(top_builddir)/src/ats/libgnunetats.la \ | 172 | $(top_builddir)/src/ats/libgnunetats.la \ |
173 | $(top_builddir)/src/core/libgnunetcore.la \ | 173 | $(top_builddir)/src/core/libgnunetcore.la \ |
174 | $(top_builddir)/src/transport/libgnunettransport.la | 174 | $(top_builddir)/src/transport/libgnunettransport.la |
175 | 175 | ||
176 | perf_ats_ril_core_bandwidth_SOURCES = \ | 176 | perf_ats_ril_core_bandwidth_SOURCES = \ |
177 | perf_ats.c perf_ats_logging.c | 177 | perf_ats.c perf_ats_logging.c |
178 | perf_ats_ril_core_bandwidth_LDADD = \ | 178 | perf_ats_ril_core_bandwidth_LDADD = \ |
179 | $(top_builddir)/src/util/libgnunetutil.la \ | 179 | $(top_builddir)/src/util/libgnunetutil.la \ |
180 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 180 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
181 | $(top_builddir)/src/ats/libgnunetats.la \ | 181 | $(top_builddir)/src/ats/libgnunetats.la \ |
182 | $(top_builddir)/src/core/libgnunetcore.la \ | 182 | $(top_builddir)/src/core/libgnunetcore.la \ |
183 | $(top_builddir)/src/transport/libgnunettransport.la | 183 | $(top_builddir)/src/transport/libgnunettransport.la |
184 | 184 | ||
185 | perf_ats_ril_transport_bandwidth_SOURCES = \ | 185 | perf_ats_ril_transport_bandwidth_SOURCES = \ |
186 | perf_ats.c perf_ats_logging.c | 186 | perf_ats.c perf_ats_logging.c |
187 | perf_ats_ril_transport_bandwidth_LDADD = \ | 187 | perf_ats_ril_transport_bandwidth_LDADD = \ |
188 | $(top_builddir)/src/util/libgnunetutil.la \ | 188 | $(top_builddir)/src/util/libgnunetutil.la \ |
189 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 189 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
190 | $(top_builddir)/src/ats/libgnunetats.la \ | 190 | $(top_builddir)/src/ats/libgnunetats.la \ |
191 | $(top_builddir)/src/core/libgnunetcore.la \ | 191 | $(top_builddir)/src/core/libgnunetcore.la \ |
192 | $(top_builddir)/src/transport/libgnunettransport.la | 192 | $(top_builddir)/src/transport/libgnunettransport.la |
193 | 193 | ||
194 | perf_ats_ril_core_latency_SOURCES = \ | 194 | perf_ats_ril_core_latency_SOURCES = \ |
195 | perf_ats.c perf_ats_logging.c | 195 | perf_ats.c perf_ats_logging.c |
196 | perf_ats_ril_core_latency_LDADD = \ | 196 | perf_ats_ril_core_latency_LDADD = \ |
197 | $(top_builddir)/src/util/libgnunetutil.la \ | 197 | $(top_builddir)/src/util/libgnunetutil.la \ |
198 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 198 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
199 | $(top_builddir)/src/ats/libgnunetats.la \ | 199 | $(top_builddir)/src/ats/libgnunetats.la \ |
200 | $(top_builddir)/src/core/libgnunetcore.la \ | 200 | $(top_builddir)/src/core/libgnunetcore.la \ |
201 | $(top_builddir)/src/transport/libgnunettransport.la | 201 | $(top_builddir)/src/transport/libgnunettransport.la |
202 | 202 | ||
203 | perf_ats_ril_transport_latency_SOURCES = \ | 203 | perf_ats_ril_transport_latency_SOURCES = \ |
204 | perf_ats.c perf_ats_logging.c | 204 | perf_ats.c perf_ats_logging.c |
205 | perf_ats_ril_transport_latency_LDADD = \ | 205 | perf_ats_ril_transport_latency_LDADD = \ |
206 | $(top_builddir)/src/util/libgnunetutil.la \ | 206 | $(top_builddir)/src/util/libgnunetutil.la \ |
207 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 207 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
208 | $(top_builddir)/src/ats/libgnunetats.la \ | 208 | $(top_builddir)/src/ats/libgnunetats.la \ |
209 | $(top_builddir)/src/core/libgnunetcore.la \ | 209 | $(top_builddir)/src/core/libgnunetcore.la \ |
210 | $(top_builddir)/src/transport/libgnunettransport.la | 210 | $(top_builddir)/src/transport/libgnunettransport.la |
211 | 211 | ||
212 | EXTRA_DIST = \ | 212 | EXTRA_DIST = \ |
213 | perf_ats_proportional_none.conf \ | 213 | perf_ats_proportional_none.conf \ |