[taler-merchant] branch master updated: fix setup termination

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new d4cbd450 fix setup termination
d4cbd450 is described below

commit d4cbd450a5eb55a33e753ff28e85debe8016577a
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Aug 23 21:53:31 2023 +0200

    fix setup termination
---
 src/testing/setup.sh                                                    | 2 +-
 .../taler/exchange-secmod-cs/keys/coin_eur_1/1692206204                 | 1 -
 .../taler/exchange-secmod-cs/keys/coin_eur_5/1692206204                 | 2 --
 .../taler/exchange-secmod-cs/keys/coin_eur_ct_1/1692206204              | 1 -
 .../taler/exchange-secmod-cs/keys/coin_eur_ct_10/1692206204             | 2 --
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/testing/setup.sh b/src/testing/setup.sh
index 4bf03a32..6d26168c 100755
--- a/src/testing/setup.sh
+++ b/src/testing/setup.sh
@@ -17,7 +17,7 @@ function exit_cleanup()
     then
         echo "Killing taler-unified-setup ($SETUP_PID)" >&2
         kill -TERM "$SETUP_PID" 2> /dev/null || true
-        wait
+        wait "$SETUP_PID" 2> /dev/null || true
     fi
 }
 
diff --git 
a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1692206204
 
b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1692206204
deleted file mode 100644
index 974b32ce..00000000
--- 
a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_1/1692206204
+++ /dev/null
@@ -1 +0,0 @@
-n�++�&������Z����J�͸O�n�?(
\ No newline at end of file
diff --git 
a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1692206204
 
b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1692206204
deleted file mode 100644
index 9f909422..00000000
--- 
a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_5/1692206204
+++ /dev/null
@@ -1,2 +0,0 @@
-�
-�5�
��>xv6{�N5��%giK?0?�T]�
diff --git 
a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1692206204
 
b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1692206204
deleted file mode 100644
index 8cf07020..00000000
--- 
a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_1/1692206204
+++ /dev/null
@@ -1 +0,0 @@
-Ƿ���!/�ϩ���6؀:xDz���#+�        ���
\ No newline at end of file
diff --git 
a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1692206204
 
b/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1692206204
deleted file mode 100644
index f97911a3..00000000
--- 
a/src/testing/test_merchant_api_home/taler/exchange-secmod-cs/keys/coin_eur_ct_10/1692206204
+++ /dev/null
@@ -1,2 +0,0 @@
-��Y����5�A]Tw
-=Ϭ���YKU�ɉ
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.