summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------contrib/gana0
-rwxr-xr-xsrc/auditor/generate-auditor-basedb.sh20
-rwxr-xr-xsrc/auditor/test-auditor.sh9
-rwxr-xr-xsrc/auditor/test-revocation.sh9
4 files changed, 25 insertions, 13 deletions
diff --git a/contrib/gana b/contrib/gana
-Subproject 18a39c29726860af58800a28454446154b89832
+Subproject 0b778cdac372d0b75f3b64501a15a21c9c57f36
diff --git a/src/auditor/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh
index 5b4f21fe..8678c6ca 100755
--- a/src/auditor/generate-auditor-basedb.sh
+++ b/src/auditor/generate-auditor-basedb.sh
@@ -15,8 +15,19 @@
#
set -eu
+# Cleanup to run whenever we exit
+function cleanup()
+{
+ for n in `jobs -p`
+ do
+ kill $n 2> /dev/null || true
+ done
+ wait
+}
+
+# Install cleanup handler (except for kill -9)
+trap cleanup EXIT
-trap "kill `jobs -p` &> /dev/null || true" ERR
# Exit, with status code "skip" (no 'real' failure)
function exit_skip() {
@@ -32,6 +43,8 @@ BASEDB=${1:-"auditor-basedb"}
# elsewhere
TARGET_DB=taler-auditor-basedb
+WALLET_DB=${BASEDB:-"wallet"}.wdb
+
# Configuration file will be edited, so we create one
# from the template.
CONF=generate-auditor-basedb-prod.conf
@@ -122,8 +135,6 @@ done
if [ 1 != $OK ]
then
- kill `jobs -p`
- wait
exit_skip "Failed to launch services"
fi
echo " DONE"
@@ -148,8 +159,7 @@ taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'runIntegrationTest' \
echo "Shutting down services"
-kill `jobs -p`
-wait
+cleanup
# Dump database
echo "Dumping database"
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index e7cdaa16..db8e73a7 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -42,7 +42,10 @@ function exit_fail() {
# Cleanup to run whenever we exit
function cleanup()
{
- kill `jobs -p` >/dev/null 2>/dev/null || true
+ for n in `jobs -p`
+ do
+ kill $n 2> /dev/null || true
+ done
wait
}
@@ -118,9 +121,7 @@ function audit_only () {
function post_audit () {
taler-exchange-dbinit -g || exit_fail "exchange DB GC failed"
- kill -TERM `jobs -p` >/dev/null 2>/dev/null || true
- echo -n "Waiting for servers to die ..."
- wait
+ cleanup
echo "DONE"
echo -n "TeXing ."
taler-helper-auditor-render.py test-audit-aggregation.json test-audit-coins.json test-audit-deposits.json test-audit-reserves.json test-audit-wire.json < ../../contrib/auditor-report.tex.j2 > test-report.tex || exit_fail "Renderer failed"
diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh
index ac1f4dcc..a65ba196 100755
--- a/src/auditor/test-revocation.sh
+++ b/src/auditor/test-revocation.sh
@@ -42,7 +42,10 @@ function exit_fail() {
# Cleanup to run whenever we exit
function cleanup()
{
- kill `jobs -p` >/dev/null 2>/dev/null || true
+ for n in `jobs -p`
+ do
+ kill $n 2> /dev/null || true
+ done
wait
}
@@ -117,9 +120,7 @@ function audit_only () {
# Cleanup to run after the auditor
function post_audit () {
- kill -TERM `jobs -p` >/dev/null 2>/dev/null || true
- echo -n "Waiting for servers to die ..."
- wait
+ cleanup
echo "DONE"
echo -n "TeXing ."
taler-helper-auditor-render.py test-audit-aggregation.json test-audit-coins.json test-audit-deposits.json test-audit-reserves.json test-audit-wire.json < ../../contrib/auditor-report.tex.j2 > test-report.tex || exit_fail "Renderer failed"