[GNUnet-SVN] [taler-exchange] branch master updated (efd65a63 -> 9316f63b)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository exchange.

    from efd65a63 fix preflight check failure
     new aa360e0c remove automatically generated file that always changes
     new 9316f63b exchange benchmark: add option to linger around after we're 
done

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:
 .../exchange_benchmark_home/.config/taler/account-2.json |  5 -----
 src/benchmark/taler-exchange-benchmark.c                 | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)
 delete mode 100644 
src/benchmark/exchange_benchmark_home/.config/taler/account-2.json

diff --git a/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json 
b/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json
deleted file mode 100644
index efb03f1e..00000000
--- a/src/benchmark/exchange_benchmark_home/.config/taler/account-2.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "url": "payto://x-taler-bank/localhost:8082/2",
-  "salt": 
"1M9Y2209M4MW3H482DVSW2E1CP7DTVHX0PP5J2NDHSZFFX33WNXT20EPWD8KV0NTN2X37RMK5CJYE0C7Y45PE8K8RQQB4YNHEPYR0JR",
-  "master_sig": 
"D9MXRSRF3HFSRJ0W0AS99VWK6SSRJKEQ94MKCZY454NS9F20N8T9J3VMMTRSVCHTYEGB04BJRQTYAA6H4QCER569V2W8JF6E9EDFT0R"
-}
\ No newline at end of file
diff --git a/src/benchmark/taler-exchange-benchmark.c 
b/src/benchmark/taler-exchange-benchmark.c
index 26163d12..c4925546 100644
--- a/src/benchmark/taler-exchange-benchmark.c
+++ b/src/benchmark/taler-exchange-benchmark.c
@@ -198,6 +198,12 @@ static char *remote_host;
  */
 static char *remote_dir;
 
+/**
+ * Don't kill exchange/fakebank/wirewatch until
+ * requested by the user explicitly.
+ */
+static int linger;
+
 
 /**
  * Decide which exchange account is going to be
@@ -735,6 +741,12 @@ parallel_benchmark (TALER_TESTING_Main main_cb,
   if (MODE_EXCHANGE == mode)
     getchar ();
 
+  if ( (GNUNET_YES == linger) && ( (mode == MODE_BOTH || mode == MODE_CLIENT ) 
) )
+  {
+    printf("press ENTER to stop\n");
+    getchar ();
+  }
+
   if (MODE_CLIENT == mode)
   {
     GNUNET_assert (NULL != exchange_slave);
@@ -828,6 +840,10 @@ main (int argc,
                                  "LF",
                                  "will log to file LF",
                                  &logfile),
+    GNUNET_GETOPT_option_flag ('K',
+                               "linger",
+                               "linger around until key press",
+                               &linger),
     GNUNET_GETOPT_OPTION_END
   };
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden