[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-donau] branch master updated: build system fixes
From: |
gnunet |
Subject: |
[taler-donau] branch master updated: build system fixes |
Date: |
Tue, 09 Jan 2024 12:22:11 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository donau.
The following commit(s) were added to refs/heads/master by this push:
new e8dcc2f build system fixes
e8dcc2f is described below
commit e8dcc2f7c60c6e0fc734810b1d675c86f72132b5
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Jan 9 12:22:08 2024 +0100
build system fixes
---
contrib/gana | 2 +-
src/testing/Makefile.am | 14 +++++++++++-
src/testing/test_api_cmd_get_donau.c | 42 ++++++++++++++++++------------------
3 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/contrib/gana b/contrib/gana
index 40f6cf1..6d3fb42 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 40f6cf1015231663064eda98aa1e403cddd7b970
+Subproject commit 6d3fb428f0a2dd5bc5f35516ea77c32c2cf0ecfa
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 128778d..92bafb9 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -25,6 +25,18 @@ libdonautesting_la_LDFLAGS = \
libdonautesting_la_SOURCES = \
testing_api_cmd_get_donau.c
+
+AM_TESTS_ENVIRONMENT=export DONAU_PREFIX=$${DONAU_PREFIX:-@libdir@};export
PATH=$${DONAU_PREFIX:-@prefix@}/bin:$$PATH;
+
+.NOTPARALLEL:
+check_PROGRAMS = \
+ test_donau_api_cs \
+ test_donau_api_rsa
+
+
+TESTS = \
+ $(check_PROGRAMS)
+
test_donau_api_cs_SOURCES = \
test_donau_api.c
test_donau_api_cs_LDADD = \
@@ -51,7 +63,7 @@ test_donau_api_rsa_LDADD = \
-ljansson \
$(XLIB)
- EXTRA_DIST = \
+EXTRA_DIST = \
$(bin_SCRIPTS) \
coins-cs.conf \
coins-rsa.conf \
diff --git a/src/testing/test_api_cmd_get_donau.c
b/src/testing/test_api_cmd_get_donau.c
index e70a765..7d53f1d 100644
--- a/src/testing/test_api_cmd_get_donau.c
+++ b/src/testing/test_api_cmd_get_donau.c
@@ -58,12 +58,12 @@ struct GetDonauState
* Label of a command to use to obtain existing
* keys.
*/
- //const char *last_keys_ref;
+ // const char *last_keys_ref;
/**
* Last denomination date we received when doing this request.
*/
- //struct GNUNET_TIME_Timestamp my_denom_date;
+ // struct GNUNET_TIME_Timestamp my_denom_date;
/**
* Are we waiting for /keys before continuing?
@@ -99,7 +99,7 @@ cert_cb (void *cls,
TALER_TESTING_interpreter_next (is);
return;
}
- //ges->my_denom_date = kr->details.ok.keys->last_denom_issue_date;
+ // ges->my_denom_date = kr->details.ok.keys->last_denom_issue_date;
return;
default:
GNUNET_break (0);
@@ -126,11 +126,11 @@ cert_cb (void *cls,
*/
static void
get_donau_run (void *cls,
- const struct TALER_TESTING_Command *cmd,
- struct TALER_TESTING_Interpreter *is)
+ const struct TALER_TESTING_Command *cmd,
+ struct TALER_TESTING_Interpreter *is)
{
struct GetDonauState *ges = cls;
- //struct DONAU_Keys *xkeys = NULL;
+ // struct DONAU_Keys *xkeys = NULL;
(void) cmd;
if (NULL == ges->donau_url)
@@ -209,11 +209,11 @@ get_donau_run (void *cls,
ges->is = is;
ges->donau
= DONAU_get_keys (TALER_TESTING_interpreter_get_context (is),
- ges->donau_url,
- //xkeys,
- &cert_cb,
- ges);
- //DONAU_keys_decref (xkeys);
+ ges->donau_url,
+ // xkeys,
+ &cert_cb,
+ ges);
+ // DONAU_keys_decref (xkeys);
if (NULL == ges->donau)
{
GNUNET_break (0);
@@ -233,7 +233,7 @@ get_donau_run (void *cls,
*/
static void
get_donau_cleanup (void *cls,
- const struct TALER_TESTING_Command *cmd)
+ const struct TALER_TESTING_Command *cmd)
{
struct GetDonauState *ges = cls;
@@ -260,20 +260,20 @@ get_donau_cleanup (void *cls,
*/
static enum GNUNET_GenericReturnValue
get_donau_traits (void *cls,
- const void **ret,
- const char *trait,
- unsigned int index)
+ const void **ret,
+ const char *trait,
+ unsigned int index)
{
struct GetDonauState *ges = cls;
- //unsigned int off = (NULL == ges->master_priv_file) ? 1 : 0;
+ // unsigned int off = (NULL == ges->master_priv_file) ? 1 : 0;
unsigned int off = 1;
if (NULL != ges->keys)
{
struct TALER_TESTING_Trait traits[] = {
- TALER_TESTING_make_trait_keys (ges->keys),
+ // TALER_TESTING_make_trait_donau_keys (ges->keys),
TALER_TESTING_make_trait_exchange_url (ges->donau_url),
- //TALER_TESTING_make_trait_timestamp (0,
+ // TALER_TESTING_make_trait_timestamp (0,
// &ges->my_denom_date),
TALER_TESTING_trait_end ()
};
@@ -287,7 +287,7 @@ get_donau_traits (void *cls,
{
struct TALER_TESTING_Trait traits[] = {
TALER_TESTING_make_trait_exchange_url (ges->donau_url),
- //TALER_TESTING_make_trait_timestamp (0,
+ // TALER_TESTING_make_trait_timestamp (0,
// &ges->my_denom_date),
TALER_TESTING_trait_end ()
};
@@ -331,7 +331,7 @@ struct TALER_TESTING_Command
TALER_TESTING_cmd_get_donau (
const char *label,
const struct GNUNET_CONFIGURATION_Handle *cfg,
- //const char *last_keys_ref,
+ // const char *last_keys_ref,
bool wait_for_keys,
bool load_private_key)
{
@@ -339,7 +339,7 @@ TALER_TESTING_cmd_get_donau (
ges = GNUNET_new (struct GetDonauState);
ges->donau_url = get_donau_base_url (cfg);
- //ges->last_keys_ref = last_keys_ref;
+ // ges->last_keys_ref = last_keys_ref;
ges->wait_for_keys = wait_for_keys;
{
struct TALER_TESTING_Command cmd = {
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-donau] branch master updated: build system fixes,
gnunet <=