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 = \
 check_SCRIPTS = \
  test_gnunet_arm.sh
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)  $(check_SCRIPTS)
 endif
 
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 = \
  test_chat_private \
  test_chat_private_p2p
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
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 = \
  test_core_quota_compliance_asymmetric_recv_limited \
  test_core_api_send_to_self
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
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 = \
 
 
 if HAVE_SQLITE
+if HAVE_BENCHMARKS
+ SQLITE_BENCHMARKS = \
+  perf_datacache_postgres
+endif
 SQLITE_TESTS = \
  test_datacache_sqlite \
  test_datacache_quota_sqlite \
- perf_datacache_sqlite
+ $(SQLITE_BENCHMARKS)
 endif
 
 if HAVE_MYSQL
+if HAVE_BENCHMARKS
+ MYSQL_BENCHMARKS = \
+  perf_datacache_postgres
+endif
 MYSQL_TESTS = \
  test_datacache_mysql \
  test_datacache_quota_mysql \
- perf_datacache_mysql
+ $(MYSQL_BENCHMARKS)
 endif
 
 if HAVE_POSTGRES
+if HAVE_BENCHMARKS
+ POSTGRES_BENCHMARKS = \
+  perf_datacache_postgres
+endif
 POSTGRES_TESTS = \
  test_datacache_postgres \
  test_datacache_quota_postgres \
- perf_datacache_postgres
+ $(POSTGRES_BENCHMARKS)
 endif
 
 check_PROGRAMS = \
@@ -106,7 +118,7 @@ check_PROGRAMS = \
  $(MYSQL_TESTS) \
  $(POSTGRES_TESTS) 
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
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 = \
 
 if HAVE_MYSQL
  MYSQL_PLUGIN = libgnunet_plugin_datastore_mysql.la
+if HAVE_BENCHMARKS
+  MYSQL_BENCHMARKS = \
+   perf_datastore_api_mysql \
+   perf_plugin_datastore_mysql
+endif
  MYSQL_TESTS = \
   test_datastore_api_mysql \
   test_datastore_api_management_mysql \
   test_plugin_datastore_mysql \
-  perf_datastore_api_mysql \
-  perf_plugin_datastore_mysql
+  $(MYSQL_BENCHMARKS)
 endif
 if HAVE_SQLITE
  SQLITE_PLUGIN = libgnunet_plugin_datastore_sqlite.la
+if HAVE_BENCHMARKS
+  SQLITE_BENCHMARKS = \
+   perf_datastore_api_sqlite \
+   perf_plugin_datastore_sqlite
+endif
  SQLITE_TESTS = \
   test_datastore_api_sqlite \
   test_datastore_api_management_sqlite \
   test_plugin_datastore_sqlite \
-  perf_datastore_api_sqlite \
-  perf_plugin_datastore_sqlite
+  $(SQLITE_BENCHMARKS)
 endif
 if HAVE_POSTGRES
  POSTGRES_PLUGIN = libgnunet_plugin_datastore_postgres.la
+if HAVE_BENCHMARKS
+  POSTGRES_BENCHMARKS = \
+   perf_datastore_api_postgres \
+   perf_plugin_datastore_postgres
+endif
  POSTGRES_TESTS = \
   test_datastore_api_postgres \
   test_datastore_api_management_postgres \
   test_plugin_datastore_postgres \
-  perf_datastore_api_postgres \
-  perf_plugin_datastore_postgres
+  $(POSTGRES_BENCHMARKS)
 endif
 
 plugin_LTLIBRARIES = \
@@ -113,7 +125,7 @@ check_PROGRAMS = \
   $(MYSQL_TESTS) \
   $(POSTGRES_TESTS)
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
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 = \
  test_dhtlog 
 # test_hash_operations
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = test_dht_api $(check_SCRIPTS) \
  test_dht_twopeer \
  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 = \
  test_transport_api_dv
 # test_dv_topology
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 endif
 
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 = \
 check_PROGRAMS = \
  test_fragmentation
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
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 = \
 gnunet_unindex_DEPENDENCIES = \
   libgnunetfs.la
 
-
-
+if HAVE_BENCHMARKS
+ FS_BENCHMARKS = \
+ perf_gnunet_service_fs_p2p \
+ perf_gnunet_service_fs_p2p_dht \
+ perf_gnunet_service_fs_p2p_index \
+ perf_gnunet_service_fs_p2p_trust 
+endif
 
 check_PROGRAMS = \
  test_fs_directory \
@@ -158,10 +163,7 @@ check_PROGRAMS = \
  test_fs_uri \
  test_gnunet_service_fs_migration \
  test_gnunet_service_fs_p2p \
- perf_gnunet_service_fs_p2p \
- perf_gnunet_service_fs_p2p_dht \
- perf_gnunet_service_fs_p2p_index \
- perf_gnunet_service_fs_p2p_trust 
+ $(FS_BENCHMARKS)
 
 
 if HAVE_PYTHON_PEXPECT
@@ -173,7 +175,7 @@ check_SCRIPTS = \
 endif
 
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = \
  test_fs_directory \
  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 = \
 check_PROGRAMS = \
  test_hello
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
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 = \
  test_gnunet_daemon_hostlist_learning
 
 if HAVE_MHD
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = \
  test_gnunet_daemon_hostlist \
  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 = \
     test_monkey_edb
     #test_gnunet_monkey 
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 # TESTS = $(check_SCRIPTS)
 TESTS = $(check_PROGRAMS)
 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 = \
  test_gnunet_peerinfo.py 
 endif
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_SCRIPTS)
 endif
 
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 = \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la 
 
+if HAVE_BENCHMARKS
+ PEERINFO_BENCHMARKS = \
+ perf_peerinfo_api
+endif
 
 check_PROGRAMS = \
  test_peerinfo_api \
- perf_peerinfo_api
+ $(PEERINFO_BENCHMARKS) 
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
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 = \
  test_statistics_api_loop \
  test_statistics_api_watch 
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
 endif
 
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 = \
 check_PROGRAMS = \
  test_template_api
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
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 = \
  test_testing_topology_none \
  test_testing_topology_scale_free
 
-if !DISABLE_TEST_RUN 
+if ENABLE_TEST_RUN 
 TESTS = \
  test_testing \
  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 = \
 check_PROGRAMS = \
  test_gnunet_daemon_topology
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
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 = \
 libgnunet_plugin_transport_https_la_CPPFLAGS = \
  @LIBCURL_CPPFLAGS@
 
+if HAVE_BENCHMARKS
+ TRANSPORT_BENCHMARKS = \
+   perf_transport_ats 
+endif
 
 check_PROGRAMS = \
  test_transport_ats \
- perf_transport_ats \
+ $(TRANSPORT_BENCHMARKS) \
  test_transport_api_tcp \
  test_transport_api_tcp_nat \
  test_transport_api_udp \
@@ -266,7 +270,7 @@ check_PROGRAMS = \
  $(WLAN_UREL_TEST)
 # TODO: add tests for nat, etc.
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = \
  test_transport_ats \
  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 = \
 libgnunet_plugin_test_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
+if HAVE_BENCHMARKS
+ BENCHMARKS = \
+  perf_crypto_hash 
+endif
+
 check_PROGRAMS = \
  test_bio \
  test_client \
@@ -158,10 +163,10 @@ check_PROGRAMS = \
  test_service \
  test_strings \
  test_time \
- perf_crypto_hash \
+ $(BENCHMARKS) \
  test_os_start_process 
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif
 
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 = \
 #check_PROGRAMS = \
 # test_XXX
 
-if !DISABLE_TEST_RUN
+if ENABLE_TEST_RUN
 #TESTS = \
 # test_transport_api_tcp 
 endif