From 760f75d2d87f01ca93ebfb349eedbb4224c03c7c Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 30 Sep 2016 21:59:57 +0000 Subject: -eliminate dead code --- src/testing/Makefile.am | 11 +++++------ src/testing/testing.c | 7 ------- 2 files changed, 5 insertions(+), 13 deletions(-) (limited to 'src/testing') diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index 859d950fa..c290dc909 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am @@ -16,13 +16,13 @@ dist_pkgcfg_DATA = \ testing.conf lib_LTLIBRARIES = \ - libgnunettesting.la + libgnunettesting.la libgnunettesting_la_SOURCES = \ - testing.c + testing.c libgnunettesting_la_LIBADD = \ - $(top_builddir)/src/util/libgnunetutil.la \ $(top_builddir)/src/arm/libgnunetarm.la \ + $(top_builddir)/src/util/libgnunetutil.la \ $(LTLIBINTL) libgnunettesting_la_LDFLAGS = \ $(GN_LIB_LDFLAGS) \ @@ -35,7 +35,7 @@ noinst_PROGRAMS = \ list-keys gnunet_testing_SOURCES = \ - gnunet-testing.c + gnunet-testing.c gnunet_testing_LDADD = \ libgnunettesting.la \ $(top_builddir)/src/util/libgnunetutil.la \ @@ -55,7 +55,7 @@ check_PROGRAMS = \ test_testing_peerstartup2 \ test_testing_sharedservices -if ENABLE_TEST_RUN +if ENABLE_TEST_RUN AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; TESTS = \ test_testing_portreservation \ @@ -96,4 +96,3 @@ test_testing_sharedservices_LDADD = \ EXTRA_DIST = \ test_testing_defaults.conf - diff --git a/src/testing/testing.c b/src/testing/testing.c index 98ac76fb7..043bdd7d2 100644 --- a/src/testing/testing.c +++ b/src/testing/testing.c @@ -204,11 +204,6 @@ struct GNUNET_TESTING_Peer */ struct GNUNET_ARM_Handle *ah; - /** - * Handle to ARM monitoring - */ - struct GNUNET_ARM_MonitorHandle *mh; - /** * The config of the peer */ @@ -1518,8 +1513,6 @@ GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer) GNUNET_TESTING_peer_stop (peer); if (NULL != peer->ah) GNUNET_ARM_disconnect (peer->ah); - if (NULL != peer->mh) - GNUNET_ARM_monitor_stop (peer->mh); GNUNET_free (peer->cfgfile); if (NULL != peer->cfg) GNUNET_CONFIGURATION_destroy (peer->cfg); -- cgit v1.2.3