summaryrefslogtreecommitdiff
path: root/taler-build
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2019-05-22 17:13:17 +0200
committerMarcello Stanisci <stanisci.m@gmail.com>2019-05-22 17:13:17 +0200
commita82be2080f21815c1cd7f7050b09e21a49aa0c31 (patch)
tree8800792305de69fd83fc67364e4ce2114aa5aa1a /taler-build
parent3bb1d2060390dbc17a542f76c7c8974cc0b25b64 (diff)
downloaddeployment-a82be2080f21815c1cd7f7050b09e21a49aa0c31.tar.gz
deployment-a82be2080f21815c1cd7f7050b09e21a49aa0c31.tar.bz2
deployment-a82be2080f21815c1cd7f7050b09e21a49aa0c31.zip
grouping
Diffstat (limited to 'taler-build')
-rwxr-xr-xtaler-build/update_exchange.sh4
-rwxr-xr-xtaler-build/update_merchant.sh5
2 files changed, 4 insertions, 5 deletions
diff --git a/taler-build/update_exchange.sh b/taler-build/update_exchange.sh
index 8b219bc..d7e068f 100755
--- a/taler-build/update_exchange.sh
+++ b/taler-build/update_exchange.sh
@@ -40,7 +40,7 @@ TOP=$(pwd)
lcov -d $TOP -z
TALER_AUDITORDB_POSTGRES_CONFIG=$TALER_CHECKDB \
TALER_EXCHANGEDB_POSTGRES_CONFIG=$TALER_CHECKDB \
- TALER_BANK_ALTDB=$TALER_CHECKDB make check || cat_failed .; exit 1
+ TALER_BANK_ALTDB=$TALER_CHECKDB make check || (cat_failed .; exit 1)
lcov -d $TOP -c --no-external -o doc/coverage/coverage.info
lcov -r doc/coverage/coverage.info **/test_* -o doc/coverage/rcoverage.info
genhtml -o doc/coverage doc/coverage/rcoverage.info
@@ -49,5 +49,5 @@ else
echo "checkdb: $TALER_CHECKDB"
TALER_AUDITORDB_POSTGRES_CONFIG=$TALER_CHECKDB \
TALER_EXCHANGEDB_POSTGRES_CONFIG=$TALER_CHECKDB \
- TALER_BANK_ALTDB=$TALER_CHECKDB make check || cat_failed .; exit 1
+ TALER_BANK_ALTDB=$TALER_CHECKDB make check || (cat_failed .; exit 1)
fi
diff --git a/taler-build/update_merchant.sh b/taler-build/update_merchant.sh
index 260b200..b33f80f 100755
--- a/taler-build/update_merchant.sh
+++ b/taler-build/update_merchant.sh
@@ -38,7 +38,6 @@ fi
make
make install
-
TALER_CHECKDB=${TALER_CHECKDB:-postgres:///talercheck}
if test ${1:-notgiven} = "--coverage"; then
@@ -48,7 +47,7 @@ TOP=$(pwd)
TALER_MERCHANTDB_POSTGRES_CONFIG=$TALER_CHECKDB \
TALER_EXCHANGEDB_POSTGRES_CONFIG=$TALER_CHECKDB \
TALER_AUDITORDB_POSTGRES_CONFIG=$TALER_CHECKDB \
- make check || cat_failed .; exit 1
+ make check || (cat_failed .; exit 1)
lcov -d $TOP -c --no-external -o doc/coverage/coverage.info
lcov -r doc/coverage/coverage.info **/test_* -o doc/coverage/rcoverage.info
genhtml -o doc/coverage doc/coverage/rcoverage.info
@@ -57,5 +56,5 @@ else
TALER_MERCHANTDB_POSTGRES_CONFIG=$TALER_CHECKDB \
TALER_EXCHANGEDB_POSTGRES_CONFIG=$TALER_CHECKDB \
TALER_AUDITORDB_POSTGRES_CONFIG=$TALER_CHECKDB \
- make check || cat_failed .; exit 1
+ make check || (cat_failed .; exit 1)
fi