diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 13 | ||||
-rw-r--r-- | src/ats/Makefile.am | 16 | ||||
-rw-r--r-- | src/core/Makefile.am | 6 | ||||
-rw-r--r-- | src/datacache/Makefile.am | 2 | ||||
-rw-r--r-- | src/datastore/Makefile.am | 6 | ||||
-rw-r--r-- | src/dht/Makefile.am | 5 | ||||
-rw-r--r-- | src/dv/Makefile.am | 3 | ||||
-rw-r--r-- | src/fs/Makefile.am | 6 | ||||
-rw-r--r-- | src/gns/Makefile.am | 3 | ||||
-rw-r--r-- | src/lockmanager/Makefile.am | 4 | ||||
-rw-r--r-- | src/mesh/Makefile.am | 6 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 26 | ||||
-rw-r--r-- | src/nse/Makefile.am | 5 | ||||
-rw-r--r-- | src/peerinfo/Makefile.am | 2 | ||||
-rw-r--r-- | src/pt/Makefile.am | 2 | ||||
-rw-r--r-- | src/regex/Makefile.am | 3 | ||||
-rw-r--r-- | src/set/Makefile.am | 2 | ||||
-rw-r--r-- | src/stream/Makefile.am | 4 | ||||
-rw-r--r-- | src/topology/Makefile.am | 3 | ||||
-rw-r--r-- | src/transport/Makefile.am | 8 | ||||
-rw-r--r-- | src/util/Makefile.am | 6 | ||||
-rw-r--r-- | src/util/test_mq.c | 1 |
22 files changed, 101 insertions, 31 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 22b24b9bf..d3bd856e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -2,8 +2,15 @@ | |||
2 | # INTLEMU_SUBDIRS = intlemu | 2 | # INTLEMU_SUBDIRS = intlemu |
3 | #endif | 3 | #endif |
4 | 4 | ||
5 | if HAVE_TESTING | ||
6 | TESTING = testing | ||
7 | TESTBED = testbed | ||
8 | CONSENSUS = consensus | ||
9 | EXPERIMENTATION = experimentation | ||
10 | endif | ||
11 | |||
5 | if HAVE_EXPERIMENTAL | 12 | if HAVE_EXPERIMENTAL |
6 | EXP_DIR = gns set dv consensus experimentation | 13 | EXP_DIR = gns set dv $(CONSENSUS) $(EXPERIMENTATION) |
7 | endif | 14 | endif |
8 | 15 | ||
9 | if LINUX | 16 | if LINUX |
@@ -31,7 +38,7 @@ SUBDIRS = \ | |||
31 | block \ | 38 | block \ |
32 | statistics \ | 39 | statistics \ |
33 | arm \ | 40 | arm \ |
34 | testing \ | 41 | $(TESTING) \ |
35 | peerinfo \ | 42 | peerinfo \ |
36 | $(MYSQL_DIR) \ | 43 | $(MYSQL_DIR) \ |
37 | $(POSTGRES_DIR) \ | 44 | $(POSTGRES_DIR) \ |
@@ -46,7 +53,7 @@ SUBDIRS = \ | |||
46 | ats-tool \ | 53 | ats-tool \ |
47 | peerinfo-tool \ | 54 | peerinfo-tool \ |
48 | core \ | 55 | core \ |
49 | testbed \ | 56 | $(TESTBED) \ |
50 | nse \ | 57 | nse \ |
51 | dht \ | 58 | dht \ |
52 | hostlist \ | 59 | hostlist \ |
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 3f51e3cca..aff96a780 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am | |||
@@ -60,7 +60,8 @@ gnunet_service_ats_LDADD = \ | |||
60 | gnunet_service_ats_DEPENDENCIES = \ | 60 | gnunet_service_ats_DEPENDENCIES = \ |
61 | libgnunetats.la | 61 | libgnunetats.la |
62 | 62 | ||
63 | check_PROGRAMS = \ | 63 | if HAVE_TESTING |
64 | TESTING_TESTS = \ | ||
64 | test_ats_api_scheduling_init \ | 65 | test_ats_api_scheduling_init \ |
65 | test_ats_api_scheduling_add_address \ | 66 | test_ats_api_scheduling_add_address \ |
66 | test_ats_api_scheduling_add_session \ | 67 | test_ats_api_scheduling_add_session \ |
@@ -71,17 +72,22 @@ check_PROGRAMS = \ | |||
71 | test_ats_api_scheduling_destroy_session \ | 72 | test_ats_api_scheduling_destroy_session \ |
72 | test_ats_api_scheduling_destroy_inbound_connection \ | 73 | test_ats_api_scheduling_destroy_inbound_connection \ |
73 | test_ats_api_scheduling_block_and_reset \ | 74 | test_ats_api_scheduling_block_and_reset \ |
74 | test_ats_normalization_update_quality \ | 75 | test_ats_normalization_update_quality \ |
75 | test_ats_change_preference \ | 76 | test_ats_change_preference \ |
76 | test_ats_simplistic \ | 77 | test_ats_simplistic \ |
77 | test_ats_simplistic_switch_networks \ | 78 | test_ats_simplistic_switch_networks \ |
78 | test_ats_simplistic_change_preference \ | 79 | test_ats_simplistic_change_preference \ |
79 | test_ats_api_performance_list_addresses \ | 80 | test_ats_api_performance_list_addresses \ |
80 | test_ats_api_performance_address_info \ | 81 | test_ats_api_performance_address_info |
81 | $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE) | ||
82 | # $(GN_MLP_TEST_AVG) | ||
83 | # test_ats_api_scheduling_get_type | 82 | # test_ats_api_scheduling_get_type |
84 | # test_ats_api_bandwidth_consumption | 83 | # test_ats_api_bandwidth_consumption |
84 | # test_ats_simplistic_pref_aging | ||
85 | endif | ||
86 | |||
87 | check_PROGRAMS = \ | ||
88 | $(TESTING_TESTS) | ||
89 | $(GN_MLP_TEST) $(GN_MLP_PERF) $(GN_MLP_TEST_UPDATE) | ||
90 | # $(GN_MLP_TEST_AVG) | ||
85 | 91 | ||
86 | if ENABLE_TEST_RUN | 92 | if ENABLE_TEST_RUN |
87 | TESTS = $(check_PROGRAMS) | 93 | TESTS = $(check_PROGRAMS) |
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 7e4cd7f54..ebe1ae1ce 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am | |||
@@ -60,6 +60,10 @@ gnunet_core_LDADD = \ | |||
60 | gnunet_core_DEPENDENCIES = \ | 60 | gnunet_core_DEPENDENCIES = \ |
61 | libgnunetcore.la | 61 | libgnunetcore.la |
62 | 62 | ||
63 | if HAVE_TESTING | ||
64 | TESTING_TESTS = test_core_api_send_to_self | ||
65 | endif | ||
66 | |||
63 | check_PROGRAMS = \ | 67 | check_PROGRAMS = \ |
64 | test_core_api_start_only \ | 68 | test_core_api_start_only \ |
65 | test_core_api \ | 69 | test_core_api \ |
@@ -67,7 +71,7 @@ check_PROGRAMS = \ | |||
67 | test_core_quota_compliance_symmetric \ | 71 | test_core_quota_compliance_symmetric \ |
68 | test_core_quota_compliance_asymmetric_send_limited \ | 72 | test_core_quota_compliance_asymmetric_send_limited \ |
69 | test_core_quota_compliance_asymmetric_recv_limited \ | 73 | test_core_quota_compliance_asymmetric_recv_limited \ |
70 | test_core_api_send_to_self | 74 | $(TESTING_TESTS) |
71 | 75 | ||
72 | if ENABLE_TEST_RUN | 76 | if ENABLE_TEST_RUN |
73 | TESTS = $(check_PROGRAMS) | 77 | TESTS = $(check_PROGRAMS) |
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index c6c27b327..e8583aacb 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am | |||
@@ -83,6 +83,7 @@ libgnunet_plugin_datacache_template_la_LDFLAGS = \ | |||
83 | $(GN_PLUGIN_LDFLAGS) | 83 | $(GN_PLUGIN_LDFLAGS) |
84 | 84 | ||
85 | 85 | ||
86 | if HAVE_TESTING | ||
86 | if HAVE_SQLITE | 87 | if HAVE_SQLITE |
87 | if HAVE_BENCHMARKS | 88 | if HAVE_BENCHMARKS |
88 | SQLITE_BENCHMARKS = \ | 89 | SQLITE_BENCHMARKS = \ |
@@ -113,6 +114,7 @@ POSTGRES_TESTS = \ | |||
113 | test_datacache_quota_postgres \ | 114 | test_datacache_quota_postgres \ |
114 | $(POSTGRES_BENCHMARKS) | 115 | $(POSTGRES_BENCHMARKS) |
115 | endif | 116 | endif |
117 | endif | ||
116 | 118 | ||
117 | check_PROGRAMS = \ | 119 | check_PROGRAMS = \ |
118 | $(SQLITE_TESTS) \ | 120 | $(SQLITE_TESTS) \ |
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index b54fef792..a95a162b6 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am | |||
@@ -57,6 +57,7 @@ gnunet_datastore_DEPENDENCIES = \ | |||
57 | 57 | ||
58 | if HAVE_MYSQL | 58 | if HAVE_MYSQL |
59 | MYSQL_PLUGIN = libgnunet_plugin_datastore_mysql.la | 59 | MYSQL_PLUGIN = libgnunet_plugin_datastore_mysql.la |
60 | if HAVE_TESTING | ||
60 | if HAVE_BENCHMARKS | 61 | if HAVE_BENCHMARKS |
61 | MYSQL_BENCHMARKS = \ | 62 | MYSQL_BENCHMARKS = \ |
62 | perf_datastore_api_mysql \ | 63 | perf_datastore_api_mysql \ |
@@ -68,8 +69,10 @@ endif | |||
68 | test_plugin_datastore_mysql \ | 69 | test_plugin_datastore_mysql \ |
69 | $(MYSQL_BENCHMARKS) | 70 | $(MYSQL_BENCHMARKS) |
70 | endif | 71 | endif |
72 | endif | ||
71 | if HAVE_SQLITE | 73 | if HAVE_SQLITE |
72 | SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la | 74 | SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la |
75 | if HAVE_TESTING | ||
73 | if HAVE_BENCHMARKS | 76 | if HAVE_BENCHMARKS |
74 | SQLITE_BENCHMARKS = \ | 77 | SQLITE_BENCHMARKS = \ |
75 | perf_datastore_api_sqlite \ | 78 | perf_datastore_api_sqlite \ |
@@ -81,8 +84,10 @@ endif | |||
81 | test_plugin_datastore_sqlite \ | 84 | test_plugin_datastore_sqlite \ |
82 | $(SQLITE_BENCHMARKS) | 85 | $(SQLITE_BENCHMARKS) |
83 | endif | 86 | endif |
87 | endif | ||
84 | if HAVE_POSTGRES | 88 | if HAVE_POSTGRES |
85 | POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la | 89 | POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la |
90 | if HAVE_TESTING | ||
86 | if HAVE_BENCHMARKS | 91 | if HAVE_BENCHMARKS |
87 | POSTGRES_BENCHMARKS = \ | 92 | POSTGRES_BENCHMARKS = \ |
88 | perf_datastore_api_postgres \ | 93 | perf_datastore_api_postgres \ |
@@ -94,6 +99,7 @@ endif | |||
94 | test_plugin_datastore_postgres \ | 99 | test_plugin_datastore_postgres \ |
95 | $(POSTGRES_BENCHMARKS) | 100 | $(POSTGRES_BENCHMARKS) |
96 | endif | 101 | endif |
102 | endif | ||
97 | 103 | ||
98 | plugin_LTLIBRARIES = \ | 104 | plugin_LTLIBRARIES = \ |
99 | $(SQLITE_PLUGIN) \ | 105 | $(SQLITE_PLUGIN) \ |
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 305931728..0ed649bf5 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am | |||
@@ -104,8 +104,9 @@ gnunet_dht_monitor_LDADD = \ | |||
104 | gnunet_dht_monitor_DEPENDENCIES = \ | 104 | gnunet_dht_monitor_DEPENDENCIES = \ |
105 | libgnunetdht.la | 105 | libgnunetdht.la |
106 | 106 | ||
107 | 107 | if HAVE_TESTING | |
108 | noinst_LIBRARIES = libgnunetdhttest.a | 108 | noinst_LIBRARIES = libgnunetdhttest.a |
109 | endif | ||
109 | 110 | ||
110 | libgnunetdhttest_a_SOURCES = \ | 111 | libgnunetdhttest_a_SOURCES = \ |
111 | dht_test_lib.c dht_test_lib.h | 112 | dht_test_lib.c dht_test_lib.h |
@@ -116,6 +117,7 @@ libgnunetdhttest_a_LIBADD = \ | |||
116 | libgnunetdhttest_a_DEPENDENCIES = \ | 117 | libgnunetdhttest_a_DEPENDENCIES = \ |
117 | libgnunetdht.la | 118 | libgnunetdht.la |
118 | 119 | ||
120 | if HAVE_TESTING | ||
119 | check_PROGRAMS = \ | 121 | check_PROGRAMS = \ |
120 | test_dht_api \ | 122 | test_dht_api \ |
121 | test_dht_twopeer \ | 123 | test_dht_twopeer \ |
@@ -123,6 +125,7 @@ check_PROGRAMS = \ | |||
123 | test_dht_line \ | 125 | test_dht_line \ |
124 | test_dht_2dtorus \ | 126 | test_dht_2dtorus \ |
125 | test_dht_monitor | 127 | test_dht_monitor |
128 | endif | ||
126 | 129 | ||
127 | if HAVE_EXPERIMENTAL | 130 | if HAVE_EXPERIMENTAL |
128 | # These tests still do not work as testbed does | 131 | # These tests still do not work as testbed does |
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am index 1b90c2cc8..72e8fa4a8 100644 --- a/src/dv/Makefile.am +++ b/src/dv/Makefile.am | |||
@@ -65,10 +65,11 @@ libgnunet_plugin_transport_dv_la_LDFLAGS = \ | |||
65 | libgnunet_plugin_transport_dv_la_DEPENDENCIES = \ | 65 | libgnunet_plugin_transport_dv_la_DEPENDENCIES = \ |
66 | libgnunetdv.la | 66 | libgnunetdv.la |
67 | 67 | ||
68 | if HAVE_TESTING | ||
68 | check_PROGRAMS = \ | 69 | check_PROGRAMS = \ |
69 | test_transport_blacklist \ | 70 | test_transport_blacklist \ |
70 | test_transport_dv | 71 | test_transport_dv |
71 | 72 | endif | |
72 | 73 | ||
73 | if ENABLE_TEST_RUN | 74 | if ENABLE_TEST_RUN |
74 | TESTS = $(check_PROGRAMS) | 75 | TESTS = $(check_PROGRAMS) |
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index f0fa73143..a0d88051a 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -24,7 +24,9 @@ lib_LTLIBRARIES = libgnunetfs.la | |||
24 | plugin_LTLIBRARIES = \ | 24 | plugin_LTLIBRARIES = \ |
25 | libgnunet_plugin_block_fs.la | 25 | libgnunet_plugin_block_fs.la |
26 | 26 | ||
27 | if HAVE_TESTING | ||
27 | noinst_LIBRARIES = libgnunetfstest.a | 28 | noinst_LIBRARIES = libgnunetfstest.a |
29 | endif | ||
28 | 30 | ||
29 | libgnunetfs_la_SOURCES = \ | 31 | libgnunetfs_la_SOURCES = \ |
30 | fs_api.c fs_api.h fs.h \ | 32 | fs_api.c fs_api.h fs.h \ |
@@ -66,9 +68,11 @@ libexec_PROGRAMS = \ | |||
66 | gnunet-helper-fs-publish \ | 68 | gnunet-helper-fs-publish \ |
67 | gnunet-service-fs | 69 | gnunet-service-fs |
68 | 70 | ||
71 | if HAVE_TESTING | ||
69 | noinst_PROGRAMS = \ | 72 | noinst_PROGRAMS = \ |
70 | gnunet-fs-profiler \ | 73 | gnunet-fs-profiler \ |
71 | gnunet-daemon-fsprofiler | 74 | gnunet-daemon-fsprofiler |
75 | endif | ||
72 | 76 | ||
73 | bin_PROGRAMS = \ | 77 | bin_PROGRAMS = \ |
74 | gnunet-auto-share \ | 78 | gnunet-auto-share \ |
@@ -235,6 +239,7 @@ if HAVE_BENCHMARKS | |||
235 | perf_gnunet_service_fs_p2p_respect | 239 | perf_gnunet_service_fs_p2p_respect |
236 | endif | 240 | endif |
237 | 241 | ||
242 | if HAVE_TESTING | ||
238 | check_PROGRAMS = \ | 243 | check_PROGRAMS = \ |
239 | test_plugin_block_fs \ | 244 | test_plugin_block_fs \ |
240 | test_fs_directory \ | 245 | test_fs_directory \ |
@@ -262,6 +267,7 @@ check_PROGRAMS = \ | |||
262 | test_gnunet_service_fs_p2p \ | 267 | test_gnunet_service_fs_p2p \ |
263 | test_gnunet_service_fs_p2p_mesh \ | 268 | test_gnunet_service_fs_p2p_mesh \ |
264 | $(FS_BENCHMARKS) | 269 | $(FS_BENCHMARKS) |
270 | endif | ||
265 | 271 | ||
266 | test_plugin_block_fs_SOURCES = \ | 272 | test_plugin_block_fs_SOURCES = \ |
267 | test_plugin_block_fs.c | 273 | test_plugin_block_fs.c |
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 852f7ff6a..b0edaff49 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -208,7 +208,7 @@ libgnunet_plugin_block_gns_la_DEPENDENCIES = \ | |||
208 | $(top_builddir)/src/block/libgnunetblock.la \ | 208 | $(top_builddir)/src/block/libgnunetblock.la \ |
209 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 209 | $(top_builddir)/src/namestore/libgnunetnamestore.la |
210 | 210 | ||
211 | 211 | if HAVE_TESTING | |
212 | check_PROGRAMS = \ | 212 | check_PROGRAMS = \ |
213 | test_gns_simple_shorten \ | 213 | test_gns_simple_shorten \ |
214 | test_gns_simple_get_authority \ | 214 | test_gns_simple_get_authority \ |
@@ -225,6 +225,7 @@ check_PROGRAMS = \ | |||
225 | test_gns_revocation \ | 225 | test_gns_revocation \ |
226 | test_gns_dht_three_peers | 226 | test_gns_dht_three_peers |
227 | #test_gns_proxy | 227 | #test_gns_proxy |
228 | endif | ||
228 | 229 | ||
229 | if ENABLE_TEST_RUN | 230 | if ENABLE_TEST_RUN |
230 | if LINUX | 231 | if LINUX |
diff --git a/src/lockmanager/Makefile.am b/src/lockmanager/Makefile.am index 6a41fe5c1..9b0391645 100644 --- a/src/lockmanager/Makefile.am +++ b/src/lockmanager/Makefile.am | |||
@@ -40,11 +40,13 @@ libgnunetlockmanager_la_LDFLAGS = \ | |||
40 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ | 40 | $(GN_LIB_LDFLAGS) $(WINFLAGS) \ |
41 | -version-info 0:0:0 | 41 | -version-info 0:0:0 |
42 | 42 | ||
43 | if HAVE_TESTING | ||
43 | check_PROGRAMS = \ | 44 | check_PROGRAMS = \ |
44 | test_lockmanager_api \ | 45 | test_lockmanager_api \ |
45 | test_lockmanager_api_lockrelease \ | 46 | test_lockmanager_api_lockrelease \ |
46 | test_lockmanager_api_servercrash \ | 47 | test_lockmanager_api_servercrash \ |
47 | test_lockmanager_api_acquireretry | 48 | test_lockmanager_api_acquireretry |
49 | endif | ||
48 | 50 | ||
49 | EXTRA_DIST = \ | 51 | EXTRA_DIST = \ |
50 | test_lockmanager_api.conf | 52 | test_lockmanager_api.conf |
@@ -79,4 +81,4 @@ test_lockmanager_api_acquireretry_SOURCES = \ | |||
79 | test_lockmanager_api_acquireretry_LDADD = \ | 81 | test_lockmanager_api_acquireretry_LDADD = \ |
80 | $(top_builddir)/src/util/libgnunetutil.la \ | 82 | $(top_builddir)/src/util/libgnunetutil.la \ |
81 | $(top_builddir)/src/testing/libgnunettesting.la \ | 83 | $(top_builddir)/src/testing/libgnunettesting.la \ |
82 | libgnunetlockmanager.la \ No newline at end of file | 84 | libgnunetlockmanager.la |
diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index 5a51073e8..37e9b03ef 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am | |||
@@ -125,8 +125,9 @@ if LINUX | |||
125 | gnunet_service_mesh_new_LDFLAGS = -lrt | 125 | gnunet_service_mesh_new_LDFLAGS = -lrt |
126 | endif | 126 | endif |
127 | 127 | ||
128 | 128 | if HAVE_TESTING | |
129 | noinst_LIBRARIES = libgnunetmeshtest.a $(noinst_LIB_EXP) | 129 | noinst_LIBRARIES = libgnunetmeshtest.a $(noinst_LIB_EXP) |
130 | endif | ||
130 | 131 | ||
131 | libgnunetmeshtest_a_SOURCES = \ | 132 | libgnunetmeshtest_a_SOURCES = \ |
132 | mesh_test_lib.c mesh_test_lib.h | 133 | mesh_test_lib.c mesh_test_lib.h |
@@ -146,7 +147,7 @@ libgnunetmesh2test_a_LIBADD = \ | |||
146 | libgnunetmesh2test_a_DEPENDENCIES = \ | 147 | libgnunetmesh2test_a_DEPENDENCIES = \ |
147 | libgnunetmesh2.la | 148 | libgnunetmesh2.la |
148 | 149 | ||
149 | 150 | if HAVE_TESTING | |
150 | check_PROGRAMS = \ | 151 | check_PROGRAMS = \ |
151 | test_mesh_api \ | 152 | test_mesh_api \ |
152 | test_mesh_tree_api \ | 153 | test_mesh_tree_api \ |
@@ -164,6 +165,7 @@ check_PROGRAMS = \ | |||
164 | test_mesh_small_speed_nobuf_backwards \ | 165 | test_mesh_small_speed_nobuf_backwards \ |
165 | test_mesh_small_speed_ack \ | 166 | test_mesh_small_speed_ack \ |
166 | $(EXP_TESTS) | 167 | $(EXP_TESTS) |
168 | endif | ||
167 | 169 | ||
168 | test_mesh_api_SOURCES = \ | 170 | test_mesh_api_SOURCES = \ |
169 | test_mesh_api.c | 171 | test_mesh_api.c |
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 1d36fe792..df16e04bd 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -21,19 +21,18 @@ endif | |||
21 | 21 | ||
22 | if HAVE_SQLITE | 22 | if HAVE_SQLITE |
23 | SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la | 23 | SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la |
24 | if HAVE_TESTING | ||
24 | SQLITE_TESTS = test_plugin_namestore_sqlite | 25 | SQLITE_TESTS = test_plugin_namestore_sqlite |
25 | endif | 26 | endif |
27 | endif | ||
26 | if HAVE_POSTGRES | 28 | if HAVE_POSTGRES |
27 | POSTGRES_TESTS = test_plugin_namestore_postgres | ||
28 | POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la | 29 | POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la |
30 | if HAVE_TESTING | ||
31 | POSTGRES_TESTS = test_plugin_namestore_postgres | ||
29 | endif | 32 | endif |
30 | 33 | endif | |
31 | if HAVE_SQLITE | 34 | if HAVE_TESTING |
32 | check_PROGRAMS = \ | 35 | TESTING_TESTS = \ |
33 | $(SQLITE_TESTS) \ | ||
34 | $(POSTGRES_TESTS) \ | ||
35 | test_namestore_record_serialization \ | ||
36 | test_namestore_api_sign_verify \ | ||
37 | test_namestore_api \ | 36 | test_namestore_api \ |
38 | test_namestore_api_put \ | 37 | test_namestore_api_put \ |
39 | test_namestore_api_lookup \ | 38 | test_namestore_api_lookup \ |
@@ -45,7 +44,16 @@ check_PROGRAMS = \ | |||
45 | test_namestore_api_zone_to_name \ | 44 | test_namestore_api_zone_to_name \ |
46 | test_namestore_api_zone_iteration \ | 45 | test_namestore_api_zone_iteration \ |
47 | test_namestore_api_zone_iteration_specific_zone \ | 46 | test_namestore_api_zone_iteration_specific_zone \ |
48 | test_namestore_api_zone_iteration_stop | 47 | test_namestore_api_zone_iteration_stop |
48 | endif | ||
49 | |||
50 | if HAVE_SQLITE | ||
51 | check_PROGRAMS = \ | ||
52 | $(SQLITE_TESTS) \ | ||
53 | $(POSTGRES_TESTS) \ | ||
54 | $(TESTING_TESTS) \ | ||
55 | test_namestore_record_serialization \ | ||
56 | test_namestore_api_sign_verify | ||
49 | endif | 57 | endif |
50 | 58 | ||
51 | if ENABLE_TEST_RUN | 59 | if ENABLE_TEST_RUN |
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index 80886433a..728f23935 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am | |||
@@ -32,8 +32,10 @@ libgnunetnse_la_LDFLAGS = \ | |||
32 | libexec_PROGRAMS = \ | 32 | libexec_PROGRAMS = \ |
33 | gnunet-service-nse | 33 | gnunet-service-nse |
34 | 34 | ||
35 | if HAVE_TESTING | ||
35 | noinst_PROGRAMS = \ | 36 | noinst_PROGRAMS = \ |
36 | gnunet-nse-profiler | 37 | gnunet-nse-profiler |
38 | endif | ||
37 | 39 | ||
38 | gnunet_nse_profiler_SOURCES = \ | 40 | gnunet_nse_profiler_SOURCES = \ |
39 | gnunet-nse-profiler.c | 41 | gnunet-nse-profiler.c |
@@ -69,11 +71,12 @@ if HAVE_BENCHMARKS | |||
69 | MULTIPEER_TEST = test_nse_multipeer | 71 | MULTIPEER_TEST = test_nse_multipeer |
70 | endif | 72 | endif |
71 | 73 | ||
74 | if HAVE_TESTING | ||
72 | check_PROGRAMS = \ | 75 | check_PROGRAMS = \ |
73 | test_nse_api \ | 76 | test_nse_api \ |
74 | perf_kdf \ | 77 | perf_kdf \ |
75 | $(MULTIPEER_TEST) | 78 | $(MULTIPEER_TEST) |
76 | 79 | endif | |
77 | 80 | ||
78 | if ENABLE_TEST_RUN | 81 | if ENABLE_TEST_RUN |
79 | TESTS = $(check_PROGRAMS) | 82 | TESTS = $(check_PROGRAMS) |
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index c3863ab65..59a0bddc5 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am | |||
@@ -46,12 +46,14 @@ if HAVE_BENCHMARKS | |||
46 | perf_peerinfo_api | 46 | perf_peerinfo_api |
47 | endif | 47 | endif |
48 | 48 | ||
49 | if HAVE_TESTING | ||
49 | check_PROGRAMS = \ | 50 | check_PROGRAMS = \ |
50 | test_peerinfo_shipped_hellos \ | 51 | test_peerinfo_shipped_hellos \ |
51 | test_peerinfo_api \ | 52 | test_peerinfo_api \ |
52 | test_peerinfo_api_friend_only \ | 53 | test_peerinfo_api_friend_only \ |
53 | test_peerinfo_api_notify_friend_only \ | 54 | test_peerinfo_api_notify_friend_only \ |
54 | $(PEERINFO_BENCHMARKS) | 55 | $(PEERINFO_BENCHMARKS) |
56 | endif | ||
55 | 57 | ||
56 | if ENABLE_TEST_RUN | 58 | if ENABLE_TEST_RUN |
57 | TESTS = $(check_PROGRAMS) | 59 | TESTS = $(check_PROGRAMS) |
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index a9ae4fa5e..e5673fe24 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am | |||
@@ -31,6 +31,7 @@ gnunet_daemon_pt_LDADD = \ | |||
31 | $(top_builddir)/src/util/libgnunetutil.la \ | 31 | $(top_builddir)/src/util/libgnunetutil.la \ |
32 | $(GN_LIBINTL) | 32 | $(GN_LIBINTL) |
33 | 33 | ||
34 | if HAVE_TESTING | ||
34 | if HAVE_MHD | 35 | if HAVE_MHD |
35 | if HAVE_LIBCURL | 36 | if HAVE_LIBCURL |
36 | if LINUX | 37 | if LINUX |
@@ -50,6 +51,7 @@ if MINGW | |||
50 | endif | 51 | endif |
51 | endif | 52 | endif |
52 | endif | 53 | endif |
54 | endif | ||
53 | 55 | ||
54 | check_PROGRAMS = $(VPN_TEST) | 56 | check_PROGRAMS = $(VPN_TEST) |
55 | 57 | ||
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index fac89e38d..b09413565 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am | |||
@@ -108,11 +108,12 @@ libgnunetregextest_a_LIBADD = \ | |||
108 | libgnunetregextest_a_DEPENDENCIES = \ | 108 | libgnunetregextest_a_DEPENDENCIES = \ |
109 | libgnunetregex_internal.a | 109 | libgnunetregex_internal.a |
110 | 110 | ||
111 | 111 | if HAVE_TESTING | |
112 | noinst_PROGRAMS = $(noinst_mysql_progs) \ | 112 | noinst_PROGRAMS = $(noinst_mysql_progs) \ |
113 | perf-regex \ | 113 | perf-regex \ |
114 | gnunet-regex-profiler \ | 114 | gnunet-regex-profiler \ |
115 | gnunet-daemon-regexprofiler | 115 | gnunet-daemon-regexprofiler |
116 | endif | ||
116 | 117 | ||
117 | perf_regex_SOURCES = \ | 118 | perf_regex_SOURCES = \ |
118 | perf-regex.c | 119 | perf-regex.c |
diff --git a/src/set/Makefile.am b/src/set/Makefile.am index c2449e0ea..68ed55190 100644 --- a/src/set/Makefile.am +++ b/src/set/Makefile.am | |||
@@ -62,8 +62,10 @@ libgnunetset_la_LIBADD = \ | |||
62 | libgnunetset_la_LDFLAGS = \ | 62 | libgnunetset_la_LDFLAGS = \ |
63 | $(GN_LIB_LDFLAGS) | 63 | $(GN_LIB_LDFLAGS) |
64 | 64 | ||
65 | if HAVE_TESTING | ||
65 | check_PROGRAMS = \ | 66 | check_PROGRAMS = \ |
66 | test_set_api | 67 | test_set_api |
68 | endif | ||
67 | 69 | ||
68 | if ENABLE_TEST_RUN | 70 | if ENABLE_TEST_RUN |
69 | TESTS = $(check_PROGRAMS) | 71 | TESTS = $(check_PROGRAMS) |
diff --git a/src/stream/Makefile.am b/src/stream/Makefile.am index c42f752bf..d21f170be 100644 --- a/src/stream/Makefile.am +++ b/src/stream/Makefile.am | |||
@@ -27,6 +27,7 @@ if HAVE_BENCHMARKS | |||
27 | perf_stream_api | 27 | perf_stream_api |
28 | endif | 28 | endif |
29 | 29 | ||
30 | if HAVE_TESTING | ||
30 | check_PROGRAMS = \ | 31 | check_PROGRAMS = \ |
31 | test_stream_2peers \ | 32 | test_stream_2peers \ |
32 | test_stream_2peers_halfclose \ | 33 | test_stream_2peers_halfclose \ |
@@ -35,6 +36,7 @@ check_PROGRAMS = \ | |||
35 | test_stream_sequence_wraparound \ | 36 | test_stream_sequence_wraparound \ |
36 | mesh-test \ | 37 | mesh-test \ |
37 | $(STREAM_BENCHMARKS) | 38 | $(STREAM_BENCHMARKS) |
39 | endif | ||
38 | 40 | ||
39 | EXTRA_DIST = test_stream_local.conf | 41 | EXTRA_DIST = test_stream_local.conf |
40 | 42 | ||
@@ -95,4 +97,4 @@ perf_stream_api_LDADD = \ | |||
95 | mesh_test_SOURCES = mesh-test.c | 97 | mesh_test_SOURCES = mesh-test.c |
96 | mesh_test_LDADD = \ | 98 | mesh_test_LDADD = \ |
97 | $(top_builddir)/src/mesh/libgnunetmesh.la \ | 99 | $(top_builddir)/src/mesh/libgnunetmesh.la \ |
98 | $(top_builddir)/src/util/libgnunetutil.la \ No newline at end of file | 100 | $(top_builddir)/src/util/libgnunetutil.la |
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index 91a5384f7..e5215f7a9 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am | |||
@@ -27,9 +27,10 @@ gnunet_daemon_topology_LDADD = \ | |||
27 | $(GN_LIBINTL) | 27 | $(GN_LIBINTL) |
28 | 28 | ||
29 | 29 | ||
30 | 30 | if HAVE_TESTING | |
31 | check_PROGRAMS = \ | 31 | check_PROGRAMS = \ |
32 | test_gnunet_daemon_topology | 32 | test_gnunet_daemon_topology |
33 | endif | ||
33 | 34 | ||
34 | if ENABLE_TEST_RUN | 35 | if ENABLE_TEST_RUN |
35 | TESTS = $(check_PROGRAMS) | 36 | TESTS = $(check_PROGRAMS) |
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 258a7aae5..4ace2bc1e 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -81,9 +81,13 @@ noinst_PROGRAMS = \ | |||
81 | $(WLAN_BIN_SENDER) \ | 81 | $(WLAN_BIN_SENDER) \ |
82 | $(WLAN_BIN_RECEIVER) | 82 | $(WLAN_BIN_RECEIVER) |
83 | 83 | ||
84 | if HAVE_TESTING | ||
85 | TESTING_LIBS = libgnunettransporttesting.la | ||
86 | endif | ||
87 | |||
84 | lib_LTLIBRARIES = \ | 88 | lib_LTLIBRARIES = \ |
85 | libgnunettransport.la \ | 89 | libgnunettransport.la \ |
86 | libgnunettransporttesting.la | 90 | $(TESTING_LIBS) |
87 | 91 | ||
88 | libgnunettransporttesting_la_SOURCES = \ | 92 | libgnunettransporttesting_la_SOURCES = \ |
89 | transport-testing.c transport-testing.h | 93 | transport-testing.c transport-testing.h |
@@ -308,6 +312,7 @@ libgnunet_plugin_transport_https_server_la_LDFLAGS = \ | |||
308 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ | 312 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ |
309 | $(CFLAGS) -DBUILD_HTTPS | 313 | $(CFLAGS) -DBUILD_HTTPS |
310 | 314 | ||
315 | if HAVE_TESTING | ||
311 | check_PROGRAMS = \ | 316 | check_PROGRAMS = \ |
312 | test_transport_testing_startstop \ | 317 | test_transport_testing_startstop \ |
313 | test_transport_testing_restart \ | 318 | test_transport_testing_restart \ |
@@ -368,6 +373,7 @@ check_PROGRAMS = \ | |||
368 | $(HTTP_QUOTA_TEST) \ | 373 | $(HTTP_QUOTA_TEST) \ |
369 | $(HTTPS_QUOTA_TEST) \ | 374 | $(HTTPS_QUOTA_TEST) \ |
370 | $(WLAN_QUOTA_TEST) | 375 | $(WLAN_QUOTA_TEST) |
376 | endif | ||
371 | 377 | ||
372 | if ENABLE_TEST_RUN | 378 | if ENABLE_TEST_RUN |
373 | TESTS = \ | 379 | TESTS = \ |
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 7bcac3d29..44e22e390 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -124,6 +124,10 @@ libgnunetutil_la_LDFLAGS = \ | |||
124 | $(GN_LIB_LDFLAGS) \ | 124 | $(GN_LIB_LDFLAGS) \ |
125 | -version-info 11:0:2 | 125 | -version-info 11:0:2 |
126 | 126 | ||
127 | if HAVE_TESTING | ||
128 | GNUNET_ECC = gnunet-ecc | ||
129 | endif | ||
130 | |||
127 | 131 | ||
128 | libexec_PROGRAMS = \ | 132 | libexec_PROGRAMS = \ |
129 | gnunet-service-resolver | 133 | gnunet-service-resolver |
@@ -131,7 +135,7 @@ libexec_PROGRAMS = \ | |||
131 | bin_PROGRAMS = \ | 135 | bin_PROGRAMS = \ |
132 | gnunet-resolver \ | 136 | gnunet-resolver \ |
133 | gnunet-config \ | 137 | gnunet-config \ |
134 | gnunet-ecc \ | 138 | $(GNUNET_ECC) \ |
135 | gnunet-rsa \ | 139 | gnunet-rsa \ |
136 | gnunet-uri | 140 | gnunet-uri |
137 | 141 | ||
diff --git a/src/util/test_mq.c b/src/util/test_mq.c index 1ec4c37f8..f98fcd235 100644 --- a/src/util/test_mq.c +++ b/src/util/test_mq.c | |||
@@ -24,7 +24,6 @@ | |||
24 | */ | 24 | */ |
25 | #include "platform.h" | 25 | #include "platform.h" |
26 | #include "gnunet_util_lib.h" | 26 | #include "gnunet_util_lib.h" |
27 | #include "gnunet_testing_lib.h" | ||
28 | 27 | ||
29 | 28 | ||
30 | GNUNET_NETWORK_STRUCT_BEGIN | 29 | GNUNET_NETWORK_STRUCT_BEGIN |