diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-03-29 14:26:33 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-03-29 14:26:33 +0200 |
commit | ab281595eeb270120f89ec954a572f4fcf78fc53 (patch) | |
tree | 335a2caf503596adc400c5ebb9fb742f097bc5a3 /src/ats-tests/Makefile.am | |
parent | 59d393a1124cfd1aaffdf994bf6f8a9baaac8361 (diff) | |
parent | 2b87f173e360aaf4a3bac3fbc6e5b4dc44cf58cd (diff) | |
download | gnunet-ab281595eeb270120f89ec954a572f4fcf78fc53.tar.gz gnunet-ab281595eeb270120f89ec954a572f4fcf78fc53.zip |
- merge with master
Diffstat (limited to 'src/ats-tests/Makefile.am')
-rw-r--r-- | src/ats-tests/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index 21366484b..4811bc8d7 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am | |||
@@ -13,6 +13,7 @@ if USE_COVERAGE | |||
13 | AM_CFLAGS = -fprofile-arcs -ftest-coverage | 13 | AM_CFLAGS = -fprofile-arcs -ftest-coverage |
14 | endif | 14 | endif |
15 | 15 | ||
16 | if HAVE_EXPERIMENTAL | ||
16 | if HAVE_LIBGLPK | 17 | if HAVE_LIBGLPK |
17 | PERF_MLP = \ | 18 | PERF_MLP = \ |
18 | perf_ats_mlp_transport_none \ | 19 | perf_ats_mlp_transport_none \ |
@@ -22,6 +23,7 @@ if HAVE_LIBGLPK | |||
22 | perf_ats_mlp_core_bandwidth \ | 23 | perf_ats_mlp_core_bandwidth \ |
23 | perf_ats_mlp_core_latency | 24 | perf_ats_mlp_core_latency |
24 | endif | 25 | endif |
26 | endif | ||
25 | 27 | ||
26 | if HAVE_TESTING | 28 | if HAVE_TESTING |
27 | TESTING_TESTS = \ | 29 | TESTING_TESTS = \ |
@@ -44,7 +46,7 @@ check_PROGRAMS = \ | |||
44 | $(TESTING_TESTS) | 46 | $(TESTING_TESTS) |
45 | 47 | ||
46 | if ENABLE_TEST_RUN | 48 | if ENABLE_TEST_RUN |
47 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; | 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; |
48 | TESTS = $(check_PROGRAMS) | 50 | TESTS = $(check_PROGRAMS) |
49 | endif | 51 | endif |
50 | 52 | ||
@@ -140,7 +142,7 @@ perf_ats_proportional_transport_bandwidth_LDADD = \ | |||
140 | perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \ | 142 | perf_ats_proportional_transport_bandwidth_DEPENDENCIES = \ |
141 | libgnunetatstesting.la \ | 143 | libgnunetatstesting.la \ |
142 | $(top_builddir)/src/util/libgnunetutil.la | 144 | $(top_builddir)/src/util/libgnunetutil.la |
143 | 145 | ||
144 | perf_ats_proportional_core_latency_SOURCES = \ | 146 | perf_ats_proportional_core_latency_SOURCES = \ |
145 | perf_ats.c | 147 | perf_ats.c |
146 | perf_ats_proportional_core_latency_LDADD = \ | 148 | perf_ats_proportional_core_latency_LDADD = \ |