donau

commit e8dcc2f7c60c6e0fc734810b1d675c86f72132b5
parent 25795286fb6b6a90c7920eabc189002f9b9e9327
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue,  9 Jan 2024 12:22:08 +0100

build system fixes

Diffstat:
M
src/testing/Makefile.am
 | 
14
+++++++++++++-
M
src/testing/test_api_cmd_get_donau.c
 | 
42
+++++++++++++++++++++---------------------

2 files changed, 34 insertions(+), 22 deletions(-)
diff --git 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
@@ -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 = {