aboutsummaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2013-10-27 01:47:12 -0400
committerMatt Corallo <git@bluematt.me>2013-10-27 03:38:04 -0400
commit95fa14da69b6345f087991ceedcc34c73e66bab8 (patch)
tree43f22dd997c855ee3e734875060b16c82bb6c826 /qa
parentb33b9a6fefbe832bf45a6c7717d0537f27597bff (diff)
Re-enable BitcoindComparisonTool:
* Use the latest version, with limited memory usage, and path to on-disk db (try mouting qa/tmp on a tmpfs)\ * enable -debug=net * re-enable BitcoindComparisonTool in pull-tester
Diffstat (limited to 'qa')
-rwxr-xr-xqa/pull-tester/build-tests.sh.in5
-rwxr-xr-xqa/pull-tester/run-bitcoind-for-test.sh.in2
2 files changed, 2 insertions, 5 deletions
diff --git a/qa/pull-tester/build-tests.sh.in b/qa/pull-tester/build-tests.sh.in
index 461e7be048..392ff12dc6 100755
--- a/qa/pull-tester/build-tests.sh.in
+++ b/qa/pull-tester/build-tests.sh.in
@@ -32,10 +32,7 @@ cd @abs_top_srcdir@
make distdir
mv $DISTDIR linux-build
cd linux-build
-# TODO: re-enable blockchain tester tool, as of 11 Oct 2013 is it not working properly
-# on the pull-tester machine.
-#./configure --disable-silent-rules --disable-ccache --with-comparison-tool="$JAVA_COMPARISON_TOOL"
-./configure --disable-silent-rules --disable-ccache
+./configure --disable-silent-rules --disable-ccache --with-comparison-tool="$JAVA_COMPARISON_TOOL"
make -j$JOBS
# link interesting binaries to parent out/ directory, if it exists. Do this before
diff --git a/qa/pull-tester/run-bitcoind-for-test.sh.in b/qa/pull-tester/run-bitcoind-for-test.sh.in
index e02fef3b56..e8bcb4bf7a 100755
--- a/qa/pull-tester/run-bitcoind-for-test.sh.in
+++ b/qa/pull-tester/run-bitcoind-for-test.sh.in
@@ -5,7 +5,7 @@ mkdir -p "$DATADIR"/regtest
touch "$DATADIR/regtest/debug.log"
tail -q -n 1 -F "$DATADIR/regtest/debug.log" | grep -m 1 -q "Done loading" &
WAITER=$!
-"@abs_top_builddir@/src/bitcoind@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -logtimestamps -port=18444 -regtest &
+"@abs_top_builddir@/src/bitcoind@EXEEXT@" -connect=0.0.0.0 -datadir="$DATADIR" -rpcuser=user -rpcpassword=pass -listen -keypool=3 -debug -debug=net -logtimestamps -port=18444 -regtest &
BITCOIND=$!
#Install a watchdog.