summaryrefslogtreecommitdiff
path: root/src/lib/Makefile.am
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2018-03-02 15:12:51 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2018-03-17 01:33:11 +0100
commit37dbd24660e3d64a56e702fe6143503159f58a58 (patch)
treeca2b40696cd100bdc345aaa9d9debe00dab26466 /src/lib/Makefile.am
parent6f5656ae5afbeadfc8cccd29ddab65c8f07d4db9 (diff)
downloadmerchant-37dbd24660e3d64a56e702fe6143503159f58a58.tar.gz
merchant-37dbd24660e3d64a56e702fe6143503159f58a58.tar.bz2
merchant-37dbd24660e3d64a56e702fe6143503159f58a58.zip
re-enable twisted tests
Diffstat (limited to 'src/lib/Makefile.am')
-rw-r--r--src/lib/Makefile.am41
1 files changed, 20 insertions, 21 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 4419e672..3fc6ba65 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