diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-02-05 15:44:44 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-02-05 15:44:44 +0000 |
commit | 0d53baa57a6d03f4e09082b0b835681dec6d71bd (patch) | |
tree | f5d33d524991b2957c338885b21f6fb564c8b4b4 /src/testing/Makefile.am | |
parent | 422de483a6610c107e744c754a0c8fa21e9c08e3 (diff) | |
download | gnunet-0d53baa57a6d03f4e09082b0b835681dec6d71bd.tar.gz gnunet-0d53baa57a6d03f4e09082b0b835681dec6d71bd.zip |
revert Makefile.am to normal
Diffstat (limited to 'src/testing/Makefile.am')
-rw-r--r-- | src/testing/Makefile.am | 108 |
1 files changed, 38 insertions, 70 deletions
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index f6035ff2c..8084a9779 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am | |||
@@ -20,8 +20,6 @@ libgnunettesting_la_LIBADD = $(XLIB) \ | |||
20 | $(top_builddir)/src/transport/libgnunettransport.la \ | 20 | $(top_builddir)/src/transport/libgnunettransport.la \ |
21 | -lm \ | 21 | -lm \ |
22 | $(top_builddir)/src/util/libgnunetutil.la | 22 | $(top_builddir)/src/util/libgnunetutil.la |
23 | |||
24 | noinst_PROGRAMS = ${check_PROGRAMS} | ||
25 | 23 | ||
26 | check_PROGRAMS = \ | 24 | check_PROGRAMS = \ |
27 | test_testing \ | 25 | test_testing \ |
@@ -29,8 +27,6 @@ check_PROGRAMS = \ | |||
29 | test_testing_reconnect \ | 27 | test_testing_reconnect \ |
30 | test_testing_group \ | 28 | test_testing_group \ |
31 | test_testing_topology_stability \ | 29 | test_testing_topology_stability \ |
32 | test_testing_large_topology_clique \ | ||
33 | test_testing_topology_from_file \ | ||
34 | test_testing_topology_clique \ | 30 | test_testing_topology_clique \ |
35 | test_testing_topology_clique_random \ | 31 | test_testing_topology_clique_random \ |
36 | test_testing_topology_clique_minimum \ | 32 | test_testing_topology_clique_minimum \ |
@@ -46,35 +42,30 @@ check_PROGRAMS = \ | |||
46 | test_testing_topology_erdos_renyi \ | 42 | test_testing_topology_erdos_renyi \ |
47 | test_testing_topology_internat \ | 43 | test_testing_topology_internat \ |
48 | test_testing_topology_none \ | 44 | test_testing_topology_none \ |
49 | test_testing_topology_scale_free \ | 45 | test_testing_topology_scale_free |
50 | test_testing_topology_connect_only \ | ||
51 | test_testing_topology_2d_torus_plus | ||
52 | 46 | ||
53 | # test_testing_topology_stability | ||
54 | if !DISABLE_TEST_RUN | 47 | if !DISABLE_TEST_RUN |
55 | TESTS = \ | 48 | TESTS = \ |
56 | test_testing \ | 49 | test_testing \ |
57 | test_testing_connect \ | 50 | test_testing_connect \ |
58 | test_testing_reconnect \ | 51 | test_testing_reconnect \ |
59 | test_testing_group \ | 52 | test_testing_group \ |
60 | test_testing_topology_clique \ | 53 | test_testing_topology_clique |
61 | test_testing_topology_from_file \ | 54 | # test_testing_topology_stability \ |
62 | test_testing_topology_clique_random \ | 55 | # test_testing_topology_clique_random \ |
63 | test_testing_topology_clique_minimum \ | 56 | # test_testing_topology_clique_minimum \ |
64 | test_testing_topology_clique_dfs \ | 57 | # test_testing_topology_clique_dfs \ |
65 | test_testing_topology_churn \ | 58 | # test_testing_topology_churn \ |
66 | test_testing_topology_line \ | 59 | # test_testing_topology_line |
67 | test_testing_topology_blacklist \ | 60 | # test_testing_topology_blacklist \ |
68 | test_testing_group_remote \ | 61 | # test_testing_group_remote \ |
69 | test_testing_topology_ring \ | 62 | # test_testing_topology_ring \ |
70 | test_testing_topology_2d_torus \ | 63 | # test_testing_topology_2d_torus \ |
71 | test_testing_topology_small_world_ring \ | 64 | # test_testing_topology_small_world_ring \ |
72 | test_testing_topology_small_world_torus \ | 65 | # test_testing_topology_small_world_torus \ |
73 | test_testing_topology_erdos_renyi \ | 66 | # test_testing_topology_erdos_renyi \ |
74 | test_testing_topology_internat \ | 67 | # test_testing_topology_internat \ |
75 | test_testing_topology_scale_free \ | 68 | # test_testing_topology_scale_free |
76 | test_testing_topology_connect_only \ | ||
77 | test_testing_topology_2d_torus_plus | ||
78 | endif | 69 | endif |
79 | 70 | ||
80 | test_testing_SOURCES = \ | 71 | test_testing_SOURCES = \ |
@@ -89,54 +80,42 @@ test_testing_connect_LDADD = \ | |||
89 | $(top_builddir)/src/testing/libgnunettesting.la \ | 80 | $(top_builddir)/src/testing/libgnunettesting.la \ |
90 | $(top_builddir)/src/util/libgnunetutil.la | 81 | $(top_builddir)/src/util/libgnunetutil.la |
91 | 82 | ||
83 | test_testing_reconnect_SOURCES = \ | ||
84 | test_testing_reconnect.c | ||
85 | test_testing_reconnect_LDADD = \ | ||
86 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
87 | $(top_builddir)/src/util/libgnunetutil.la | ||
88 | |||
92 | test_testing_group_SOURCES = \ | 89 | test_testing_group_SOURCES = \ |
93 | test_testing_group.c | 90 | test_testing_group.c |
94 | test_testing_group_LDADD = \ | 91 | test_testing_group_LDADD = \ |
95 | $(top_builddir)/src/testing/libgnunettesting.la \ | 92 | $(top_builddir)/src/testing/libgnunettesting.la \ |
96 | $(top_builddir)/src/util/libgnunetutil.la | 93 | $(top_builddir)/src/util/libgnunetutil.la |
97 | 94 | ||
98 | test_testing_topology_clique_SOURCES = \ | 95 | test_testing_topology_clique_SOURCES = \ |
99 | test_testing_topology.c | 96 | test_testing_topology.c |
100 | test_testing_topology_clique_LDADD = \ | 97 | test_testing_topology_clique_LDADD = \ |
101 | $(top_builddir)/src/testing/libgnunettesting.la \ | 98 | $(top_builddir)/src/testing/libgnunettesting.la \ |
102 | $(top_builddir)/src/util/libgnunetutil.la | 99 | $(top_builddir)/src/util/libgnunetutil.la |
103 | 100 | ||
104 | test_testing_topology_connect_only_SOURCES = \ | ||
105 | test_testing_topology.c | ||
106 | test_testing_topology_connect_only_LDADD = \ | ||
107 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
108 | $(top_builddir)/src/util/libgnunetutil.la | ||
109 | |||
110 | test_testing_topology_from_file_SOURCES = \ | ||
111 | test_testing_topology.c | ||
112 | test_testing_topology_from_file_LDADD = \ | ||
113 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
114 | $(top_builddir)/src/util/libgnunetutil.la | ||
115 | |||
116 | test_testing_large_topology_clique_SOURCES = \ | ||
117 | test_testing_large_topology.c | ||
118 | test_testing_large_topology_clique_LDADD = \ | ||
119 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
120 | $(top_builddir)/src/util/libgnunetutil.la | ||
121 | |||
122 | test_testing_topology_stability_SOURCES = \ | 101 | test_testing_topology_stability_SOURCES = \ |
123 | test_testing_topology.c | 102 | test_testing_topology.c |
124 | test_testing_topology_stability_LDADD = \ | 103 | test_testing_topology_stability_LDADD = \ |
125 | $(top_builddir)/src/testing/libgnunettesting.la \ | 104 | $(top_builddir)/src/testing/libgnunettesting.la \ |
126 | $(top_builddir)/src/util/libgnunetutil.la | 105 | $(top_builddir)/src/util/libgnunetutil.la |
127 | 106 | ||
128 | test_testing_topology_blacklist_SOURCES = \ | 107 | test_testing_topology_blacklist_SOURCES = \ |
129 | test_testing_topology_blacklist.c | 108 | test_testing_topology_blacklist.c |
130 | test_testing_topology_blacklist_LDADD = \ | 109 | test_testing_topology_blacklist_LDADD = \ |
131 | $(top_builddir)/src/testing/libgnunettesting.la \ | 110 | $(top_builddir)/src/testing/libgnunettesting.la \ |
132 | $(top_builddir)/src/util/libgnunetutil.la | 111 | $(top_builddir)/src/util/libgnunetutil.la |
133 | 112 | ||
134 | test_testing_topology_churn_SOURCES = \ | 113 | test_testing_topology_churn_SOURCES = \ |
135 | test_testing_topology_churn.c | 114 | test_testing_topology_churn.c |
136 | test_testing_topology_churn_LDADD = \ | 115 | test_testing_topology_churn_LDADD = \ |
137 | $(top_builddir)/src/testing/libgnunettesting.la \ | 116 | $(top_builddir)/src/testing/libgnunettesting.la \ |
138 | $(top_builddir)/src/util/libgnunetutil.la | 117 | $(top_builddir)/src/util/libgnunetutil.la |
139 | 118 | ||
140 | test_testing_topology_clique_random_SOURCES = \ | 119 | test_testing_topology_clique_random_SOURCES = \ |
141 | test_testing_topology.c | 120 | test_testing_topology.c |
142 | test_testing_topology_clique_random_LDADD = \ | 121 | test_testing_topology_clique_random_LDADD = \ |
@@ -148,7 +127,7 @@ test_testing_topology_clique_minimum_SOURCES = \ | |||
148 | test_testing_topology_clique_minimum_LDADD = \ | 127 | test_testing_topology_clique_minimum_LDADD = \ |
149 | $(top_builddir)/src/testing/libgnunettesting.la \ | 128 | $(top_builddir)/src/testing/libgnunettesting.la \ |
150 | $(top_builddir)/src/util/libgnunetutil.la | 129 | $(top_builddir)/src/util/libgnunetutil.la |
151 | 130 | ||
152 | test_testing_topology_clique_dfs_SOURCES = \ | 131 | test_testing_topology_clique_dfs_SOURCES = \ |
153 | test_testing_topology.c | 132 | test_testing_topology.c |
154 | test_testing_topology_clique_dfs_LDADD = \ | 133 | test_testing_topology_clique_dfs_LDADD = \ |
@@ -160,12 +139,7 @@ test_testing_topology_line_SOURCES = \ | |||
160 | test_testing_topology_line_LDADD = \ | 139 | test_testing_topology_line_LDADD = \ |
161 | $(top_builddir)/src/testing/libgnunettesting.la \ | 140 | $(top_builddir)/src/testing/libgnunettesting.la \ |
162 | $(top_builddir)/src/util/libgnunetutil.la | 141 | $(top_builddir)/src/util/libgnunetutil.la |
163 | 142 | ||
164 | test_testing_reconnect_SOURCES = \ | ||
165 | test_testing_reconnect.c | ||
166 | test_testing_reconnect_LDADD = \ | ||
167 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
168 | $(top_builddir)/src/util/libgnunetutil.la | ||
169 | 143 | ||
170 | test_testing_group_remote_SOURCES = \ | 144 | test_testing_group_remote_SOURCES = \ |
171 | test_testing_group_remote.c | 145 | test_testing_group_remote.c |
@@ -178,31 +152,25 @@ test_testing_topology_ring_SOURCES = \ | |||
178 | test_testing_topology_ring_LDADD = \ | 152 | test_testing_topology_ring_LDADD = \ |
179 | $(top_builddir)/src/testing/libgnunettesting.la \ | 153 | $(top_builddir)/src/testing/libgnunettesting.la \ |
180 | $(top_builddir)/src/util/libgnunetutil.la | 154 | $(top_builddir)/src/util/libgnunetutil.la |
181 | 155 | ||
182 | test_testing_topology_2d_torus_SOURCES = \ | 156 | test_testing_topology_2d_torus_SOURCES = \ |
183 | test_testing_topology.c | 157 | test_testing_topology.c |
184 | test_testing_topology_2d_torus_LDADD = \ | 158 | test_testing_topology_2d_torus_LDADD = \ |
185 | $(top_builddir)/src/testing/libgnunettesting.la \ | 159 | $(top_builddir)/src/testing/libgnunettesting.la \ |
186 | $(top_builddir)/src/util/libgnunetutil.la | 160 | $(top_builddir)/src/util/libgnunetutil.la |
187 | 161 | ||
188 | test_testing_topology_2d_torus_plus_SOURCES = \ | ||
189 | test_testing_topology.c | ||
190 | test_testing_topology_2d_torus_plus_LDADD = \ | ||
191 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
192 | $(top_builddir)/src/util/libgnunetutil.la | ||
193 | |||
194 | test_testing_topology_small_world_ring_SOURCES = \ | 162 | test_testing_topology_small_world_ring_SOURCES = \ |
195 | test_testing_topology.c | 163 | test_testing_topology.c |
196 | test_testing_topology_small_world_ring_LDADD = \ | 164 | test_testing_topology_small_world_ring_LDADD = \ |
197 | $(top_builddir)/src/testing/libgnunettesting.la \ | 165 | $(top_builddir)/src/testing/libgnunettesting.la \ |
198 | $(top_builddir)/src/util/libgnunetutil.la | 166 | $(top_builddir)/src/util/libgnunetutil.la |
199 | 167 | ||
200 | test_testing_topology_small_world_torus_SOURCES = \ | 168 | test_testing_topology_small_world_torus_SOURCES = \ |
201 | test_testing_topology.c | 169 | test_testing_topology.c |
202 | test_testing_topology_small_world_torus_LDADD = \ | 170 | test_testing_topology_small_world_torus_LDADD = \ |
203 | $(top_builddir)/src/testing/libgnunettesting.la \ | 171 | $(top_builddir)/src/testing/libgnunettesting.la \ |
204 | $(top_builddir)/src/util/libgnunetutil.la | 172 | $(top_builddir)/src/util/libgnunetutil.la |
205 | 173 | ||
206 | test_testing_topology_internat_SOURCES = \ | 174 | test_testing_topology_internat_SOURCES = \ |
207 | test_testing_topology.c | 175 | test_testing_topology.c |
208 | test_testing_topology_internat_LDADD = \ | 176 | test_testing_topology_internat_LDADD = \ |
@@ -214,7 +182,7 @@ test_testing_topology_erdos_renyi_SOURCES = \ | |||
214 | test_testing_topology_erdos_renyi_LDADD = \ | 182 | test_testing_topology_erdos_renyi_LDADD = \ |
215 | $(top_builddir)/src/testing/libgnunettesting.la \ | 183 | $(top_builddir)/src/testing/libgnunettesting.la \ |
216 | $(top_builddir)/src/util/libgnunetutil.la | 184 | $(top_builddir)/src/util/libgnunetutil.la |
217 | 185 | ||
218 | test_testing_topology_scale_free_SOURCES = \ | 186 | test_testing_topology_scale_free_SOURCES = \ |
219 | test_testing_topology.c | 187 | test_testing_topology.c |
220 | test_testing_topology_scale_free_LDADD = \ | 188 | test_testing_topology_scale_free_LDADD = \ |
@@ -226,8 +194,8 @@ test_testing_topology_none_SOURCES = \ | |||
226 | test_testing_topology_none_LDADD = \ | 194 | test_testing_topology_none_LDADD = \ |
227 | $(top_builddir)/src/testing/libgnunettesting.la \ | 195 | $(top_builddir)/src/testing/libgnunettesting.la \ |
228 | $(top_builddir)/src/util/libgnunetutil.la | 196 | $(top_builddir)/src/util/libgnunetutil.la |
229 | 197 | ||
230 | 198 | ||
231 | EXTRA_DIST = \ | 199 | EXTRA_DIST = \ |
232 | test_testing_data.conf \ | 200 | test_testing_data.conf \ |
233 | test_testing_connect_peer1.conf \ | 201 | test_testing_connect_peer1.conf \ |
@@ -246,4 +214,4 @@ EXTRA_DIST = \ | |||
246 | test_testing_data_topology_blacklist.conf \ | 214 | test_testing_data_topology_blacklist.conf \ |
247 | test_testing_data_topology_churn.conf \ | 215 | test_testing_data_topology_churn.conf \ |
248 | test_testing_data_topology_none.conf | 216 | test_testing_data_topology_none.conf |
249 | 217 | ||