gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-merchant] 01/08: twisted skeleton.


From: gnunet
Subject: [GNUnet-SVN] [taler-merchant] 01/08: twisted skeleton.
Date: Fri, 02 Mar 2018 15:02:14 +0100

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

marcello pushed a commit to branch master
in repository merchant.

commit de095f33de1b110c0c8ae48f271e3b7d2589e063
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Feb 28 15:16:00 2018 +0100

    twisted skeleton.
---
 src/include/taler_merchant_testing_lib.h              |  8 --------
 src/lib/Makefile.am                                   | 19 +++++++++++++++++++
 src/lib/test_merchant_api_new.c                       |  6 ++----
 ...merchant_api_new.c => test_merchant_api_twisted.c} |  6 ++----
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/include/taler_merchant_testing_lib.h 
b/src/include/taler_merchant_testing_lib.h
index 53f0469..3a34690 100644
--- a/src/include/taler_merchant_testing_lib.h
+++ b/src/include/taler_merchant_testing_lib.h
@@ -39,14 +39,6 @@
 #define CMD_NOT_FOUND "Command not found"
 #define TRAIT_NOT_FOUND "Trait not found"
 
-#define TALER_TESTING_FAIL(is) \
-  do \
-  {\
-    GNUNET_break (0); \
-    TALER_TESTING_interpreter_fail (is); \
-    return; \
-  } while (0)
-
 /**
  * Prepare the merchant execution.  Create tables and check if
  * the port is available.
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 93f154b..fe600c3 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -75,6 +75,7 @@ endif
 
 if HAVE_TALERFAKEBANK
 check_PROGRAMS = \
+  test_merchant_api_twisted \
   test_merchant_api_new \
   test_merchant_api
 endif
@@ -82,6 +83,24 @@ endif
 TESTS = \
   $(check_PROGRAMS)
 
+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 \
+  -ltalerfakebank \
+  -ltalerbank \
+  -ltalerexchange \
+  -ltalerjson \
+  -ltalerutil \
+  -lgnunetjson \
+  -lgnunetcurl \
+  -lgnunetutil \
+  -ljansson
+
 test_merchant_api_new_SOURCES = \
   test_merchant_api_new.c
 test_merchant_api_new_LDADD = \
diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
index 8615d6a..e9685f3 100644
--- a/src/lib/test_merchant_api_new.c
+++ b/src/lib/test_merchant_api_new.c
@@ -648,13 +648,11 @@ main (int argc,
                     NULL);
 
   if (NULL ==
-     (fakebank_url = TALER_TESTING_prepare_fakebank (
-       CONFIG_FILE)))
+    (fakebank_url = TALER_TESTING_prepare_fakebank (CONFIG_FILE)))
     return 77;
 
   if (NULL ==
-     (merchant_url = TALER_TESTING_prepare_merchant (
-       CONFIG_FILE)))
+    (merchant_url = TALER_TESTING_prepare_merchant (CONFIG_FILE)))
     return 77;
 
   TALER_TESTING_cleanup_files (CONFIG_FILE);
diff --git a/src/lib/test_merchant_api_new.c 
b/src/lib/test_merchant_api_twisted.c
similarity index 99%
copy from src/lib/test_merchant_api_new.c
copy to src/lib/test_merchant_api_twisted.c
index 8615d6a..e9685f3 100644
--- a/src/lib/test_merchant_api_new.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -648,13 +648,11 @@ main (int argc,
                     NULL);
 
   if (NULL ==
-     (fakebank_url = TALER_TESTING_prepare_fakebank (
-       CONFIG_FILE)))
+    (fakebank_url = TALER_TESTING_prepare_fakebank (CONFIG_FILE)))
     return 77;
 
   if (NULL ==
-     (merchant_url = TALER_TESTING_prepare_merchant (
-       CONFIG_FILE)))
+    (merchant_url = TALER_TESTING_prepare_merchant (CONFIG_FILE)))
     return 77;
 
   TALER_TESTING_cleanup_files (CONFIG_FILE);

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]