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