[GNUnet-SVN] [taler-merchant] 01/22: re-enable twisted tests

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository merchant.

commit 37dbd24660e3d64a56e702fe6143503159f58a58
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Mar 2 15:12:51 2018 +0100

    re-enable twisted tests
---
 src/lib/Makefile.am | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 4419e67..3fc6ba6 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -75,34 +75,33 @@ endif
 
 if HAVE_TALERFAKEBANK
 check_PROGRAMS = \
+  test_merchant_api_twisted \
   test_merchant_api_new \
   test_merchant_api
-  # test_merchant_api_twisted
 endif
 
 TESTS = \
   $(check_PROGRAMS)
 
-# To be uncommented once the twister is deployed.
-#test_merchant_api_twisted_SOURCES = \
-#  test_merchant_api_twisted.c
-#test_merchant_api_twisted_LDADD = \
-#  $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
-#  libtalermerchant.la \
-#  $(LIBGCRYPT_LIBS) \
-#  -ltalertesting \
-#  -ltalermerchanttesting \
-#  -ltalertwistertesting \
-#  -ltalerfakebank \
-#  -ltalerbank \
-#  -ltalerexchange \
-#  -ltalerjson \
-#  -ltalerutil \
-#  -lgnunetjson \
-#  -lgnunetcurl \
-#  -lgnunetutil \
-#  -ljansson \
-#  -ltalertwister
+test_merchant_api_twisted_SOURCES = \
+  test_merchant_api_twisted.c
+test_merchant_api_twisted_LDADD = \
+  $(top_srcdir)/src/backenddb/libtalermerchantdb.la \
+  libtalermerchant.la \
+  $(LIBGCRYPT_LIBS) \
+  -ltalertesting \
+  -ltalermerchanttesting \
+  -ltalertwistertesting \
+  -ltalerfakebank \
+  -ltalerbank \
+  -ltalerexchange \
+  -ltalerjson \
+  -ltalerutil \
+  -lgnunetjson \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson \
+  -ltalertwister
 
 test_merchant_api_new_SOURCES = \
   test_merchant_api_new.c

-- 
To stop receiving notification emails like this one, please contact
address@hidden