From a497ccffb607c7ac4e6461693630d2d673afff73 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 15 Jul 2019 20:55:11 +0200 Subject: integrate test for #5777 into build, expected to fail for now --- src/lib/Makefile.am | 19 +++++++++++++++++++ src/lib/test_exchange_api.c | 8 ++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index c6a1e241c..71301e58d 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -160,6 +160,7 @@ check_PROGRAMS = \ test_exchange_api_keys_cherry_picking \ test_exchange_api_overlapping_keys_bug \ test_exchange_api \ + test_exchange_api_revocation \ test_auditor_api_version \ test_auditor_api @@ -190,6 +191,10 @@ AM_TESTS_ENVIRONMENT=export TALER_PREFIX=$${TALER_PREFIX:-@libdir@};export PATH= TESTS = \ $(check_PROGRAMS) +# expected to fail for now: test incomplete, feature not implemented! +XFAIL_TESTS = \ + test_exchange_api_revocation + test_exchange_api_SOURCES = \ test_exchange_api.c test_exchange_api_LDADD = \ @@ -204,6 +209,20 @@ test_exchange_api_LDADD = \ -lgnunetutil \ -ljansson +test_exchange_api_revocation_SOURCES = \ + test_exchange_api_revocation.c +test_exchange_api_revocation_LDADD = \ + libtalertesting.la \ + libtalerexchange.la \ + $(LIBGCRYPT_LIBS) \ + $(top_builddir)/src/bank-lib/libtalerfakebank.la \ + $(top_builddir)/src/bank-lib/libtalerbank.la \ + $(top_builddir)/src/json/libtalerjson.la \ + $(top_builddir)/src/util/libtalerutil.la \ + -lgnunetcurl \ + -lgnunetutil \ + -ljansson + test_exchange_api_overlapping_keys_bug_SOURCES = \ test_exchange_api_overlapping_keys_bug.c test_exchange_api_overlapping_keys_bug_LDADD = \ diff --git a/src/lib/test_exchange_api.c b/src/lib/test_exchange_api.c index 66314b7ce..e317f7a7d 100644 --- a/src/lib/test_exchange_api.c +++ b/src/lib/test_exchange_api.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014-2018 Taler Systems SA + Copyright (C) 2014--2019 Taler Systems SA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -958,7 +958,7 @@ main (int argc, /* These environment variables get in the way... */ unsetenv ("XDG_DATA_HOME"); unsetenv ("XDG_CONFIG_HOME"); - GNUNET_log_setup ("test-exchange-api-new", + GNUNET_log_setup ("test-exchange-api", "INFO", NULL); if (NULL == (fakebank_url @@ -973,7 +973,7 @@ main (int argc, * if it's available. */ switch (TALER_TESTING_prepare_exchange (CONFIG_FILE, &auditor_url, - &exchange_url)) + &exchange_url)) { case GNUNET_SYSERR: GNUNET_break (0); @@ -998,4 +998,4 @@ main (int argc, return 0; } -/* end of test_exchange_api_new.c */ +/* end of test_exchange_api.c */ -- cgit v1.2.3