aboutsummaryrefslogtreecommitdiff
path: root/src/ats-tests
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-07-30 23:57:27 +0000
committerChristian Grothoff <christian@grothoff.org>2016-07-30 23:57:27 +0000
commit2e6182b575ae98c87d216b107a640eb1c15578c9 (patch)
treedca23e86ab336fea194b52f5ce532b022bcde745 /src/ats-tests
parent46efc8e8412f01166744d00f6008338a811e9d99 (diff)
downloadgnunet-2e6182b575ae98c87d216b107a640eb1c15578c9.tar.gz
gnunet-2e6182b575ae98c87d216b107a640eb1c15578c9.zip
re-enable core tests now that CORE_connecT API is implemented
Diffstat (limited to 'src/ats-tests')
-rw-r--r--src/ats-tests/Makefile.am19
-rw-r--r--src/ats-tests/ats-testing.c2
2 files changed, 8 insertions, 13 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 10612bdd0..21366484b 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -17,12 +17,10 @@ if HAVE_LIBGLPK
17 PERF_MLP = \ 17 PERF_MLP = \
18 perf_ats_mlp_transport_none \ 18 perf_ats_mlp_transport_none \
19 perf_ats_mlp_transport_bandwidth \ 19 perf_ats_mlp_transport_bandwidth \
20 perf_ats_mlp_transport_latency 20 perf_ats_mlp_transport_latency \
21# core-related test commented out while we wait 21 perf_ats_mlp_core_none \
22# for GNUNET_CORE_connecT to be implemented! 22 perf_ats_mlp_core_bandwidth \
23# perf_ats_mlp_core_none \ 23 perf_ats_mlp_core_latency
24# perf_ats_mlp_core_bandwidth \
25# perf_ats_mlp_core_latency
26endif 24endif
27 25
28if HAVE_TESTING 26if HAVE_TESTING
@@ -30,14 +28,11 @@ TESTING_TESTS = \
30 perf_ats_proportional_transport_none \ 28 perf_ats_proportional_transport_none \
31 perf_ats_proportional_transport_bandwidth \ 29 perf_ats_proportional_transport_bandwidth \
32 perf_ats_proportional_transport_latency \ 30 perf_ats_proportional_transport_latency \
31 perf_ats_proportional_core_none \
32 perf_ats_proportional_core_bandwidth \
33 perf_ats_proportional_core_latency \
33 $(PERF_MLP) 34 $(PERF_MLP)
34 35
35# core-related test commented out while we wait
36# for GNUNET_CORE_connecT to be implemented!
37# perf_ats_proportional_core_none \
38# perf_ats_proportional_core_bandwidth \
39# perf_ats_proportional_core_latency
40
41# RIL-tests commented out as RIL is currently badly broken. 36# RIL-tests commented out as RIL is currently badly broken.
42# 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 37# 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
43endif 38endif
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c
index 5c2f96e5d..9f0519fa3 100644
--- a/src/ats-tests/ats-testing.c
+++ b/src/ats-tests/ats-testing.c
@@ -422,7 +422,7 @@ core_disconnect_adapter (void *cls,
422{ 422{
423 struct BenchmarkPeer *me = cls; 423 struct BenchmarkPeer *me = cls;
424 424
425 GNUNET_CORE_disconnect (me->ch); 425 GNUNET_CORE_disconnecT (me->ch);
426 me->ch = NULL; 426 me->ch = NULL;
427} 427}
428 428