diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/ats/Makefile.am | 2 | ||||
-rw-r--r-- | src/cadet/Makefile.am | 4 | ||||
-rw-r--r-- | src/consensus/Makefile.am | 2 | ||||
-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 | 6 | ||||
-rw-r--r-- | src/fs/Makefile.am | 6 | ||||
-rw-r--r-- | src/identity/Makefile.am | 2 | ||||
-rw-r--r-- | src/namecache/Makefile.am | 8 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 6 | ||||
-rw-r--r-- | src/nse/Makefile.am | 4 | ||||
-rw-r--r-- | src/peerinfo/Makefile.am | 2 | ||||
-rw-r--r-- | src/peerstore/Makefile.am | 2 | ||||
-rw-r--r-- | src/pt/Makefile.am | 4 | ||||
-rw-r--r-- | src/regex/Makefile.am | 2 | ||||
-rw-r--r-- | src/rps/Makefile.am | 4 | ||||
-rw-r--r-- | src/secretsharing/Makefile.am | 2 | ||||
-rw-r--r-- | src/set/Makefile.am | 4 | ||||
-rw-r--r-- | src/seti/Makefile.am | 4 | ||||
-rw-r--r-- | src/setu/Makefile.am | 4 | ||||
-rw-r--r-- | src/topology/Makefile.am | 2 | ||||
-rw-r--r-- | src/transport/Makefile.am | 4 | ||||
-rw-r--r-- | src/util/Makefile.am | 6 |
25 files changed, 6 insertions, 94 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ef8c5b110..31215c6d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -1,9 +1,7 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | 2 | ||
3 | if HAVE_TESTING | 3 | TESTING = testing |
4 | TESTING = testing | 4 | TESTBED = testbed-logger testbed |
5 | TESTBED = testbed-logger testbed | ||
6 | endif | ||
7 | 5 | ||
8 | if HAVE_EXPERIMENTAL | 6 | if HAVE_EXPERIMENTAL |
9 | EXP_DIR = \ | 7 | EXP_DIR = \ |
diff --git a/src/ats/Makefile.am b/src/ats/Makefile.am index 0b8e7309a..85a2bb555 100644 --- a/src/ats/Makefile.am +++ b/src/ats/Makefile.am | |||
@@ -65,11 +65,9 @@ gnunet_service_ats_LDADD = \ | |||
65 | libgnunetats.la \ | 65 | libgnunetats.la \ |
66 | $(GN_LIBINTL) | 66 | $(GN_LIBINTL) |
67 | 67 | ||
68 | if HAVE_TESTING | ||
69 | TESTING_TESTS = \ | 68 | TESTING_TESTS = \ |
70 | test_ats_api_proportional \ | 69 | test_ats_api_proportional \ |
71 | test_ats_reservation_api_proportional | 70 | test_ats_reservation_api_proportional |
72 | endif | ||
73 | 71 | ||
74 | check_PROGRAMS = \ | 72 | check_PROGRAMS = \ |
75 | $(TESTING_TESTS) | 73 | $(TESTING_TESTS) |
diff --git a/src/cadet/Makefile.am b/src/cadet/Makefile.am index 2289a2d96..d942c6495 100644 --- a/src/cadet/Makefile.am +++ b/src/cadet/Makefile.am | |||
@@ -78,12 +78,9 @@ if LINUX | |||
78 | endif | 78 | endif |
79 | 79 | ||
80 | 80 | ||
81 | if HAVE_TESTING | ||
82 | noinst_LTLIBRARIES = libgnunetcadettest.la $(noinst_LIB_EXP) | 81 | noinst_LTLIBRARIES = libgnunetcadettest.la $(noinst_LIB_EXP) |
83 | # noinst_PROGRAMS = gnunet-cadet-profiler | 82 | # noinst_PROGRAMS = gnunet-cadet-profiler |
84 | endif | ||
85 | 83 | ||
86 | if HAVE_TESTING | ||
87 | check_PROGRAMS = \ | 84 | check_PROGRAMS = \ |
88 | test_cadet_local_mq \ | 85 | test_cadet_local_mq \ |
89 | test_cadet_2_forward \ | 86 | test_cadet_2_forward \ |
@@ -106,7 +103,6 @@ check_PROGRAMS = \ | |||
106 | test_cadet_5_speed_reliable_backwards \ | 103 | test_cadet_5_speed_reliable_backwards \ |
107 | test_cadet_5_speed_backwards \ | 104 | test_cadet_5_speed_backwards \ |
108 | test_cadet_5_reopen | 105 | test_cadet_5_reopen |
109 | endif | ||
110 | 106 | ||
111 | 107 | ||
112 | #gnunet_cadet_profiler_SOURCES = \ | 108 | #gnunet_cadet_profiler_SOURCES = \ |
diff --git a/src/consensus/Makefile.am b/src/consensus/Makefile.am index cf1d32e74..d7b23e7c6 100644 --- a/src/consensus/Makefile.am +++ b/src/consensus/Makefile.am | |||
@@ -89,7 +89,6 @@ libgnunet_plugin_block_consensus_la_LDFLAGS = \ | |||
89 | 89 | ||
90 | 90 | ||
91 | 91 | ||
92 | if HAVE_TESTING | ||
93 | bin_PROGRAMS = \ | 92 | bin_PROGRAMS = \ |
94 | gnunet-consensus-profiler | 93 | gnunet-consensus-profiler |
95 | 94 | ||
@@ -100,7 +99,6 @@ if ENABLE_TEST_RUN | |||
100 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 99 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
101 | TESTS = $(check_PROGRAMS) | 100 | TESTS = $(check_PROGRAMS) |
102 | endif | 101 | endif |
103 | endif | ||
104 | 102 | ||
105 | test_consensus_api_SOURCES = \ | 103 | test_consensus_api_SOURCES = \ |
106 | test_consensus_api.c | 104 | test_consensus_api.c |
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index d2d3a2d7f..e51247e18 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am | |||
@@ -54,10 +54,8 @@ gnunet_core_LDADD = \ | |||
54 | gnunet_core_LDFLAGS = \ | 54 | gnunet_core_LDFLAGS = \ |
55 | $(GN_LIBINTL) | 55 | $(GN_LIBINTL) |
56 | 56 | ||
57 | if HAVE_TESTING | 57 | TESTING_TESTS = \ |
58 | TESTING_TESTS = \ | 58 | test_core_api_send_to_self |
59 | test_core_api_send_to_self | ||
60 | endif | ||
61 | 59 | ||
62 | check_PROGRAMS = \ | 60 | check_PROGRAMS = \ |
63 | test_core_api_start_only \ | 61 | test_core_api_start_only \ |
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index ecb02d1c3..4789706ff 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am | |||
@@ -85,7 +85,6 @@ libgnunet_plugin_datacache_template_la_LDFLAGS = \ | |||
85 | $(GN_PLUGIN_LDFLAGS) | 85 | $(GN_PLUGIN_LDFLAGS) |
86 | 86 | ||
87 | 87 | ||
88 | if HAVE_TESTING | ||
89 | if HAVE_SQLITE | 88 | if HAVE_SQLITE |
90 | if HAVE_BENCHMARKS | 89 | if HAVE_BENCHMARKS |
91 | SQLITE_BENCHMARKS = \ | 90 | SQLITE_BENCHMARKS = \ |
@@ -95,7 +94,6 @@ SQLITE_TESTS = \ | |||
95 | test_datacache_sqlite \ | 94 | test_datacache_sqlite \ |
96 | test_datacache_quota_sqlite \ | 95 | test_datacache_quota_sqlite \ |
97 | $(SQLITE_BENCHMARKS) | 96 | $(SQLITE_BENCHMARKS) |
98 | endif | ||
99 | 97 | ||
100 | if HAVE_BENCHMARKS | 98 | if HAVE_BENCHMARKS |
101 | HEAP_BENCHMARKS = \ | 99 | HEAP_BENCHMARKS = \ |
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index cd1df4e5e..07ae004b3 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am | |||
@@ -52,7 +52,6 @@ gnunet_datastore_LDADD = \ | |||
52 | 52 | ||
53 | if HAVE_MYSQL | 53 | if HAVE_MYSQL |
54 | MYSQL_PLUGIN = libgnunet_plugin_datastore_mysql.la | 54 | MYSQL_PLUGIN = libgnunet_plugin_datastore_mysql.la |
55 | if HAVE_TESTING | ||
56 | if HAVE_BENCHMARKS | 55 | if HAVE_BENCHMARKS |
57 | MYSQL_BENCHMARKS = \ | 56 | MYSQL_BENCHMARKS = \ |
58 | perf_datastore_api_mysql \ | 57 | perf_datastore_api_mysql \ |
@@ -64,10 +63,8 @@ endif | |||
64 | test_plugin_datastore_mysql \ | 63 | test_plugin_datastore_mysql \ |
65 | $(MYSQL_BENCHMARKS) | 64 | $(MYSQL_BENCHMARKS) |
66 | endif | 65 | endif |
67 | endif | ||
68 | if HAVE_SQLITE | 66 | if HAVE_SQLITE |
69 | SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la | 67 | SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la |
70 | if HAVE_TESTING | ||
71 | if HAVE_BENCHMARKS | 68 | if HAVE_BENCHMARKS |
72 | SQLITE_BENCHMARKS = \ | 69 | SQLITE_BENCHMARKS = \ |
73 | perf_datastore_api_sqlite \ | 70 | perf_datastore_api_sqlite \ |
@@ -79,10 +76,8 @@ endif | |||
79 | test_plugin_datastore_sqlite \ | 76 | test_plugin_datastore_sqlite \ |
80 | $(SQLITE_BENCHMARKS) | 77 | $(SQLITE_BENCHMARKS) |
81 | endif | 78 | endif |
82 | endif | ||
83 | if HAVE_POSTGRESQL | 79 | if HAVE_POSTGRESQL |
84 | POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la | 80 | POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la |
85 | if HAVE_TESTING | ||
86 | if HAVE_BENCHMARKS | 81 | if HAVE_BENCHMARKS |
87 | POSTGRES_BENCHMARKS = \ | 82 | POSTGRES_BENCHMARKS = \ |
88 | perf_datastore_api_postgres \ | 83 | perf_datastore_api_postgres \ |
@@ -94,7 +89,6 @@ endif | |||
94 | test_plugin_datastore_postgres \ | 89 | test_plugin_datastore_postgres \ |
95 | $(POSTGRES_BENCHMARKS) | 90 | $(POSTGRES_BENCHMARKS) |
96 | endif | 91 | endif |
97 | endif | ||
98 | 92 | ||
99 | plugin_LTLIBRARIES = \ | 93 | plugin_LTLIBRARIES = \ |
100 | $(SQLITE_PLUGIN) \ | 94 | $(SQLITE_PLUGIN) \ |
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 919eca438..69e34000c 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am | |||
@@ -52,10 +52,8 @@ bin_PROGRAMS = \ | |||
52 | gnunet-dht-get \ | 52 | gnunet-dht-get \ |
53 | gnunet-dht-put | 53 | gnunet-dht-put |
54 | 54 | ||
55 | if HAVE_TESTING | ||
56 | noinst_PROGRAMS = \ | 55 | noinst_PROGRAMS = \ |
57 | gnunet-dht-profiler | 56 | gnunet-dht-profiler |
58 | endif | ||
59 | 57 | ||
60 | gnunet_service_dht_SOURCES = \ | 58 | gnunet_service_dht_SOURCES = \ |
61 | gnunet-service-dht.c gnunet-service-dht.h \ | 59 | gnunet-service-dht.c gnunet-service-dht.h \ |
@@ -117,9 +115,7 @@ gnunet_dht_profiler_LDADD = \ | |||
117 | gnunet_dht_profiler_LDFLAGS = \ | 115 | gnunet_dht_profiler_LDFLAGS = \ |
118 | $(GN_LIBINTL) | 116 | $(GN_LIBINTL) |
119 | 117 | ||
120 | if HAVE_TESTING | ||
121 | noinst_LIBRARIES = libgnunetdhttest.a | 118 | noinst_LIBRARIES = libgnunetdhttest.a |
122 | endif | ||
123 | 119 | ||
124 | libgnunetdhttest_a_SOURCES = \ | 120 | libgnunetdhttest_a_SOURCES = \ |
125 | dht_test_lib.c dht_test_lib.h | 121 | dht_test_lib.c dht_test_lib.h |
@@ -128,7 +124,6 @@ libgnunetdhttest_a_LIBADD = \ | |||
128 | $(top_builddir)/src/testbed/libgnunettestbed.la \ | 124 | $(top_builddir)/src/testbed/libgnunettestbed.la \ |
129 | libgnunetdht.la | 125 | libgnunetdht.la |
130 | 126 | ||
131 | if HAVE_TESTING | ||
132 | check_PROGRAMS = \ | 127 | check_PROGRAMS = \ |
133 | test_dht_api \ | 128 | test_dht_api \ |
134 | test_dht_twopeer \ | 129 | test_dht_twopeer \ |
@@ -136,7 +131,6 @@ check_PROGRAMS = \ | |||
136 | test_dht_line \ | 131 | test_dht_line \ |
137 | test_dht_2dtorus \ | 132 | test_dht_2dtorus \ |
138 | test_dht_monitor | 133 | test_dht_monitor |
139 | endif | ||
140 | 134 | ||
141 | if HAVE_EXPERIMENTAL | 135 | if HAVE_EXPERIMENTAL |
142 | # These tests still do not work as testbed does | 136 | # These tests still do not work as testbed does |
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 5b6ba2376..3d8ec2bac 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -21,9 +21,7 @@ lib_LTLIBRARIES = libgnunetfs.la | |||
21 | plugin_LTLIBRARIES = \ | 21 | plugin_LTLIBRARIES = \ |
22 | libgnunet_plugin_block_fs.la | 22 | libgnunet_plugin_block_fs.la |
23 | 23 | ||
24 | if HAVE_TESTING | ||
25 | noinst_LIBRARIES = libgnunetfstest.a | 24 | noinst_LIBRARIES = libgnunetfstest.a |
26 | endif | ||
27 | 25 | ||
28 | libgnunetfs_la_SOURCES = \ | 26 | libgnunetfs_la_SOURCES = \ |
29 | fs_api.c fs_api.h fs.h \ | 27 | fs_api.c fs_api.h fs.h \ |
@@ -71,11 +69,9 @@ libexec_PROGRAMS = \ | |||
71 | gnunet-helper-fs-publish \ | 69 | gnunet-helper-fs-publish \ |
72 | gnunet-service-fs | 70 | gnunet-service-fs |
73 | 71 | ||
74 | if HAVE_TESTING | ||
75 | noinst_PROGRAMS = \ | 72 | noinst_PROGRAMS = \ |
76 | gnunet-fs-profiler \ | 73 | gnunet-fs-profiler \ |
77 | gnunet-daemon-fsprofiler | 74 | gnunet-daemon-fsprofiler |
78 | endif | ||
79 | 75 | ||
80 | bin_PROGRAMS = \ | 76 | bin_PROGRAMS = \ |
81 | gnunet-auto-share \ | 77 | gnunet-auto-share \ |
@@ -230,7 +226,6 @@ if HAVE_BENCHMARKS | |||
230 | perf_gnunet_service_fs_p2p_respect | 226 | perf_gnunet_service_fs_p2p_respect |
231 | endif | 227 | endif |
232 | 228 | ||
233 | if HAVE_TESTING | ||
234 | check_PROGRAMS = \ | 229 | check_PROGRAMS = \ |
235 | test_plugin_block_fs \ | 230 | test_plugin_block_fs \ |
236 | test_fs_directory \ | 231 | test_fs_directory \ |
@@ -258,7 +253,6 @@ check_PROGRAMS = \ | |||
258 | test_gnunet_service_fs_p2p \ | 253 | test_gnunet_service_fs_p2p \ |
259 | test_gnunet_service_fs_p2p_cadet \ | 254 | test_gnunet_service_fs_p2p_cadet \ |
260 | $(FS_BENCHMARKS) | 255 | $(FS_BENCHMARKS) |
261 | endif | ||
262 | 256 | ||
263 | test_plugin_block_fs_SOURCES = \ | 257 | test_plugin_block_fs_SOURCES = \ |
264 | test_plugin_block_fs.c | 258 | test_plugin_block_fs.c |
diff --git a/src/identity/Makefile.am b/src/identity/Makefile.am index e806f0059..59ace6c41 100644 --- a/src/identity/Makefile.am +++ b/src/identity/Makefile.am | |||
@@ -67,11 +67,9 @@ gnunet_identity_LDADD = \ | |||
67 | $(top_builddir)/src/util/libgnunetutil.la \ | 67 | $(top_builddir)/src/util/libgnunetutil.la \ |
68 | $(GN_LIBINTL) | 68 | $(GN_LIBINTL) |
69 | 69 | ||
70 | if HAVE_TESTING | ||
71 | check_PROGRAMS = \ | 70 | check_PROGRAMS = \ |
72 | test_identity \ | 71 | test_identity \ |
73 | test_identity_defaults | 72 | test_identity_defaults |
74 | endif | ||
75 | 73 | ||
76 | if ENABLE_TEST_RUN | 74 | if ENABLE_TEST_RUN |
77 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 75 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
diff --git a/src/namecache/Makefile.am b/src/namecache/Makefile.am index 8ffa85ddb..272f16b77 100644 --- a/src/namecache/Makefile.am +++ b/src/namecache/Makefile.am | |||
@@ -17,30 +17,22 @@ endif | |||
17 | 17 | ||
18 | if HAVE_EXPERIMENTAL | 18 | if HAVE_EXPERIMENTAL |
19 | FLAT_PLUGIN = libgnunet_plugin_namecache_flat.la | 19 | FLAT_PLUGIN = libgnunet_plugin_namecache_flat.la |
20 | if HAVE_TESTING | ||
21 | FLAT_TESTS = test_plugin_namecache_flat | 20 | FLAT_TESTS = test_plugin_namecache_flat |
22 | endif | 21 | endif |
23 | endif | ||
24 | 22 | ||
25 | if HAVE_SQLITE | 23 | if HAVE_SQLITE |
26 | SQLITE_PLUGIN = libgnunet_plugin_namecache_sqlite.la | 24 | SQLITE_PLUGIN = libgnunet_plugin_namecache_sqlite.la |
27 | if HAVE_TESTING | ||
28 | SQLITE_TESTS = test_plugin_namecache_sqlite | 25 | SQLITE_TESTS = test_plugin_namecache_sqlite |
29 | endif | 26 | endif |
30 | endif | ||
31 | 27 | ||
32 | if HAVE_POSTGRESQL | 28 | if HAVE_POSTGRESQL |
33 | POSTGRES_PLUGIN = libgnunet_plugin_namecache_postgres.la | 29 | POSTGRES_PLUGIN = libgnunet_plugin_namecache_postgres.la |
34 | if HAVE_TESTING | ||
35 | POSTGRES_TESTS = test_plugin_namecache_postgres | 30 | POSTGRES_TESTS = test_plugin_namecache_postgres |
36 | endif | 31 | endif |
37 | endif | ||
38 | 32 | ||
39 | # testcases do not even build yet; thus: experimental! | 33 | # testcases do not even build yet; thus: experimental! |
40 | if HAVE_TESTING | ||
41 | TESTING_TESTS = \ | 34 | TESTING_TESTS = \ |
42 | test_namecache_api_cache_block | 35 | test_namecache_api_cache_block |
43 | endif | ||
44 | 36 | ||
45 | if HAVE_SQLITE | 37 | if HAVE_SQLITE |
46 | check_PROGRAMS = \ | 38 | check_PROGRAMS = \ |
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 18e6a196b..51708dd67 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -16,7 +16,6 @@ if USE_COVERAGE | |||
16 | endif | 16 | endif |
17 | 17 | ||
18 | HEAP_PLUGIN = libgnunet_plugin_namestore_flat.la | 18 | HEAP_PLUGIN = libgnunet_plugin_namestore_flat.la |
19 | if HAVE_TESTING | ||
20 | HEAP_TESTS = test_plugin_namestore_flat \ | 19 | HEAP_TESTS = test_plugin_namestore_flat \ |
21 | test_namestore_api_store_flat \ | 20 | test_namestore_api_store_flat \ |
22 | test_namestore_api_store_update_flat \ | 21 | test_namestore_api_store_update_flat \ |
@@ -35,11 +34,9 @@ HEAP_TESTS = test_plugin_namestore_flat \ | |||
35 | test_namestore_api_monitoring_existing_flat \ | 34 | test_namestore_api_monitoring_existing_flat \ |
36 | test_namestore_api_zone_to_name_flat \ | 35 | test_namestore_api_zone_to_name_flat \ |
37 | perf_namestore_api_zone_iteration_flat | 36 | perf_namestore_api_zone_iteration_flat |
38 | endif | ||
39 | 37 | ||
40 | if HAVE_SQLITE | 38 | if HAVE_SQLITE |
41 | SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la | 39 | SQLITE_PLUGIN = libgnunet_plugin_namestore_sqlite.la |
42 | if HAVE_TESTING | ||
43 | SQLITE_TESTS = test_plugin_namestore_sqlite \ | 40 | SQLITE_TESTS = test_plugin_namestore_sqlite \ |
44 | test_namestore_api_store_sqlite \ | 41 | test_namestore_api_store_sqlite \ |
45 | test_namestore_api_store_update_sqlite \ | 42 | test_namestore_api_store_update_sqlite \ |
@@ -59,11 +56,9 @@ SQLITE_TESTS = test_plugin_namestore_sqlite \ | |||
59 | test_namestore_api_zone_to_name_sqlite \ | 56 | test_namestore_api_zone_to_name_sqlite \ |
60 | perf_namestore_api_zone_iteration_sqlite | 57 | perf_namestore_api_zone_iteration_sqlite |
61 | endif | 58 | endif |
62 | endif | ||
63 | 59 | ||
64 | if HAVE_POSTGRESQL | 60 | if HAVE_POSTGRESQL |
65 | POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la | 61 | POSTGRES_PLUGIN = libgnunet_plugin_namestore_postgres.la |
66 | if HAVE_TESTING | ||
67 | POSTGRES_TESTS = test_plugin_namestore_postgres \ | 62 | POSTGRES_TESTS = test_plugin_namestore_postgres \ |
68 | test_namestore_api_store_postgres \ | 63 | test_namestore_api_store_postgres \ |
69 | test_namestore_api_store_update_postgres \ | 64 | test_namestore_api_store_update_postgres \ |
@@ -83,7 +78,6 @@ POSTGRES_TESTS = test_plugin_namestore_postgres \ | |||
83 | test_namestore_api_zone_to_name_postgres \ | 78 | test_namestore_api_zone_to_name_postgres \ |
84 | perf_namestore_api_zone_iteration_postgres | 79 | perf_namestore_api_zone_iteration_postgres |
85 | endif | 80 | endif |
86 | endif | ||
87 | 81 | ||
88 | if HAVE_SQLITE | 82 | if HAVE_SQLITE |
89 | check_PROGRAMS = \ | 83 | check_PROGRAMS = \ |
diff --git a/src/nse/Makefile.am b/src/nse/Makefile.am index 824aa10d4..0c6182e61 100644 --- a/src/nse/Makefile.am +++ b/src/nse/Makefile.am | |||
@@ -36,10 +36,8 @@ libgnunetnse_la_LDFLAGS = \ | |||
36 | libexec_PROGRAMS = \ | 36 | libexec_PROGRAMS = \ |
37 | gnunet-service-nse | 37 | gnunet-service-nse |
38 | 38 | ||
39 | if HAVE_TESTING | ||
40 | noinst_PROGRAMS = \ | 39 | noinst_PROGRAMS = \ |
41 | gnunet-nse-profiler | 40 | gnunet-nse-profiler |
42 | endif | ||
43 | 41 | ||
44 | gnunet_nse_profiler_SOURCES = \ | 42 | gnunet_nse_profiler_SOURCES = \ |
45 | gnunet-nse-profiler.c | 43 | gnunet-nse-profiler.c |
@@ -71,12 +69,10 @@ if HAVE_BENCHMARKS | |||
71 | MULTIPEER_TEST = test_nse_multipeer | 69 | MULTIPEER_TEST = test_nse_multipeer |
72 | endif | 70 | endif |
73 | 71 | ||
74 | if HAVE_TESTING | ||
75 | check_PROGRAMS = \ | 72 | check_PROGRAMS = \ |
76 | test_nse_api \ | 73 | test_nse_api \ |
77 | perf_kdf \ | 74 | perf_kdf \ |
78 | $(MULTIPEER_TEST) | 75 | $(MULTIPEER_TEST) |
79 | endif | ||
80 | 76 | ||
81 | if ENABLE_TEST_RUN | 77 | if ENABLE_TEST_RUN |
82 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 78 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index e61e5a13d..cdab22a9d 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am | |||
@@ -48,14 +48,12 @@ if HAVE_BENCHMARKS | |||
48 | perf_peerinfo_api | 48 | perf_peerinfo_api |
49 | endif | 49 | endif |
50 | 50 | ||
51 | if HAVE_TESTING | ||
52 | check_PROGRAMS = \ | 51 | check_PROGRAMS = \ |
53 | test_peerinfo_shipped_hellos \ | 52 | test_peerinfo_shipped_hellos \ |
54 | test_peerinfo_api \ | 53 | test_peerinfo_api \ |
55 | test_peerinfo_api_friend_only \ | 54 | test_peerinfo_api_friend_only \ |
56 | test_peerinfo_api_notify_friend_only \ | 55 | test_peerinfo_api_notify_friend_only \ |
57 | $(PEERINFO_BENCHMARKS) | 56 | $(PEERINFO_BENCHMARKS) |
58 | endif | ||
59 | 57 | ||
60 | 58 | ||
61 | if ENABLE_TEST_RUN | 59 | if ENABLE_TEST_RUN |
diff --git a/src/peerstore/Makefile.am b/src/peerstore/Makefile.am index babf40654..d9904e59d 100644 --- a/src/peerstore/Makefile.am +++ b/src/peerstore/Makefile.am | |||
@@ -63,9 +63,7 @@ endif | |||
63 | 63 | ||
64 | if HAVE_SQLITE | 64 | if HAVE_SQLITE |
65 | SQLITE_PLUGIN = libgnunet_plugin_peerstore_sqlite.la | 65 | SQLITE_PLUGIN = libgnunet_plugin_peerstore_sqlite.la |
66 | if HAVE_TESTING | ||
67 | SQLITE_TESTS = test_plugin_peerstore_sqlite | 66 | SQLITE_TESTS = test_plugin_peerstore_sqlite |
68 | endif | ||
69 | libgnunet_plugin_peerstore_sqlite_la_SOURCES = \ | 67 | libgnunet_plugin_peerstore_sqlite_la_SOURCES = \ |
70 | plugin_peerstore_sqlite.c | 68 | plugin_peerstore_sqlite.c |
71 | libgnunet_plugin_peerstore_sqlite_la_LIBADD = \ | 69 | libgnunet_plugin_peerstore_sqlite_la_LIBADD = \ |
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am index 10ae04931..fc2cb592c 100644 --- a/src/pt/Makefile.am +++ b/src/pt/Makefile.am | |||
@@ -28,8 +28,6 @@ gnunet_daemon_pt_LDADD = \ | |||
28 | $(top_builddir)/src/util/libgnunetutil.la \ | 28 | $(top_builddir)/src/util/libgnunetutil.la \ |
29 | $(GN_LIBINTL) | 29 | $(GN_LIBINTL) |
30 | 30 | ||
31 | if HAVE_TESTING | ||
32 | |||
33 | if HAVE_LIBGNURL | 31 | if HAVE_LIBGNURL |
34 | LIB_GNURL=@LIBGNURL@ | 32 | LIB_GNURL=@LIBGNURL@ |
35 | CPP_GNURL=@LIBGNURL_CPPFLAGS@ | 33 | CPP_GNURL=@LIBGNURL_CPPFLAGS@ |
@@ -56,8 +54,6 @@ endif | |||
56 | endif | 54 | endif |
57 | endif | 55 | endif |
58 | 56 | ||
59 | endif | ||
60 | |||
61 | check_PROGRAMS = $(VPN_TEST) | 57 | check_PROGRAMS = $(VPN_TEST) |
62 | 58 | ||
63 | if ENABLE_TEST_RUN | 59 | if ENABLE_TEST_RUN |
diff --git a/src/regex/Makefile.am b/src/regex/Makefile.am index 9a7466cb2..2dbf3a3f9 100644 --- a/src/regex/Makefile.am +++ b/src/regex/Makefile.am | |||
@@ -102,11 +102,9 @@ libgnunetregextest_a_LIBADD = \ | |||
102 | $(top_builddir)/src/util/libgnunetutil.la \ | 102 | $(top_builddir)/src/util/libgnunetutil.la \ |
103 | libgnunetregex_internal.a | 103 | libgnunetregex_internal.a |
104 | 104 | ||
105 | if HAVE_TESTING | ||
106 | noinst_PROGRAMS = $(noinst_mysql_progs) \ | 105 | noinst_PROGRAMS = $(noinst_mysql_progs) \ |
107 | perf-regex \ | 106 | perf-regex \ |
108 | gnunet-regex-profiler | 107 | gnunet-regex-profiler |
109 | endif | ||
110 | 108 | ||
111 | perf_regex_SOURCES = \ | 109 | perf_regex_SOURCES = \ |
112 | perf-regex.c | 110 | perf-regex.c |
diff --git a/src/rps/Makefile.am b/src/rps/Makefile.am index b9de6b5e3..b5e8c0617 100644 --- a/src/rps/Makefile.am +++ b/src/rps/Makefile.am | |||
@@ -45,10 +45,8 @@ libgnunetrps_la_CFLAGS = $(AM_CFLAGS) | |||
45 | libexec_PROGRAMS = \ | 45 | libexec_PROGRAMS = \ |
46 | gnunet-service-rps | 46 | gnunet-service-rps |
47 | 47 | ||
48 | if HAVE_TESTING | ||
49 | noinst_PROGRAMS = \ | 48 | noinst_PROGRAMS = \ |
50 | gnunet-rps-profiler | 49 | gnunet-rps-profiler |
51 | endif | ||
52 | 50 | ||
53 | 51 | ||
54 | gnunet_service_rps_SOURCES = \ | 52 | gnunet_service_rps_SOURCES = \ |
@@ -74,7 +72,6 @@ gnunet_service_rps_LDADD = \ | |||
74 | $(GN_LIBINTL) | 72 | $(GN_LIBINTL) |
75 | 73 | ||
76 | 74 | ||
77 | if HAVE_TESTING | ||
78 | check_PROGRAMS = \ | 75 | check_PROGRAMS = \ |
79 | test_service_rps_view \ | 76 | test_service_rps_view \ |
80 | test_service_rps_custommap \ | 77 | test_service_rps_custommap \ |
@@ -91,7 +88,6 @@ check_PROGRAMS += \ | |||
91 | test_rps_malicious_2 \ | 88 | test_rps_malicious_2 \ |
92 | test_rps_malicious_3 | 89 | test_rps_malicious_3 |
93 | endif | 90 | endif |
94 | endif | ||
95 | 91 | ||
96 | rps_test_src = \ | 92 | rps_test_src = \ |
97 | test_rps.c \ | 93 | test_rps.c \ |
diff --git a/src/secretsharing/Makefile.am b/src/secretsharing/Makefile.am index 9ae6e7892..13dd0bd8d 100644 --- a/src/secretsharing/Makefile.am +++ b/src/secretsharing/Makefile.am | |||
@@ -51,7 +51,6 @@ libgnunetsecretsharing_la_LIBADD = \ | |||
51 | libgnunetsecretsharing_la_LDFLAGS = \ | 51 | libgnunetsecretsharing_la_LDFLAGS = \ |
52 | $(GN_LIB_LDFLAGS) | 52 | $(GN_LIB_LDFLAGS) |
53 | 53 | ||
54 | if HAVE_TESTING | ||
55 | bin_PROGRAMS = \ | 54 | bin_PROGRAMS = \ |
56 | gnunet-secretsharing-profiler | 55 | gnunet-secretsharing-profiler |
57 | 56 | ||
@@ -62,7 +61,6 @@ if ENABLE_TEST_RUN | |||
62 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 61 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
63 | TESTS = $(check_PROGRAMS) | 62 | TESTS = $(check_PROGRAMS) |
64 | endif | 63 | endif |
65 | endif | ||
66 | 64 | ||
67 | test_secretsharing_api_SOURCES = \ | 65 | test_secretsharing_api_SOURCES = \ |
68 | test_secretsharing_api.c | 66 | test_secretsharing_api.c |
diff --git a/src/set/Makefile.am b/src/set/Makefile.am index d6b10a1f8..837d42ff5 100644 --- a/src/set/Makefile.am +++ b/src/set/Makefile.am | |||
@@ -14,13 +14,11 @@ if USE_COVERAGE | |||
14 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 14 | AM_CFLAGS = -fprofile-arcs -ftest-coverage |
15 | endif | 15 | endif |
16 | 16 | ||
17 | if HAVE_TESTING | ||
18 | bin_PROGRAMS = \ | 17 | bin_PROGRAMS = \ |
19 | gnunet-set-profiler | 18 | gnunet-set-profiler |
20 | 19 | ||
21 | noinst_PROGRAMS = \ | 20 | noinst_PROGRAMS = \ |
22 | gnunet-set-ibf-profiler | 21 | gnunet-set-ibf-profiler |
23 | endif | ||
24 | 22 | ||
25 | libexec_PROGRAMS = \ | 23 | libexec_PROGRAMS = \ |
26 | gnunet-service-set | 24 | gnunet-service-set |
@@ -69,13 +67,11 @@ libgnunetset_la_LIBADD = \ | |||
69 | libgnunetset_la_LDFLAGS = \ | 67 | libgnunetset_la_LDFLAGS = \ |
70 | $(GN_LIB_LDFLAGS) | 68 | $(GN_LIB_LDFLAGS) |
71 | 69 | ||
72 | if HAVE_TESTING | ||
73 | check_PROGRAMS = \ | 70 | check_PROGRAMS = \ |
74 | test_set_api \ | 71 | test_set_api \ |
75 | test_set_union_result_symmetric \ | 72 | test_set_union_result_symmetric \ |
76 | test_set_intersection_result_full \ | 73 | test_set_intersection_result_full \ |
77 | test_set_union_copy | 74 | test_set_union_copy |
78 | endif | ||
79 | 75 | ||
80 | if ENABLE_TEST_RUN | 76 | if ENABLE_TEST_RUN |
81 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 77 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
diff --git a/src/seti/Makefile.am b/src/seti/Makefile.am index 522f33ece..8441c5060 100644 --- a/src/seti/Makefile.am +++ b/src/seti/Makefile.am | |||
@@ -14,10 +14,8 @@ if USE_COVERAGE | |||
14 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 14 | AM_CFLAGS = -fprofile-arcs -ftest-coverage |
15 | endif | 15 | endif |
16 | 16 | ||
17 | if HAVE_TESTING | ||
18 | bin_PROGRAMS = \ | 17 | bin_PROGRAMS = \ |
19 | gnunet-seti-profiler | 18 | gnunet-seti-profiler |
20 | endif | ||
21 | 19 | ||
22 | libexec_PROGRAMS = \ | 20 | libexec_PROGRAMS = \ |
23 | gnunet-service-seti | 21 | gnunet-service-seti |
@@ -55,10 +53,8 @@ libgnunetseti_la_LIBADD = \ | |||
55 | libgnunetseti_la_LDFLAGS = \ | 53 | libgnunetseti_la_LDFLAGS = \ |
56 | $(GN_LIB_LDFLAGS) | 54 | $(GN_LIB_LDFLAGS) |
57 | 55 | ||
58 | if HAVE_TESTING | ||
59 | check_PROGRAMS = \ | 56 | check_PROGRAMS = \ |
60 | test_seti_api | 57 | test_seti_api |
61 | endif | ||
62 | 58 | ||
63 | if ENABLE_TEST_RUN | 59 | if ENABLE_TEST_RUN |
64 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 60 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
diff --git a/src/setu/Makefile.am b/src/setu/Makefile.am index 77d048add..897bf3f86 100644 --- a/src/setu/Makefile.am +++ b/src/setu/Makefile.am | |||
@@ -14,13 +14,11 @@ if USE_COVERAGE | |||
14 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 14 | AM_CFLAGS = -fprofile-arcs -ftest-coverage |
15 | endif | 15 | endif |
16 | 16 | ||
17 | if HAVE_TESTING | ||
18 | bin_PROGRAMS = \ | 17 | bin_PROGRAMS = \ |
19 | gnunet-setu-profiler | 18 | gnunet-setu-profiler |
20 | 19 | ||
21 | noinst_PROGRAMS = \ | 20 | noinst_PROGRAMS = \ |
22 | gnunet-setu-ibf-profiler | 21 | gnunet-setu-ibf-profiler |
23 | endif | ||
24 | 22 | ||
25 | libexec_PROGRAMS = \ | 23 | libexec_PROGRAMS = \ |
26 | gnunet-service-setu | 24 | gnunet-service-setu |
@@ -67,11 +65,9 @@ libgnunetsetu_la_LIBADD = \ | |||
67 | libgnunetsetu_la_LDFLAGS = \ | 65 | libgnunetsetu_la_LDFLAGS = \ |
68 | $(GN_LIB_LDFLAGS) | 66 | $(GN_LIB_LDFLAGS) |
69 | 67 | ||
70 | if HAVE_TESTING | ||
71 | check_PROGRAMS = \ | 68 | check_PROGRAMS = \ |
72 | test_setu_api \ | 69 | test_setu_api \ |
73 | perf_setu_api | 70 | perf_setu_api |
74 | endif | ||
75 | 71 | ||
76 | if ENABLE_TEST_RUN | 72 | if ENABLE_TEST_RUN |
77 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 73 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index 8580d200c..e5920116b 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am | |||
@@ -42,10 +42,8 @@ gnunet_daemon_topology_LDADD = \ | |||
42 | $(GN_LIBINTL) | 42 | $(GN_LIBINTL) |
43 | 43 | ||
44 | 44 | ||
45 | if HAVE_TESTING | ||
46 | check_PROGRAMS = \ | 45 | check_PROGRAMS = \ |
47 | test_gnunet_daemon_topology | 46 | test_gnunet_daemon_topology |
48 | endif | ||
49 | 47 | ||
50 | if ENABLE_TEST_RUN | 48 | if ENABLE_TEST_RUN |
51 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 49 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 32075ee16..a539f3f25 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -128,11 +128,9 @@ noinst_PROGRAMS = \ | |||
128 | $(WLAN_BIN_SENDER) \ | 128 | $(WLAN_BIN_SENDER) \ |
129 | $(WLAN_BIN_RECEIVER) | 129 | $(WLAN_BIN_RECEIVER) |
130 | 130 | ||
131 | if HAVE_TESTING | ||
132 | TESTING_LIBS = \ | 131 | TESTING_LIBS = \ |
133 | libgnunettransporttesting.la \ | 132 | libgnunettransporttesting.la \ |
134 | libgnunettransporttesting2.la | 133 | libgnunettransporttesting2.la |
135 | endif | ||
136 | 134 | ||
137 | lib_LTLIBRARIES = \ | 135 | lib_LTLIBRARIES = \ |
138 | libgnunettransport.la \ | 136 | libgnunettransport.la \ |
@@ -594,7 +592,6 @@ libgnunet_plugin_transport_https_server_la_LDFLAGS = \ | |||
594 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ | 592 | libgnunet_plugin_transport_https_server_la_CFLAGS = \ |
595 | $(MHD_CFLAGS) $(AM_CFLAGS) -DBUILD_HTTPS | 593 | $(MHD_CFLAGS) $(AM_CFLAGS) -DBUILD_HTTPS |
596 | 594 | ||
597 | if HAVE_TESTING | ||
598 | check_PROGRAMS = \ | 595 | check_PROGRAMS = \ |
599 | test_transport_simple_send \ | 596 | test_transport_simple_send \ |
600 | test_transport_simple_send_v2 \ | 597 | test_transport_simple_send_v2 \ |
@@ -682,7 +679,6 @@ check_PROGRAMS += \ | |||
682 | test_communicator_backchannel-udp \ | 679 | test_communicator_backchannel-udp \ |
683 | test_communicator_bidirect-tcp | 680 | test_communicator_bidirect-tcp |
684 | endif | 681 | endif |
685 | endif | ||
686 | 682 | ||
687 | if ENABLE_TEST_RUN | 683 | if ENABLE_TEST_RUN |
688 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; | 684 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; |
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index a3a77073e..c3a0feccc 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -145,10 +145,8 @@ libgnunetutil_la_LDFLAGS = \ | |||
145 | $(GN_LIB_LDFLAGS) \ | 145 | $(GN_LIB_LDFLAGS) \ |
146 | -version-info 14:0:0 | 146 | -version-info 14:0:0 |
147 | 147 | ||
148 | if HAVE_TESTING | 148 | GNUNET_ECC = gnunet-ecc |
149 | GNUNET_ECC = gnunet-ecc | 149 | GNUNET_SCRYPT = gnunet-scrypt |
150 | GNUNET_SCRYPT = gnunet-scrypt | ||
151 | endif | ||
152 | 150 | ||
153 | lib_LTLIBRARIES = libgnunetutil.la | 151 | lib_LTLIBRARIES = libgnunetutil.la |
154 | 152 | ||