Merge branch 'master' of ssh://gnunet.org/gnunet

[oweals/gnunet.git] / src / ats-tests / Makefile.am

diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 10612bdd02e60ef63b7e12fa33e4e01339b0745d..4811bc8d7aed8ec69343edab0f920faaffb77b2b 100644 (file)
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -13,16 +13,16 @@ if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
 endif
 
+if HAVE_EXPERIMENTAL
 if HAVE_LIBGLPK
  PERF_MLP = \
  perf_ats_mlp_transport_none \
  perf_ats_mlp_transport_bandwidth \
- perf_ats_mlp_transport_latency
-# core-related test commented out while we wait
-# for GNUNET_CORE_connecT to be implemented!
-# perf_ats_mlp_core_none \
-# perf_ats_mlp_core_bandwidth \
-# perf_ats_mlp_core_latency
+ perf_ats_mlp_transport_latency \
+ perf_ats_mlp_core_none \
+ perf_ats_mlp_core_bandwidth \
+ perf_ats_mlp_core_latency
+endif
 endif
 
 if HAVE_TESTING
@@ -30,14 +30,11 @@ TESTING_TESTS = \
  perf_ats_proportional_transport_none \
  perf_ats_proportional_transport_bandwidth \
  perf_ats_proportional_transport_latency \
+ perf_ats_proportional_core_none \
+ perf_ats_proportional_core_bandwidth \
+ perf_ats_proportional_core_latency \
  $(PERF_MLP)
 
-# core-related test commented out while we wait
-# for GNUNET_CORE_connecT to be implemented!
-# perf_ats_proportional_core_none \
-# perf_ats_proportional_core_bandwidth \
-# perf_ats_proportional_core_latency 
-
 # RIL-tests commented out as RIL is currently badly broken.
 # perf_ats_ril_transport_none  perf_ats_ril_core_none perf_ats_ril_transport_bandwidth perf_ats_ril_core_bandwidth perf_ats_ril_transport_latency perf_ats_ril_core_latency
 endif
@@ -49,7 +46,7 @@ check_PROGRAMS = \
  $(TESTING_TESTS)
 
 if ENABLE_TEST_RUN
-AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;
+AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME;
 TESTS = $(check_PROGRAMS)
 endif
 
@@ -145,7 +142,7 @@ perf_ats_proportional_transport_bandwidth_LDADD = \
 perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \
  libgnunetatstesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 perf_ats_proportional_core_latency_SOURCES = \
   perf_ats.c
 perf_ats_proportional_core_latency_LDADD = \