diff options
-rw-r--r-- | src/auditor/auditor-basedb.fees (renamed from src/benchmark/auditor-basedb.fees) | bin | 800 -> 800 bytes | |||
-rw-r--r-- | src/auditor/auditor-basedb.mpub (renamed from src/benchmark/auditor-basedb.mpub) | 0 | ||||
-rw-r--r-- | src/auditor/auditor-basedb.sql (renamed from src/benchmark/auditor-basedb.sql) | 0 | ||||
-rw-r--r-- | src/auditor/generate-auditor-basedb-template.conf (renamed from src/benchmark/generate-auditor-basedb-template.conf) | 0 | ||||
-rw-r--r-- | src/auditor/generate-auditor-basedb.conf (renamed from src/benchmark/generate-auditor-basedb.conf) | 0 | ||||
-rwxr-xr-x | src/auditor/generate-auditor-basedb.sh (renamed from src/benchmark/generate-auditor-basedb.sh) | 0 | ||||
-rwxr-xr-x | src/auditor/test-auditor.sh | 10 | ||||
-rw-r--r-- | src/benchmark/Makefile.am | 9 |
8 files changed, 10 insertions, 9 deletions
diff --git a/src/benchmark/auditor-basedb.fees b/src/auditor/auditor-basedb.fees Binary files differindex 6cbdd1c69..6cbdd1c69 100644 --- a/src/benchmark/auditor-basedb.fees +++ b/src/auditor/auditor-basedb.fees diff --git a/src/benchmark/auditor-basedb.mpub b/src/auditor/auditor-basedb.mpub index b9139b7de..b9139b7de 100644 --- a/src/benchmark/auditor-basedb.mpub +++ b/src/auditor/auditor-basedb.mpub diff --git a/src/benchmark/auditor-basedb.sql b/src/auditor/auditor-basedb.sql index ee4144e37..ee4144e37 100644 --- a/src/benchmark/auditor-basedb.sql +++ b/src/auditor/auditor-basedb.sql diff --git a/src/benchmark/generate-auditor-basedb-template.conf b/src/auditor/generate-auditor-basedb-template.conf index 1d18740c7..1d18740c7 100644 --- a/src/benchmark/generate-auditor-basedb-template.conf +++ b/src/auditor/generate-auditor-basedb-template.conf diff --git a/src/benchmark/generate-auditor-basedb.conf b/src/auditor/generate-auditor-basedb.conf index 8ff047522..8ff047522 100644 --- a/src/benchmark/generate-auditor-basedb.conf +++ b/src/auditor/generate-auditor-basedb.conf diff --git a/src/benchmark/generate-auditor-basedb.sh b/src/auditor/generate-auditor-basedb.sh index fafb6f03a..fafb6f03a 100755 --- a/src/benchmark/generate-auditor-basedb.sh +++ b/src/auditor/generate-auditor-basedb.sh diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh index f2a1aca56..7a7f0d29d 100755 --- a/src/auditor/test-auditor.sh +++ b/src/auditor/test-auditor.sh @@ -70,7 +70,13 @@ function audit_only () { echo -n "Running audit(s) ..." taler-auditor -r -c $CONF -m $MASTER_PUB > test-audit.json 2> test-audit.log || exit_fail "auditor failed" echo -n "." + # Also do incremental run + taler-auditor -c $CONF -m $MASTER_PUB > test-audit-inc.json 2> test-audit-inc.log || exit_fail "auditor failed" + echo -n "." taler-wire-auditor -r -c $CONF -m $MASTER_PUB > test-wire-audit.json 2> test-wire-audit.log || exit_fail "wire auditor failed" + # Also do incremental run + echo -n "." + taler-wire-auditor -c $CONF -m $MASTER_PUB > test-wire-audit-inc.json 2> test-wire-audit-inc.log || exit_fail "wire auditor failed" echo " DONE" } @@ -210,7 +216,7 @@ echo -n "Check for lag detection... " # re-generating the test database as we do not # report lag of less than 1h (see GRACE_PERIOD in # taler-wire-auditor.c) -AGE=`stat -c %Y ../benchmark/auditor-basedb.fees` +AGE=`stat -c %Y ${BASEDB}.fees` NOW=`date +%s` DELTA=`expr $NOW - $AGE` if [ $DELTA -gt 3600 ] @@ -994,7 +1000,7 @@ echo "UPDATE app_banktransaction SET date='${OLD_DATE}' WHERE id='${OLD_ID}';" | # Postgres database to use DB=taler-auditor-test # Prefix for the data resources to use -BASEDB="../benchmark/auditor-basedb" +BASEDB="auditor-basedb" MASTER_PUB=`cat ${BASEDB}.mpub` # Configuration file to use CONF=test-auditor.conf diff --git a/src/benchmark/Makefile.am b/src/benchmark/Makefile.am index 8ea3fdb35..4444d3d1b 100644 --- a/src/benchmark/Makefile.am +++ b/src/benchmark/Makefile.am @@ -36,10 +36,5 @@ EXTRA_DIST = \ merchant_details.json \ test_benchmark_home/.local/share/taler/exchange/offline-keys/master.priv \ test_benchmark_home/.config/taler/test.json \ - test_benchmark_home/.config/taler/sepa.json \ - generate-auditor-basedb.sh \ - generate-auditor-basedb.conf \ - generate-auditor-basedb-template.conf \ - auditor-basedb.sql \ - auditor-basedb.fees \ - auditor-basedb.mpub + test_benchmark_home/.config/taler/sepa.json + |