adapt to latest change in GNUnet

10 files changed, 9 insertions, 29 deletions

diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 42408ad58..957f028d9 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -194,7 +194,6 @@ test_auditor_api_cs_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -211,7 +210,6 @@ test_auditor_api_rsa_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -225,7 +223,6 @@ test_auditor_api_version_LDADD = \
   $(top_builddir)/src/lib/libtalerauditor.la \
   $(LIBGCRYPT_LIBS) \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -260,7 +257,6 @@ test_exchange_api_cs_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -277,7 +273,6 @@ test_exchange_api_rsa_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -294,7 +289,6 @@ test_exchange_api_age_restriction_cs_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -311,7 +305,6 @@ test_exchange_api_age_restriction_rsa_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -328,7 +321,6 @@ test_exchange_p2p_cs_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -345,7 +337,6 @@ test_exchange_p2p_rsa_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/extensions/libtalerextensions.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -361,7 +352,6 @@ test_exchange_api_keys_cherry_picking_cs_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -376,7 +366,6 @@ test_exchange_api_keys_cherry_picking_rsa_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -392,7 +381,6 @@ test_exchange_api_revocation_cs_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -408,7 +396,6 @@ test_exchange_api_revocation_rsa_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -424,7 +411,6 @@ test_exchange_api_overlapping_keys_bug_cs_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -439,7 +425,6 @@ test_exchange_api_overlapping_keys_bug_rsa_LDADD = \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
-  -lgnunettesting \
   -lgnunetcurl \
   -lgnunetutil \
   -ljansson \
@@ -451,7 +436,6 @@ test_exchange_management_api_cs_LDADD = \
   libtalertesting.la \
   $(top_builddir)/src/lib/libtalerexchange.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetutil \
   $(XLIB)
 
@@ -461,7 +445,6 @@ test_exchange_management_api_rsa_LDADD = \
   libtalertesting.la \
   $(top_builddir)/src/lib/libtalerexchange.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetutil \
   $(XLIB)
 
@@ -510,7 +493,6 @@ test_exchange_api_twisted_cs_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
@@ -528,7 +510,6 @@ test_exchange_api_twisted_rsa_LDADD = \
   $(top_builddir)/src/bank-lib/libtalerbank.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
-  -lgnunettesting \
   -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
@@ -544,7 +525,6 @@ test_bank_api_with_fakebank_twisted_LDADD = \
   $(top_builddir)/src/lib/libtalerexchange.la \
   $(top_builddir)/src/json/libtalerjson.la \
   libtalertwistertesting.la \
-  -lgnunettesting \
   -lgnunetjson \
   -lgnunetcurl \
   -lgnunetutil \
diff --git a/src/testing/test_auditor_api.c b/src/testing/test_auditor_api.c
index a9c53d399..8c45f732f 100644
--- a/src/testing/test_auditor_api.c
+++ b/src/testing/test_auditor_api.c
@@ -700,7 +700,7 @@ main (int argc,
   {
     char *cipher;
 
-    cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
     GNUNET_assert (NULL != cipher);
     GNUNET_asprintf (&config_file,
                      "test_auditor_api-%s.conf",
diff --git a/src/testing/test_exchange_api.c b/src/testing/test_exchange_api.c
index 66cb244a1..41b8301a3 100644
--- a/src/testing/test_exchange_api.c
+++ b/src/testing/test_exchange_api.c
@@ -1269,7 +1269,7 @@ main (int argc,
   {
     char *cipher;
 
-    cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
     GNUNET_assert (NULL != cipher);
     uses_cs = (0 == strcmp (cipher,
                             "cs"));
diff --git a/src/testing/test_exchange_api_age_restriction.c b/src/testing/test_exchange_api_age_restriction.c
index 940845e1c..90d35ebc3 100644
--- a/src/testing/test_exchange_api_age_restriction.c
+++ b/src/testing/test_exchange_api_age_restriction.c
@@ -347,7 +347,7 @@ main (int argc,
   {
     char *cipher;
 
-    cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
     GNUNET_assert (NULL != cipher);
     uses_cs = (0 == strcmp (cipher,
                             "cs"));
diff --git a/src/testing/test_exchange_api_keys_cherry_picking.c b/src/testing/test_exchange_api_keys_cherry_picking.c
index 02311db2b..2919ea8d5 100644
--- a/src/testing/test_exchange_api_keys_cherry_picking.c
+++ b/src/testing/test_exchange_api_keys_cherry_picking.c
@@ -97,7 +97,7 @@ main (int argc,
   {
     char *cipher;
 
-    cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
     GNUNET_assert (NULL != cipher);
     GNUNET_asprintf (&config_file,
                      "test_exchange_api_keys_cherry_picking-%s.conf",
diff --git a/src/testing/test_exchange_api_overlapping_keys_bug.c b/src/testing/test_exchange_api_overlapping_keys_bug.c
index e88cc2c33..33b547a37 100644
--- a/src/testing/test_exchange_api_overlapping_keys_bug.c
+++ b/src/testing/test_exchange_api_overlapping_keys_bug.c
@@ -99,7 +99,7 @@ main (int argc,
   {
     char *cipher;
 
-    cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
     GNUNET_assert (NULL != cipher);
     GNUNET_asprintf (&config_file,
                      "test_exchange_api_keys_cherry_picking-%s.conf",
diff --git a/src/testing/test_exchange_api_revocation.c b/src/testing/test_exchange_api_revocation.c
index 59f4e3ff0..92e36a30a 100644
--- a/src/testing/test_exchange_api_revocation.c
+++ b/src/testing/test_exchange_api_revocation.c
@@ -251,7 +251,7 @@ main (int argc,
   {
     char *cipher;
 
-    cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
     GNUNET_assert (NULL != cipher);
     GNUNET_asprintf (&config_file,
                      "test_exchange_api-%s.conf",
diff --git a/src/testing/test_exchange_api_twisted.c b/src/testing/test_exchange_api_twisted.c
index c55b3f2ba..75ffe1f15 100644
--- a/src/testing/test_exchange_api_twisted.c
+++ b/src/testing/test_exchange_api_twisted.c
@@ -303,7 +303,7 @@ main (int argc,
   {
     char *cipher;
 
-    cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
     GNUNET_assert (NULL != cipher);
     GNUNET_asprintf (&config_file,
                      "test_exchange_api_twisted-%s.conf",
diff --git a/src/testing/test_exchange_management_api.c b/src/testing/test_exchange_management_api.c
index c92d4c220..7cce61b55 100644
--- a/src/testing/test_exchange_management_api.c
+++ b/src/testing/test_exchange_management_api.c
@@ -173,7 +173,7 @@ main (int argc,
   {
     char *cipher;
 
-    cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
     GNUNET_assert (NULL != cipher);
     GNUNET_asprintf (&config_file,
                      "test_exchange_api-%s.conf",
diff --git a/src/testing/test_exchange_p2p.c b/src/testing/test_exchange_p2p.c
index 636dffe22..2fd7dfb29 100644
--- a/src/testing/test_exchange_p2p.c
+++ b/src/testing/test_exchange_p2p.c
@@ -535,7 +535,7 @@ main (int argc,
   {
     char *cipher;
 
-    cipher = GNUNET_TESTING_get_testname_from_underscore (argv[0]);
+    cipher = GNUNET_STRINGS_get_suffix_from_binary_name (argv[0]);
     GNUNET_assert (NULL != cipher);
     uses_cs = (0 == strcmp (cipher, "cs"));
     GNUNET_asprintf (&config_file,