fix "twisted" test-suites.

4 files changed, 26 insertions, 22 deletions

diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am
index eae120cb8..084614b62 100644
--- a/src/bank-lib/Makefile.am
+++ b/src/bank-lib/Makefile.am
@@ -97,14 +97,12 @@ check_PROGRAMS += \
 test_bank_api_with_fakebank_twisted_SOURCES = \
   test_bank_api_with_fakebank_twisted.c
 test_bank_api_with_fakebank_twisted_LDADD = \
-  $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/exchange-lib/libtalertesting.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/bank-lib/libtalertesting.la \
-  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  libtalerbank.la \
+  libtalerbanktesting.la \
+  libtalerfakebank.la \
   $(top_builddir)/src/exchange-lib/libtalerexchange.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
   -ltalertwistertesting \
   -lgnunetjson \
   -lgnunetcurl \
@@ -115,21 +113,18 @@ endif
 test_bank_api_twisted_SOURCES = \
   test_bank_api_twisted.c
 test_bank_api_twisted_LDADD = \
-  $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/exchange-lib/libtalertesting.la \
-  $(top_builddir)/src/bank-lib/libtalerbank.la \
-  $(top_builddir)/src/bank-lib/libtalertesting.la \
-  $(top_builddir)/src/bank-lib/libtalerfakebank.la \
+  libtalerbank.la \
+  libtalerbanktesting.la \
+  libtalerfakebank.la \
   $(top_builddir)/src/exchange-lib/libtalerexchange.la \
   $(top_builddir)/src/json/libtalerjson.la \
-  $(top_builddir)/src/util/libtalerutil.la \
   -ltalertwistertesting \
   -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson
 
-
 TESTS = \
   $(check_PROGRAMS)
 
diff --git a/src/bank-lib/test_bank_api.c b/src/bank-lib/test_bank_api.c
index 2a1171918..f356b0a8d 100644
--- a/src/bank-lib/test_bank_api.c
+++ b/src/bank-lib/test_bank_api.c
@@ -2,20 +2,24 @@
   This file is part of TALER
   Copyright (C) 2016, 2017 GNUnet e.V.
 
-  TALER is free software; you can redistribute it and/or modify it under the
-  terms of the GNU General Public License as published by the Free Software
-  Foundation; either version 3, or (at your option) any later version.
+  TALER is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 3,
+  or (at your option) any later version.
 
-  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+  TALER is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty
+  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See
+  the GNU General Public License for more details.
 
-  You should have received a copy of the GNU General Public License along with
-  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
+  You should have received a copy of the GNU General Public
+  License along with TALER; see the file COPYING.  If not, see
+  <http://www.gnu.org/licenses/>
 */
 /**
  * @file bank/test_bank_api.c
- * @brief testcase to test bank's HTTP API interface against the "real" bank
+ * @brief testcase to test bank's HTTP API interface
+ * against the "real" bank
  * @author Christian Grothoff
  */
 #include "platform.h"
diff --git a/src/bank-lib/test_bank_api_twisted.c b/src/bank-lib/test_bank_api_twisted.c
index 55064b25a..f90b05725 100644
--- a/src/bank-lib/test_bank_api_twisted.c
+++ b/src/bank-lib/test_bank_api_twisted.c
@@ -121,6 +121,7 @@ main (int argc,
   /* These environment variables get in the way... */
   unsetenv ("XDG_DATA_HOME");
   unsetenv ("XDG_CONFIG_HOME");
+
   GNUNET_log_setup ("test-bank-api-twisted",
                     "DEBUG", NULL);
 
@@ -142,7 +143,8 @@ main (int argc,
   ret = TALER_TESTING_setup (&run,
                              NULL,
                              CONFIG_FILE,
-                             NULL);
+                             NULL,
+                             GNUNET_NO);
   purge_process (twisterd);
   purge_process (bankd);
   GNUNET_free (twister_url);
diff --git a/src/bank-lib/test_bank_api_with_fakebank_twisted.c b/src/bank-lib/test_bank_api_with_fakebank_twisted.c
index 4e491102b..88e9bc3b2 100644
--- a/src/bank-lib/test_bank_api_with_fakebank_twisted.c
+++ b/src/bank-lib/test_bank_api_with_fakebank_twisted.c
@@ -114,9 +114,11 @@ main (int argc,
       char * const *argv)
 {
   unsigned int ret;
+
   /* These environment variables get in the way... */
   unsetenv ("XDG_DATA_HOME");
   unsetenv ("XDG_CONFIG_HOME");
+
   GNUNET_log_setup ("test-bank-api-twisted",
                     "DEBUG", NULL);
 
@@ -135,7 +137,8 @@ main (int argc,
   ret = TALER_TESTING_setup (&run,
                              NULL,
                              CONFIG_FILE,
-                             NULL);
+                             NULL,
+                             GNUNET_NO);
   purge_process (twisterd);
   GNUNET_free (twister_url);
   GNUNET_free (fakebank_url);