diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-11 13:01:24 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-11 13:01:24 +0100 |
commit | c1ca3b26ef3dc26bb853505a87b49f9a9d654caf (patch) | |
tree | 9fd4ae5db67b4af158ea96566ee51ac3997e1a56 /src/cadet/Makefile.am | |
parent | b05d9b4b7cead622dce8342daa5556b76647bc31 (diff) | |
download | gnunet-c1ca3b26ef3dc26bb853505a87b49f9a9d654caf.tar.gz gnunet-c1ca3b26ef3dc26bb853505a87b49f9a9d654caf.zip |
drop 'new' suffix from tests
Diffstat (limited to 'src/cadet/Makefile.am')
-rw-r--r-- | src/cadet/Makefile.am | 119 |
1 files changed, 56 insertions, 63 deletions
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am index c33a653b0..d7208d601 100644 --- a/src/cadet/Makefile.am +++ b/src/cadet/Makefile.am | |||
@@ -86,37 +86,30 @@ endif | |||
86 | 86 | ||
87 | 87 | ||
88 | if HAVE_TESTING | 88 | if HAVE_TESTING |
89 | noinst_LTLIBRARIES = libgnunetcadettest.la libgnunetcadettestnew.la $(noinst_LIB_EXP) | 89 | noinst_LTLIBRARIES = libgnunetcadettest.la $(noinst_LIB_EXP) |
90 | noinst_PROGRAMS = gnunet-cadet-profiler | 90 | noinst_PROGRAMS = gnunet-cadet-profiler |
91 | endif | 91 | endif |
92 | 92 | ||
93 | libgnunetcadettest_la_SOURCES = \ | ||
94 | cadet_test_lib.c cadet_test_lib.h | ||
95 | libgnunetcadettest_la_LIBADD = \ | ||
96 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
97 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | ||
98 | libgnunetcadet.la | ||
99 | |||
100 | if HAVE_TESTING | 93 | if HAVE_TESTING |
101 | check_PROGRAMS = \ | 94 | check_PROGRAMS = \ |
102 | test_cadet_local_mq \ | 95 | test_cadet_local_mq \ |
103 | test_cadet_2_forward_new \ | 96 | test_cadet_2_forward \ |
104 | test_cadet_2_forward_new \ | 97 | test_cadet_2_forward \ |
105 | test_cadet_2_signal_new \ | 98 | test_cadet_2_signal \ |
106 | test_cadet_2_keepalive_new \ | 99 | test_cadet_2_keepalive \ |
107 | test_cadet_2_speed_new \ | 100 | test_cadet_2_speed \ |
108 | test_cadet_2_speed_ack_new \ | 101 | test_cadet_2_speed_ack \ |
109 | test_cadet_2_speed_backwards_new \ | 102 | test_cadet_2_speed_backwards \ |
110 | test_cadet_2_speed_reliable_new \ | 103 | test_cadet_2_speed_reliable \ |
111 | test_cadet_2_speed_reliable_backwards_new \ | 104 | test_cadet_2_speed_reliable_backwards \ |
112 | test_cadet_5_forward_new \ | 105 | test_cadet_5_forward \ |
113 | test_cadet_5_signal_new \ | 106 | test_cadet_5_signal \ |
114 | test_cadet_5_keepalive_new \ | 107 | test_cadet_5_keepalive \ |
115 | test_cadet_5_speed_new \ | 108 | test_cadet_5_speed \ |
116 | test_cadet_5_speed_ack_new \ | 109 | test_cadet_5_speed_ack \ |
117 | test_cadet_5_speed_reliable_new \ | 110 | test_cadet_5_speed_reliable \ |
118 | test_cadet_5_speed_reliable_backwards_new \ | 111 | test_cadet_5_speed_reliable_backwards \ |
119 | test_cadet_5_speed_backwards_new | 112 | test_cadet_5_speed_backwards |
120 | endif | 113 | endif |
121 | 114 | ||
122 | ld_cadet_test_lib = \ | 115 | ld_cadet_test_lib = \ |
@@ -146,89 +139,89 @@ test_cadet_local_mq_LDADD = \ | |||
146 | $(top_builddir)/src/util/libgnunetutil.la | 139 | $(top_builddir)/src/util/libgnunetutil.la |
147 | 140 | ||
148 | 141 | ||
149 | libgnunetcadettestnew_la_SOURCES = \ | 142 | libgnunetcadettest_la_SOURCES = \ |
150 | cadet_test_lib_new.c cadet_test_lib_new.h | 143 | cadet_test_lib_new.c cadet_test_lib_new.h |
151 | libgnunetcadettestnew_la_LIBADD = \ | 144 | libgnunetcadettest_la_LIBADD = \ |
152 | $(top_builddir)/src/util/libgnunetutil.la \ | 145 | $(top_builddir)/src/util/libgnunetutil.la \ |
153 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 146 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
154 | libgnunetcadetnew.la | 147 | libgnunetcadetnew.la |
155 | 148 | ||
156 | ld_cadet_test_lib_new = \ | 149 | ld_cadet_test_lib = \ |
157 | $(top_builddir)/src/util/libgnunetutil.la \ | 150 | $(top_builddir)/src/util/libgnunetutil.la \ |
158 | $(top_builddir)/src/testing/libgnunettesting.la \ | 151 | $(top_builddir)/src/testing/libgnunettesting.la \ |
159 | libgnunetcadetnew.la \ | 152 | libgnunetcadetnew.la \ |
160 | libgnunetcadettestnew.la \ | 153 | libgnunetcadettest.la \ |
161 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 154 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
162 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 155 | $(top_builddir)/src/statistics/libgnunetstatistics.la |
163 | dep_cadet_test_lib_new = \ | 156 | dep_cadet_test_lib = \ |
164 | libgnunetcadetnew.la \ | 157 | libgnunetcadetnew.la \ |
165 | libgnunetcadettestnew.la \ | 158 | libgnunetcadettest.la \ |
166 | $(top_builddir)/src/statistics/libgnunetstatistics.la | 159 | $(top_builddir)/src/statistics/libgnunetstatistics.la |
167 | 160 | ||
168 | test_cadet_2_forward_new_SOURCES = \ | 161 | test_cadet_2_forward_SOURCES = \ |
169 | test_cadet_new.c | 162 | test_cadet_new.c |
170 | test_cadet_2_forward_new_LDADD = $(ld_cadet_test_lib_new) | 163 | test_cadet_2_forward_LDADD = $(ld_cadet_test_lib) |
171 | 164 | ||
172 | test_cadet_2_signal_new_SOURCES = \ | 165 | test_cadet_2_signal_SOURCES = \ |
173 | test_cadet_new.c | 166 | test_cadet_new.c |
174 | test_cadet_2_signal_new_LDADD = $(ld_cadet_test_lib_new) | 167 | test_cadet_2_signal_LDADD = $(ld_cadet_test_lib) |
175 | 168 | ||
176 | test_cadet_2_keepalive_new_SOURCES = \ | 169 | test_cadet_2_keepalive_SOURCES = \ |
177 | test_cadet_new.c | 170 | test_cadet_new.c |
178 | test_cadet_2_keepalive_new_LDADD = $(ld_cadet_test_lib_new) | 171 | test_cadet_2_keepalive_LDADD = $(ld_cadet_test_lib) |
179 | 172 | ||
180 | test_cadet_2_speed_new_SOURCES = \ | 173 | test_cadet_2_speed_SOURCES = \ |
181 | test_cadet_new.c | 174 | test_cadet_new.c |
182 | test_cadet_2_speed_new_LDADD = $(ld_cadet_test_lib_new) | 175 | test_cadet_2_speed_LDADD = $(ld_cadet_test_lib) |
183 | 176 | ||
184 | test_cadet_2_speed_ack_new_SOURCES = \ | 177 | test_cadet_2_speed_ack_SOURCES = \ |
185 | test_cadet_new.c | 178 | test_cadet_new.c |
186 | test_cadet_2_speed_ack_new_LDADD = $(ld_cadet_test_lib_new) | 179 | test_cadet_2_speed_ack_LDADD = $(ld_cadet_test_lib) |
187 | 180 | ||
188 | test_cadet_2_speed_backwards_new_SOURCES = \ | 181 | test_cadet_2_speed_backwards_SOURCES = \ |
189 | test_cadet_new.c | 182 | test_cadet_new.c |
190 | test_cadet_2_speed_backwards_new_LDADD = $(ld_cadet_test_lib_new) | 183 | test_cadet_2_speed_backwards_LDADD = $(ld_cadet_test_lib) |
191 | 184 | ||
192 | test_cadet_2_speed_reliable_new_SOURCES = \ | 185 | test_cadet_2_speed_reliable_SOURCES = \ |
193 | test_cadet_new.c | 186 | test_cadet_new.c |
194 | test_cadet_2_speed_reliable_new_LDADD = $(ld_cadet_test_lib_new) | 187 | test_cadet_2_speed_reliable_LDADD = $(ld_cadet_test_lib) |
195 | 188 | ||
196 | test_cadet_2_speed_reliable_backwards_new_SOURCES = \ | 189 | test_cadet_2_speed_reliable_backwards_SOURCES = \ |
197 | test_cadet_new.c | 190 | test_cadet_new.c |
198 | test_cadet_2_speed_reliable_backwards_new_LDADD = $(ld_cadet_test_lib_new) | 191 | test_cadet_2_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) |
199 | 192 | ||
200 | 193 | ||
201 | test_cadet_5_forward_new_SOURCES = \ | 194 | test_cadet_5_forward_SOURCES = \ |
202 | test_cadet_new.c | 195 | test_cadet_new.c |
203 | test_cadet_5_forward_new_LDADD = $(ld_cadet_test_lib_new) | 196 | test_cadet_5_forward_LDADD = $(ld_cadet_test_lib) |
204 | 197 | ||
205 | test_cadet_5_signal_new_SOURCES = \ | 198 | test_cadet_5_signal_SOURCES = \ |
206 | test_cadet_new.c | 199 | test_cadet_new.c |
207 | test_cadet_5_signal_new_LDADD = $(ld_cadet_test_lib_new) | 200 | test_cadet_5_signal_LDADD = $(ld_cadet_test_lib) |
208 | 201 | ||
209 | test_cadet_5_keepalive_new_SOURCES = \ | 202 | test_cadet_5_keepalive_SOURCES = \ |
210 | test_cadet_new.c | 203 | test_cadet_new.c |
211 | test_cadet_5_keepalive_new_LDADD = $(ld_cadet_test_lib_new) | 204 | test_cadet_5_keepalive_LDADD = $(ld_cadet_test_lib) |
212 | 205 | ||
213 | test_cadet_5_speed_new_SOURCES = \ | 206 | test_cadet_5_speed_SOURCES = \ |
214 | test_cadet_new.c | 207 | test_cadet_new.c |
215 | test_cadet_5_speed_new_LDADD = $(ld_cadet_test_lib_new) | 208 | test_cadet_5_speed_LDADD = $(ld_cadet_test_lib) |
216 | 209 | ||
217 | test_cadet_5_speed_ack_new_SOURCES = \ | 210 | test_cadet_5_speed_ack_SOURCES = \ |
218 | test_cadet_new.c | 211 | test_cadet_new.c |
219 | test_cadet_5_speed_ack_new_LDADD = $(ld_cadet_test_lib_new) | 212 | test_cadet_5_speed_ack_LDADD = $(ld_cadet_test_lib) |
220 | 213 | ||
221 | test_cadet_5_speed_backwards_new_SOURCES = \ | 214 | test_cadet_5_speed_backwards_SOURCES = \ |
222 | test_cadet_new.c | 215 | test_cadet_new.c |
223 | test_cadet_5_speed_backwards_new_LDADD = $(ld_cadet_test_lib_new) | 216 | test_cadet_5_speed_backwards_LDADD = $(ld_cadet_test_lib) |
224 | 217 | ||
225 | test_cadet_5_speed_reliable_new_SOURCES = \ | 218 | test_cadet_5_speed_reliable_SOURCES = \ |
226 | test_cadet_new.c | 219 | test_cadet_new.c |
227 | test_cadet_5_speed_reliable_new_LDADD = $(ld_cadet_test_lib_new) | 220 | test_cadet_5_speed_reliable_LDADD = $(ld_cadet_test_lib) |
228 | 221 | ||
229 | test_cadet_5_speed_reliable_backwards_new_SOURCES = \ | 222 | test_cadet_5_speed_reliable_backwards_SOURCES = \ |
230 | test_cadet_new.c | 223 | test_cadet_new.c |
231 | test_cadet_5_speed_reliable_backwards_new_LDADD = $(ld_cadet_test_lib_new) | 224 | test_cadet_5_speed_reliable_backwards_LDADD = $(ld_cadet_test_lib) |
232 | 225 | ||
233 | 226 | ||
234 | if ENABLE_TEST_RUN | 227 | if ENABLE_TEST_RUN |