diff options
-rw-r--r-- | src/testing/Makefile.am | 11 | ||||
-rw-r--r-- | src/testing/testing.c | 7 |
2 files changed, 5 insertions, 13 deletions
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 = \ | |||
16 | testing.conf | 16 | testing.conf |
17 | 17 | ||
18 | lib_LTLIBRARIES = \ | 18 | lib_LTLIBRARIES = \ |
19 | libgnunettesting.la | 19 | libgnunettesting.la |
20 | 20 | ||
21 | libgnunettesting_la_SOURCES = \ | 21 | libgnunettesting_la_SOURCES = \ |
22 | testing.c | 22 | testing.c |
23 | libgnunettesting_la_LIBADD = \ | 23 | libgnunettesting_la_LIBADD = \ |
24 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
25 | $(top_builddir)/src/arm/libgnunetarm.la \ | 24 | $(top_builddir)/src/arm/libgnunetarm.la \ |
25 | $(top_builddir)/src/util/libgnunetutil.la \ | ||
26 | $(LTLIBINTL) | 26 | $(LTLIBINTL) |
27 | libgnunettesting_la_LDFLAGS = \ | 27 | libgnunettesting_la_LDFLAGS = \ |
28 | $(GN_LIB_LDFLAGS) \ | 28 | $(GN_LIB_LDFLAGS) \ |
@@ -35,7 +35,7 @@ noinst_PROGRAMS = \ | |||
35 | list-keys | 35 | list-keys |
36 | 36 | ||
37 | gnunet_testing_SOURCES = \ | 37 | gnunet_testing_SOURCES = \ |
38 | gnunet-testing.c | 38 | gnunet-testing.c |
39 | gnunet_testing_LDADD = \ | 39 | gnunet_testing_LDADD = \ |
40 | libgnunettesting.la \ | 40 | libgnunettesting.la \ |
41 | $(top_builddir)/src/util/libgnunetutil.la \ | 41 | $(top_builddir)/src/util/libgnunetutil.la \ |
@@ -55,7 +55,7 @@ check_PROGRAMS = \ | |||
55 | test_testing_peerstartup2 \ | 55 | test_testing_peerstartup2 \ |
56 | test_testing_sharedservices | 56 | test_testing_sharedservices |
57 | 57 | ||
58 | if ENABLE_TEST_RUN | 58 | if ENABLE_TEST_RUN |
59 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; | 59 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; |
60 | TESTS = \ | 60 | TESTS = \ |
61 | test_testing_portreservation \ | 61 | test_testing_portreservation \ |
@@ -96,4 +96,3 @@ test_testing_sharedservices_LDADD = \ | |||
96 | 96 | ||
97 | EXTRA_DIST = \ | 97 | EXTRA_DIST = \ |
98 | test_testing_defaults.conf | 98 | test_testing_defaults.conf |
99 | |||
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 | |||
@@ -205,11 +205,6 @@ struct GNUNET_TESTING_Peer | |||
205 | struct GNUNET_ARM_Handle *ah; | 205 | struct GNUNET_ARM_Handle *ah; |
206 | 206 | ||
207 | /** | 207 | /** |
208 | * Handle to ARM monitoring | ||
209 | */ | ||
210 | struct GNUNET_ARM_MonitorHandle *mh; | ||
211 | |||
212 | /** | ||
213 | * The config of the peer | 208 | * The config of the peer |
214 | */ | 209 | */ |
215 | struct GNUNET_CONFIGURATION_Handle *cfg; | 210 | struct GNUNET_CONFIGURATION_Handle *cfg; |
@@ -1518,8 +1513,6 @@ GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer) | |||
1518 | GNUNET_TESTING_peer_stop (peer); | 1513 | GNUNET_TESTING_peer_stop (peer); |
1519 | if (NULL != peer->ah) | 1514 | if (NULL != peer->ah) |
1520 | GNUNET_ARM_disconnect (peer->ah); | 1515 | GNUNET_ARM_disconnect (peer->ah); |
1521 | if (NULL != peer->mh) | ||
1522 | GNUNET_ARM_monitor_stop (peer->mh); | ||
1523 | GNUNET_free (peer->cfgfile); | 1516 | GNUNET_free (peer->cfgfile); |
1524 | if (NULL != peer->cfg) | 1517 | if (NULL != peer->cfg) |
1525 | GNUNET_CONFIGURATION_destroy (peer->cfg); | 1518 | GNUNET_CONFIGURATION_destroy (peer->cfg); |