[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-exchange] branch master updated (a7a34f6 -> 880ce0b)
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-exchange] branch master updated (a7a34f6 -> 880ce0b) |
Date: |
Wed, 25 Jul 2018 16:19:54 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a change to branch master
in repository exchange.
from a7a34f6 Undo saving auditor blob under /tmp.
new 6eaa415 Benchmark.
new 880ce0b Remove old note.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/benchmark/example.conf | 2 --
src/benchmark/taler-exchange-benchmark.c | 28 +++++++++++++++++++++++++---
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/benchmark/example.conf b/src/benchmark/example.conf
index 2a10b1f..fba749f 100644
--- a/src/benchmark/example.conf
+++ b/src/benchmark/example.conf
@@ -28,8 +28,6 @@ config = postgres:///talercheck
[account-1]
url = payto://x-taler-bank/localhost:8080/2
-# NOTE: the user should run `taler-exchange-wire' _before_
-# running the benchmark in order to get this JSON defined.
wire_response = ${TALER_TEST_HOME}/exchange/account-benchmark-2.json
plugin = taler_bank
taler_bank_auth_method = basic
diff --git a/src/benchmark/taler-exchange-benchmark.c
b/src/benchmark/taler-exchange-benchmark.c
index bfeb6f7..96a9a74 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -320,6 +320,7 @@ int
main (int argc,
char *const *argv)
{
+ struct GNUNET_OS_Process *compute_wire_response;
struct GNUNET_CONFIGURATION_Handle *cfg;
struct GNUNET_GETOPT_CommandLineOption options[] = {
@@ -408,9 +409,30 @@ main (int argc,
return MISSING_BANK_URL;
}
- GNUNET_assert (GNUNET_OK == TALER_TESTING_prepare_exchange
- (cfg_filename,
- &exchange_url)); // never used, we do all via handle.
+ compute_wire_response = GNUNET_OS_start_process
+ (GNUNET_NO,
+ GNUNET_OS_INHERIT_STD_ALL,
+ NULL, NULL, NULL,
+ "taler-exchange-wire",
+ "taler-exchange-wire",
+ "-c", cfg_filename,
+ NULL);
+ if (NULL == compute_wire_response)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Failed to run `taler-exchange-wire`,"
+ " is your PATH correct?\n");
+ return GNUNET_NO;
+ }
+ GNUNET_OS_process_wait
+ (compute_wire_response);
+ GNUNET_OS_process_destroy
+ (compute_wire_response);
+
+ GNUNET_assert
+ (GNUNET_OK == TALER_TESTING_prepare_exchange
+ (cfg_filename,
+ &exchange_url)); // never used, we do all via handle.
result = TALER_TESTING_setup_with_exchange
(run,
NULL,
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-exchange] branch master updated (a7a34f6 -> 880ce0b),
gnunet <=