diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-06-10 10:45:33 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-06-10 10:45:33 +0000 |
commit | f7b5b476ba55ee45fefff22777f525cc81b4cae8 (patch) | |
tree | a33e5983ab6c8b0e35c1055cb7503ec4fac90041 /src | |
parent | 0ac9a4984e1e551293ea8ea00f3c8ea2c5460d91 (diff) | |
download | gnunet-f7b5b476ba55ee45fefff22777f525cc81b4cae8.tar.gz gnunet-f7b5b476ba55ee45fefff22777f525cc81b4cae8.zip |
adding configure code for --enable-benchmarks, --enable-expensive-tests, some clean up
Diffstat (limited to 'src')
-rw-r--r-- | src/arm/Makefile.am | 2 | ||||
-rw-r--r-- | src/chat/Makefile.am | 2 | ||||
-rw-r--r-- | src/core/Makefile.am | 2 | ||||
-rw-r--r-- | src/datacache/Makefile.am | 20 | ||||
-rw-r--r-- | src/datastore/Makefile.am | 26 | ||||
-rw-r--r-- | src/dht/Makefile.am | 2 | ||||
-rw-r--r-- | src/dv/Makefile.am | 2 | ||||
-rw-r--r-- | src/fragmentation/Makefile.am | 2 | ||||
-rw-r--r-- | src/fs/Makefile.am | 16 | ||||
-rw-r--r-- | src/hello/Makefile.am | 2 | ||||
-rw-r--r-- | src/hostlist/Makefile.am | 2 | ||||
-rw-r--r-- | src/monkey/Makefile.am | 2 | ||||
-rw-r--r-- | src/peerinfo-tool/Makefile.am | 2 | ||||
-rw-r--r-- | src/peerinfo/Makefile.am | 8 | ||||
-rw-r--r-- | src/statistics/Makefile.am | 2 | ||||
-rw-r--r-- | src/template/Makefile.am | 2 | ||||
-rw-r--r-- | src/testing/Makefile.am | 2 | ||||
-rw-r--r-- | src/topology/Makefile.am | 2 | ||||
-rw-r--r-- | src/transport/Makefile.am | 8 | ||||
-rw-r--r-- | src/util/Makefile.am | 9 | ||||
-rw-r--r-- | src/vpn/Makefile.am | 2 |
21 files changed, 78 insertions, 39 deletions
diff --git a/src/arm/Makefile.am b/src/arm/Makefile.am index 3e7f27dfd..bd6e7e0e7 100644 --- a/src/arm/Makefile.am +++ b/src/arm/Makefile.am | |||
@@ -59,7 +59,7 @@ check_PROGRAMS = \ | |||
59 | check_SCRIPTS = \ | 59 | check_SCRIPTS = \ |
60 | test_gnunet_arm.sh | 60 | test_gnunet_arm.sh |
61 | 61 | ||
62 | if !DISABLE_TEST_RUN | 62 | if ENABLE_TEST_RUN |
63 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 63 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
64 | endif | 64 | endif |
65 | 65 | ||
diff --git a/src/chat/Makefile.am b/src/chat/Makefile.am index f10796c23..39a2df2a1 100644 --- a/src/chat/Makefile.am +++ b/src/chat/Makefile.am | |||
@@ -50,7 +50,7 @@ check_PROGRAMS = \ | |||
50 | test_chat_private \ | 50 | test_chat_private \ |
51 | test_chat_private_p2p | 51 | test_chat_private_p2p |
52 | 52 | ||
53 | if !DISABLE_TEST_RUN | 53 | if ENABLE_TEST_RUN |
54 | TESTS = $(check_PROGRAMS) | 54 | TESTS = $(check_PROGRAMS) |
55 | endif | 55 | endif |
56 | 56 | ||
diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 1ab88033f..2faeb2357 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am | |||
@@ -47,7 +47,7 @@ check_PROGRAMS = \ | |||
47 | test_core_quota_compliance_asymmetric_recv_limited \ | 47 | test_core_quota_compliance_asymmetric_recv_limited \ |
48 | test_core_api_send_to_self | 48 | test_core_api_send_to_self |
49 | 49 | ||
50 | if !DISABLE_TEST_RUN | 50 | if ENABLE_TEST_RUN |
51 | TESTS = $(check_PROGRAMS) | 51 | TESTS = $(check_PROGRAMS) |
52 | endif | 52 | endif |
53 | 53 | ||
diff --git a/src/datacache/Makefile.am b/src/datacache/Makefile.am index 5e3919820..921d88e5f 100644 --- a/src/datacache/Makefile.am +++ b/src/datacache/Makefile.am | |||
@@ -81,24 +81,36 @@ libgnunet_plugin_datacache_template_la_LDFLAGS = \ | |||
81 | 81 | ||
82 | 82 | ||
83 | if HAVE_SQLITE | 83 | if HAVE_SQLITE |
84 | if HAVE_BENCHMARKS | ||
85 | SQLITE_BENCHMARKS = \ | ||
86 | perf_datacache_postgres | ||
87 | endif | ||
84 | SQLITE_TESTS = \ | 88 | SQLITE_TESTS = \ |
85 | test_datacache_sqlite \ | 89 | test_datacache_sqlite \ |
86 | test_datacache_quota_sqlite \ | 90 | test_datacache_quota_sqlite \ |
87 | perf_datacache_sqlite | 91 | $(SQLITE_BENCHMARKS) |
88 | endif | 92 | endif |
89 | 93 | ||
90 | if HAVE_MYSQL | 94 | if HAVE_MYSQL |
95 | if HAVE_BENCHMARKS | ||
96 | MYSQL_BENCHMARKS = \ | ||
97 | perf_datacache_postgres | ||
98 | endif | ||
91 | MYSQL_TESTS = \ | 99 | MYSQL_TESTS = \ |
92 | test_datacache_mysql \ | 100 | test_datacache_mysql \ |
93 | test_datacache_quota_mysql \ | 101 | test_datacache_quota_mysql \ |
94 | perf_datacache_mysql | 102 | $(MYSQL_BENCHMARKS) |
95 | endif | 103 | endif |
96 | 104 | ||
97 | if HAVE_POSTGRES | 105 | if HAVE_POSTGRES |
106 | if HAVE_BENCHMARKS | ||
107 | POSTGRES_BENCHMARKS = \ | ||
108 | perf_datacache_postgres | ||
109 | endif | ||
98 | POSTGRES_TESTS = \ | 110 | POSTGRES_TESTS = \ |
99 | test_datacache_postgres \ | 111 | test_datacache_postgres \ |
100 | test_datacache_quota_postgres \ | 112 | test_datacache_quota_postgres \ |
101 | perf_datacache_postgres | 113 | $(POSTGRES_BENCHMARKS) |
102 | endif | 114 | endif |
103 | 115 | ||
104 | check_PROGRAMS = \ | 116 | check_PROGRAMS = \ |
@@ -106,7 +118,7 @@ check_PROGRAMS = \ | |||
106 | $(MYSQL_TESTS) \ | 118 | $(MYSQL_TESTS) \ |
107 | $(POSTGRES_TESTS) | 119 | $(POSTGRES_TESTS) |
108 | 120 | ||
109 | if !DISABLE_TEST_RUN | 121 | if ENABLE_TEST_RUN |
110 | TESTS = $(check_PROGRAMS) | 122 | TESTS = $(check_PROGRAMS) |
111 | endif | 123 | endif |
112 | 124 | ||
diff --git a/src/datastore/Makefile.am b/src/datastore/Makefile.am index 4ab887061..a3c484531 100644 --- a/src/datastore/Makefile.am +++ b/src/datastore/Makefile.am | |||
@@ -38,30 +38,42 @@ gnunet_service_datastore_LDADD = \ | |||
38 | 38 | ||
39 | if HAVE_MYSQL | 39 | if HAVE_MYSQL |
40 | MYSQL_PLUGIN = libgnunet_plugin_datastore_mysql.la | 40 | MYSQL_PLUGIN = libgnunet_plugin_datastore_mysql.la |
41 | if HAVE_BENCHMARKS | ||
42 | MYSQL_BENCHMARKS = \ | ||
43 | perf_datastore_api_mysql \ | ||
44 | perf_plugin_datastore_mysql | ||
45 | endif | ||
41 | MYSQL_TESTS = \ | 46 | MYSQL_TESTS = \ |
42 | test_datastore_api_mysql \ | 47 | test_datastore_api_mysql \ |
43 | test_datastore_api_management_mysql \ | 48 | test_datastore_api_management_mysql \ |
44 | test_plugin_datastore_mysql \ | 49 | test_plugin_datastore_mysql \ |
45 | perf_datastore_api_mysql \ | 50 | $(MYSQL_BENCHMARKS) |
46 | perf_plugin_datastore_mysql | ||
47 | endif | 51 | endif |
48 | if HAVE_SQLITE | 52 | if HAVE_SQLITE |
49 | SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la | 53 | SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la |
54 | if HAVE_BENCHMARKS | ||
55 | SQLITE_BENCHMARKS = \ | ||
56 | perf_datastore_api_sqlite \ | ||
57 | perf_plugin_datastore_sqlite | ||
58 | endif | ||
50 | SQLITE_TESTS = \ | 59 | SQLITE_TESTS = \ |
51 | test_datastore_api_sqlite \ | 60 | test_datastore_api_sqlite \ |
52 | test_datastore_api_management_sqlite \ | 61 | test_datastore_api_management_sqlite \ |
53 | test_plugin_datastore_sqlite \ | 62 | test_plugin_datastore_sqlite \ |
54 | perf_datastore_api_sqlite \ | 63 | $(SQLITE_BENCHMARKS) |
55 | perf_plugin_datastore_sqlite | ||
56 | endif | 64 | endif |
57 | if HAVE_POSTGRES | 65 | if HAVE_POSTGRES |
58 | POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la | 66 | POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la |
67 | if HAVE_BENCHMARKS | ||
68 | POSTGRES_BENCHMARKS = \ | ||
69 | perf_datastore_api_postgres \ | ||
70 | perf_plugin_datastore_postgres | ||
71 | endif | ||
59 | POSTGRES_TESTS = \ | 72 | POSTGRES_TESTS = \ |
60 | test_datastore_api_postgres \ | 73 | test_datastore_api_postgres \ |
61 | test_datastore_api_management_postgres \ | 74 | test_datastore_api_management_postgres \ |
62 | test_plugin_datastore_postgres \ | 75 | test_plugin_datastore_postgres \ |
63 | perf_datastore_api_postgres \ | 76 | $(POSTGRES_BENCHMARKS) |
64 | perf_plugin_datastore_postgres | ||
65 | endif | 77 | endif |
66 | 78 | ||
67 | plugin_LTLIBRARIES = \ | 79 | plugin_LTLIBRARIES = \ |
@@ -113,7 +125,7 @@ check_PROGRAMS = \ | |||
113 | $(MYSQL_TESTS) \ | 125 | $(MYSQL_TESTS) \ |
114 | $(POSTGRES_TESTS) | 126 | $(POSTGRES_TESTS) |
115 | 127 | ||
116 | if !DISABLE_TEST_RUN | 128 | if ENABLE_TEST_RUN |
117 | TESTS = $(check_PROGRAMS) | 129 | TESTS = $(check_PROGRAMS) |
118 | endif | 130 | endif |
119 | 131 | ||
diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am index 97f81e6be..11ab7ca8b 100644 --- a/src/dht/Makefile.am +++ b/src/dht/Makefile.am | |||
@@ -156,7 +156,7 @@ check_PROGRAMS = \ | |||
156 | test_dhtlog | 156 | test_dhtlog |
157 | # test_hash_operations | 157 | # test_hash_operations |
158 | 158 | ||
159 | if !DISABLE_TEST_RUN | 159 | if ENABLE_TEST_RUN |
160 | TESTS = test_dht_api $(check_SCRIPTS) \ | 160 | TESTS = test_dht_api $(check_SCRIPTS) \ |
161 | test_dht_twopeer \ | 161 | test_dht_twopeer \ |
162 | test_dht_twopeer_put_get \ | 162 | test_dht_twopeer_put_get \ |
diff --git a/src/dv/Makefile.am b/src/dv/Makefile.am index 9e7d9c4e4..d505e31c4 100644 --- a/src/dv/Makefile.am +++ b/src/dv/Makefile.am | |||
@@ -58,7 +58,7 @@ check_PROGRAMS = \ | |||
58 | test_transport_api_dv | 58 | test_transport_api_dv |
59 | # test_dv_topology | 59 | # test_dv_topology |
60 | 60 | ||
61 | if !DISABLE_TEST_RUN | 61 | if ENABLE_TEST_RUN |
62 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 62 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
63 | endif | 63 | endif |
64 | 64 | ||
diff --git a/src/fragmentation/Makefile.am b/src/fragmentation/Makefile.am index f00c0958c..5b1367260 100644 --- a/src/fragmentation/Makefile.am +++ b/src/fragmentation/Makefile.am | |||
@@ -18,7 +18,7 @@ libgnunetfragmentation_la_LIBADD = \ | |||
18 | check_PROGRAMS = \ | 18 | check_PROGRAMS = \ |
19 | test_fragmentation | 19 | test_fragmentation |
20 | 20 | ||
21 | if !DISABLE_TEST_RUN | 21 | if ENABLE_TEST_RUN |
22 | TESTS = $(check_PROGRAMS) | 22 | TESTS = $(check_PROGRAMS) |
23 | endif | 23 | endif |
24 | 24 | ||
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index d433e5b66..39dce602e 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -134,8 +134,13 @@ gnunet_unindex_LDADD = \ | |||
134 | gnunet_unindex_DEPENDENCIES = \ | 134 | gnunet_unindex_DEPENDENCIES = \ |
135 | libgnunetfs.la | 135 | libgnunetfs.la |
136 | 136 | ||
137 | 137 | if HAVE_BENCHMARKS | |
138 | 138 | FS_BENCHMARKS = \ | |
139 | perf_gnunet_service_fs_p2p \ | ||
140 | perf_gnunet_service_fs_p2p_dht \ | ||
141 | perf_gnunet_service_fs_p2p_index \ | ||
142 | perf_gnunet_service_fs_p2p_trust | ||
143 | endif | ||
139 | 144 | ||
140 | check_PROGRAMS = \ | 145 | check_PROGRAMS = \ |
141 | test_fs_directory \ | 146 | test_fs_directory \ |
@@ -158,10 +163,7 @@ check_PROGRAMS = \ | |||
158 | test_fs_uri \ | 163 | test_fs_uri \ |
159 | test_gnunet_service_fs_migration \ | 164 | test_gnunet_service_fs_migration \ |
160 | test_gnunet_service_fs_p2p \ | 165 | test_gnunet_service_fs_p2p \ |
161 | perf_gnunet_service_fs_p2p \ | 166 | $(FS_BENCHMARKS) |
162 | perf_gnunet_service_fs_p2p_dht \ | ||
163 | perf_gnunet_service_fs_p2p_index \ | ||
164 | perf_gnunet_service_fs_p2p_trust | ||
165 | 167 | ||
166 | 168 | ||
167 | if HAVE_PYTHON_PEXPECT | 169 | if HAVE_PYTHON_PEXPECT |
@@ -173,7 +175,7 @@ check_SCRIPTS = \ | |||
173 | endif | 175 | endif |
174 | 176 | ||
175 | 177 | ||
176 | if !DISABLE_TEST_RUN | 178 | if ENABLE_TEST_RUN |
177 | TESTS = \ | 179 | TESTS = \ |
178 | test_fs_directory \ | 180 | test_fs_directory \ |
179 | test_fs_download \ | 181 | test_fs_download \ |
diff --git a/src/hello/Makefile.am b/src/hello/Makefile.am index 703776c65..c2bc5cd69 100644 --- a/src/hello/Makefile.am +++ b/src/hello/Makefile.am | |||
@@ -19,7 +19,7 @@ libgnunethello_la_LIBADD = \ | |||
19 | check_PROGRAMS = \ | 19 | check_PROGRAMS = \ |
20 | test_hello | 20 | test_hello |
21 | 21 | ||
22 | if !DISABLE_TEST_RUN | 22 | if ENABLE_TEST_RUN |
23 | TESTS = $(check_PROGRAMS) | 23 | TESTS = $(check_PROGRAMS) |
24 | endif | 24 | endif |
25 | 25 | ||
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am index 560d81900..15c8f86a7 100644 --- a/src/hostlist/Makefile.am +++ b/src/hostlist/Makefile.am | |||
@@ -37,7 +37,7 @@ check_PROGRAMS = \ | |||
37 | test_gnunet_daemon_hostlist_learning | 37 | test_gnunet_daemon_hostlist_learning |
38 | 38 | ||
39 | if HAVE_MHD | 39 | if HAVE_MHD |
40 | if !DISABLE_TEST_RUN | 40 | if ENABLE_TEST_RUN |
41 | TESTS = \ | 41 | TESTS = \ |
42 | test_gnunet_daemon_hostlist \ | 42 | test_gnunet_daemon_hostlist \ |
43 | test_gnunet_daemon_hostlist_reconnect \ | 43 | test_gnunet_daemon_hostlist_reconnect \ |
diff --git a/src/monkey/Makefile.am b/src/monkey/Makefile.am index b1d6cb89b..4b170da58 100644 --- a/src/monkey/Makefile.am +++ b/src/monkey/Makefile.am | |||
@@ -92,7 +92,7 @@ check_PROGRAMS = \ | |||
92 | test_monkey_edb | 92 | test_monkey_edb |
93 | #test_gnunet_monkey | 93 | #test_gnunet_monkey |
94 | 94 | ||
95 | if !DISABLE_TEST_RUN | 95 | if ENABLE_TEST_RUN |
96 | # TESTS = $(check_SCRIPTS) | 96 | # TESTS = $(check_SCRIPTS) |
97 | TESTS = $(check_PROGRAMS) | 97 | TESTS = $(check_PROGRAMS) |
98 | endif | 98 | endif |
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am index b004a4732..8c5fd8fbb 100644 --- a/src/peerinfo-tool/Makefile.am +++ b/src/peerinfo-tool/Makefile.am | |||
@@ -25,7 +25,7 @@ check_SCRIPTS = \ | |||
25 | test_gnunet_peerinfo.py | 25 | test_gnunet_peerinfo.py |
26 | endif | 26 | endif |
27 | 27 | ||
28 | if !DISABLE_TEST_RUN | 28 | if ENABLE_TEST_RUN |
29 | TESTS = $(check_SCRIPTS) | 29 | TESTS = $(check_SCRIPTS) |
30 | endif | 30 | endif |
31 | 31 | ||
diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am index 116095f2a..d58425730 100644 --- a/src/peerinfo/Makefile.am +++ b/src/peerinfo/Makefile.am | |||
@@ -33,12 +33,16 @@ gnunet_service_peerinfo_LDADD = \ | |||
33 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ | 33 | $(top_builddir)/src/statistics/libgnunetstatistics.la \ |
34 | $(top_builddir)/src/util/libgnunetutil.la | 34 | $(top_builddir)/src/util/libgnunetutil.la |
35 | 35 | ||
36 | if HAVE_BENCHMARKS | ||
37 | PEERINFO_BENCHMARKS = \ | ||
38 | perf_peerinfo_api | ||
39 | endif | ||
36 | 40 | ||
37 | check_PROGRAMS = \ | 41 | check_PROGRAMS = \ |
38 | test_peerinfo_api \ | 42 | test_peerinfo_api \ |
39 | perf_peerinfo_api | 43 | $(PEERINFO_BENCHMARKS) |
40 | 44 | ||
41 | if !DISABLE_TEST_RUN | 45 | if ENABLE_TEST_RUN |
42 | TESTS = $(check_PROGRAMS) | 46 | TESTS = $(check_PROGRAMS) |
43 | endif | 47 | endif |
44 | 48 | ||
diff --git a/src/statistics/Makefile.am b/src/statistics/Makefile.am index 2a1d0d529..a15aba9fb 100644 --- a/src/statistics/Makefile.am +++ b/src/statistics/Makefile.am | |||
@@ -49,7 +49,7 @@ check_PROGRAMS = \ | |||
49 | test_statistics_api_loop \ | 49 | test_statistics_api_loop \ |
50 | test_statistics_api_watch | 50 | test_statistics_api_watch |
51 | 51 | ||
52 | if !DISABLE_TEST_RUN | 52 | if ENABLE_TEST_RUN |
53 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) | 53 | TESTS = $(check_PROGRAMS) $(check_SCRIPTS) |
54 | endif | 54 | endif |
55 | 55 | ||
diff --git a/src/template/Makefile.am b/src/template/Makefile.am index f17e48166..35a4b433e 100644 --- a/src/template/Makefile.am +++ b/src/template/Makefile.am | |||
@@ -28,7 +28,7 @@ gnunet_service_template_LDADD = \ | |||
28 | check_PROGRAMS = \ | 28 | check_PROGRAMS = \ |
29 | test_template_api | 29 | test_template_api |
30 | 30 | ||
31 | if !DISABLE_TEST_RUN | 31 | if ENABLE_TEST_RUN |
32 | TESTS = $(check_PROGRAMS) | 32 | TESTS = $(check_PROGRAMS) |
33 | endif | 33 | endif |
34 | 34 | ||
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index ac57659ef..c25087d69 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am | |||
@@ -47,7 +47,7 @@ check_PROGRAMS = \ | |||
47 | test_testing_topology_none \ | 47 | test_testing_topology_none \ |
48 | test_testing_topology_scale_free | 48 | test_testing_topology_scale_free |
49 | 49 | ||
50 | if !DISABLE_TEST_RUN | 50 | if ENABLE_TEST_RUN |
51 | TESTS = \ | 51 | TESTS = \ |
52 | test_testing \ | 52 | test_testing \ |
53 | test_testing_connect \ | 53 | test_testing_connect \ |
diff --git a/src/topology/Makefile.am b/src/topology/Makefile.am index 2fc8e50ee..3b69627e3 100644 --- a/src/topology/Makefile.am +++ b/src/topology/Makefile.am | |||
@@ -24,7 +24,7 @@ gnunet_daemon_topology_LDADD = \ | |||
24 | check_PROGRAMS = \ | 24 | check_PROGRAMS = \ |
25 | test_gnunet_daemon_topology | 25 | test_gnunet_daemon_topology |
26 | 26 | ||
27 | if !DISABLE_TEST_RUN | 27 | if ENABLE_TEST_RUN |
28 | TESTS = $(check_PROGRAMS) | 28 | TESTS = $(check_PROGRAMS) |
29 | endif | 29 | endif |
30 | 30 | ||
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 216fcb0cd..f68ec4315 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am | |||
@@ -234,10 +234,14 @@ libgnunet_plugin_transport_https_la_CFLAGS = \ | |||
234 | libgnunet_plugin_transport_https_la_CPPFLAGS = \ | 234 | libgnunet_plugin_transport_https_la_CPPFLAGS = \ |
235 | @LIBCURL_CPPFLAGS@ | 235 | @LIBCURL_CPPFLAGS@ |
236 | 236 | ||
237 | if HAVE_BENCHMARKS | ||
238 | TRANSPORT_BENCHMARKS = \ | ||
239 | perf_transport_ats | ||
240 | endif | ||
237 | 241 | ||
238 | check_PROGRAMS = \ | 242 | check_PROGRAMS = \ |
239 | test_transport_ats \ | 243 | test_transport_ats \ |
240 | perf_transport_ats \ | 244 | $(TRANSPORT_BENCHMARKS) \ |
241 | test_transport_api_tcp \ | 245 | test_transport_api_tcp \ |
242 | test_transport_api_tcp_nat \ | 246 | test_transport_api_tcp_nat \ |
243 | test_transport_api_udp \ | 247 | test_transport_api_udp \ |
@@ -266,7 +270,7 @@ check_PROGRAMS = \ | |||
266 | $(WLAN_UREL_TEST) | 270 | $(WLAN_UREL_TEST) |
267 | # TODO: add tests for nat, etc. | 271 | # TODO: add tests for nat, etc. |
268 | 272 | ||
269 | if !DISABLE_TEST_RUN | 273 | if ENABLE_TEST_RUN |
270 | TESTS = \ | 274 | TESTS = \ |
271 | test_transport_ats \ | 275 | test_transport_ats \ |
272 | perf_transport_ats \ | 276 | perf_transport_ats \ |
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 3a03516db..6c85e4064 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -114,6 +114,11 @@ libgnunet_plugin_test_la_SOURCES = \ | |||
114 | libgnunet_plugin_test_la_LDFLAGS = \ | 114 | libgnunet_plugin_test_la_LDFLAGS = \ |
115 | $(GN_PLUGIN_LDFLAGS) | 115 | $(GN_PLUGIN_LDFLAGS) |
116 | 116 | ||
117 | if HAVE_BENCHMARKS | ||
118 | BENCHMARKS = \ | ||
119 | perf_crypto_hash | ||
120 | endif | ||
121 | |||
117 | check_PROGRAMS = \ | 122 | check_PROGRAMS = \ |
118 | test_bio \ | 123 | test_bio \ |
119 | test_client \ | 124 | test_client \ |
@@ -158,10 +163,10 @@ check_PROGRAMS = \ | |||
158 | test_service \ | 163 | test_service \ |
159 | test_strings \ | 164 | test_strings \ |
160 | test_time \ | 165 | test_time \ |
161 | perf_crypto_hash \ | 166 | $(BENCHMARKS) \ |
162 | test_os_start_process | 167 | test_os_start_process |
163 | 168 | ||
164 | if !DISABLE_TEST_RUN | 169 | if ENABLE_TEST_RUN |
165 | TESTS = $(check_PROGRAMS) | 170 | TESTS = $(check_PROGRAMS) |
166 | endif | 171 | endif |
167 | 172 | ||
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am index 5430ba3b9..f36031f7b 100644 --- a/src/vpn/Makefile.am +++ b/src/vpn/Makefile.am | |||
@@ -70,7 +70,7 @@ gnunet_daemon_exit_LDADD = \ | |||
70 | #check_PROGRAMS = \ | 70 | #check_PROGRAMS = \ |
71 | # test_XXX | 71 | # test_XXX |
72 | 72 | ||
73 | if !DISABLE_TEST_RUN | 73 | if ENABLE_TEST_RUN |
74 | #TESTS = \ | 74 | #TESTS = \ |
75 | # test_transport_api_tcp | 75 | # test_transport_api_tcp |
76 | endif | 76 | endif |