diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-30 23:57:27 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-30 23:57:27 +0000 |
commit | 2e6182b575ae98c87d216b107a640eb1c15578c9 (patch) | |
tree | dca23e86ab336fea194b52f5ce532b022bcde745 | |
parent | 46efc8e8412f01166744d00f6008338a811e9d99 (diff) |
re-enable core tests now that CORE_connecT API is implemented
-rw-r--r-- | src/ats-tests/Makefile.am | 19 | ||||
-rw-r--r-- | src/ats-tests/ats-testing.c | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am index 10612bdd02..21366484b4 100644 --- a/src/ats-tests/Makefile.am +++ b/src/ats-tests/Makefile.am @@ -17,12 +17,10 @@ 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 if HAVE_TESTING @@ -30,14 +28,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 diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c index 5c2f96e5d9..9f0519fa34 100644 --- a/src/ats-tests/ats-testing.c +++ b/src/ats-tests/ats-testing.c @@ -422,7 +422,7 @@ core_disconnect_adapter (void *cls, { struct BenchmarkPeer *me = cls; - GNUNET_CORE_disconnect (me->ch); + GNUNET_CORE_disconnecT (me->ch); me->ch = NULL; } |