summaryrefslogtreecommitdiff
path: root/src/exchange-lib
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2017-01-13 14:44:51 +0100
committerFlorian Dold <florian.dold@gmail.com>2017-01-13 14:44:51 +0100
commit0bfb5b25091a1cbdd9911ae124ae6da35cd2b916 (patch)
tree8a5dddf4b02916bf2d177002acb5514d88e4e64b /src/exchange-lib
parentc631ae1b600add2ff229102d63870199043feb53 (diff)
downloadexchange-0bfb5b25091a1cbdd9911ae124ae6da35cd2b916.tar.gz
exchange-0bfb5b25091a1cbdd9911ae124ae6da35cd2b916.tar.bz2
exchange-0bfb5b25091a1cbdd9911ae124ae6da35cd2b916.zip
Add option to initialized db, fixes 4858
Additionally remove the TESTRUN option, since the name is confusing and doesn't match the original semantics (temp tables). Test cases should now invoke the exchange httpd with the "-i" option.
Diffstat (limited to 'src/exchange-lib')
-rw-r--r--src/exchange-lib/afl-generate.sh2
-rw-r--r--src/exchange-lib/test_exchange_api.c1
-rw-r--r--src/exchange-lib/test_exchange_api.conf3
3 files changed, 2 insertions, 4 deletions
diff --git a/src/exchange-lib/afl-generate.sh b/src/exchange-lib/afl-generate.sh
index 6ae833087..b0afcab35 100644
--- a/src/exchange-lib/afl-generate.sh
+++ b/src/exchange-lib/afl-generate.sh
@@ -31,4 +31,4 @@
#
# Must be run from this directory.
#
-$AFL_HOME/afl-fuzz -i baseline/ -m 250 -o afl-tests/ -f /tmp/afl-input taler-exchange-httpd -f /tmp/afl-input -d test-exchange-home/ -C
+$AFL_HOME/afl-fuzz -i baseline/ -m 250 -o afl-tests/ -f /tmp/afl-input taler-exchange-httpd -i -f /tmp/afl-input -d test-exchange-home/ -C
diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c
index 7f6e86a4a..289c88741 100644
--- a/src/exchange-lib/test_exchange_api.c
+++ b/src/exchange-lib/test_exchange_api.c
@@ -3139,6 +3139,7 @@ main (int argc,
"taler-exchange-httpd",
"taler-exchange-httpd",
"-c", "test_exchange_api.conf",
+ "-i",
NULL);
/* give child time to start and bind against the socket */
fprintf (stderr,
diff --git a/src/exchange-lib/test_exchange_api.conf b/src/exchange-lib/test_exchange_api.conf
index 03dd6f992..e815a0bbf 100644
--- a/src/exchange-lib/test_exchange_api.conf
+++ b/src/exchange-lib/test_exchange_api.conf
@@ -24,9 +24,6 @@ MASTER_PUBLIC_KEY = 98NJW3CQHZQGQXTY3K85K531XKPAPAVV4Q5V8PYYRR00NJGZWNVG
# How to access our database
DB = postgres
-# Is this is a testcase, use transient DB actions?
-TESTRUN = YES
-
[exchangedb-postgres]
DB_CONN_STR = "postgres:///talercheck"