[GNUnet-SVN] r38057 - gnunet/src/testing

[gnunet]

Author: grothoff
Date: 2016-09-30 23:59:57 +0200 (Fri, 30 Sep 2016)
New Revision: 38057

Modified:
   gnunet/src/testing/Makefile.am
   gnunet/src/testing/testing.c
Log:
-eliminate dead code

Modified: gnunet/src/testing/Makefile.am
===================================================================
--- gnunet/src/testing/Makefile.am      2016-09-30 20:54:58 UTC (rev 38056)
+++ gnunet/src/testing/Makefile.am      2016-09-30 21:59:57 UTC (rev 38057)
@@ -16,13 +16,13 @@
   testing.conf
 
 lib_LTLIBRARIES = \
-  libgnunettesting.la 
+  libgnunettesting.la
 
 libgnunettesting_la_SOURCES = \
-  testing.c  
+  testing.c
 libgnunettesting_la_LIBADD = \
+ $(top_builddir)/src/arm/libgnunetarm.la \
  $(top_builddir)/src/util/libgnunetutil.la \
- $(top_builddir)/src/arm/libgnunetarm.la \
  $(LTLIBINTL)
 libgnunettesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
@@ -35,7 +35,7 @@
  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 @@
  test_testing_peerstartup2 \
  test_testing_sharedservices
 
-if ENABLE_TEST_RUN 
+if ENABLE_TEST_RUN
 AM_TESTS_ENVIRONMENT=export 
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export 
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;
 TESTS = \
  test_testing_portreservation \
@@ -96,4 +96,3 @@
 
 EXTRA_DIST = \
   test_testing_defaults.conf
-

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2016-09-30 20:54:58 UTC (rev 38056)
+++ gnunet/src/testing/testing.c        2016-09-30 21:59:57 UTC (rev 38057)
@@ -205,11 +205,6 @@
   struct GNUNET_ARM_Handle *ah;
 
   /**
-   * Handle to ARM monitoring
-   */
-  struct GNUNET_ARM_MonitorHandle *mh;
-
-  /**
    * The config of the peer
    */
   struct GNUNET_CONFIGURATION_Handle *cfg;
@@ -1518,8 +1513,6 @@
     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);