From 95fa14da69b6345f087991ceedcc34c73e66bab8 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 27 Oct 2013 01:47:12 -0400 Subject: 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 --- qa/pull-tester/build-tests.sh.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'qa/pull-tester/build-tests.sh.in') 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 -- cgit v1.2.3 From 47b9374e39a00d6e981aa1f4d0175d9426d91ac8 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 28 Oct 2013 01:16:41 -0400 Subject: Make large-reorg tests optional in block-tester --- qa/pull-tester/build-tests.sh.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'qa/pull-tester/build-tests.sh.in') diff --git a/qa/pull-tester/build-tests.sh.in b/qa/pull-tester/build-tests.sh.in index 392ff12dc6..9640bcaf67 100755 --- a/qa/pull-tester/build-tests.sh.in +++ b/qa/pull-tester/build-tests.sh.in @@ -9,8 +9,9 @@ set -o xtrace MINGWPREFIX=$1 JAVA_COMPARISON_TOOL=$2 -JOBS=${3-1} -OUT_DIR=${4-} +RUN_LARGE_REORGS=$3 +JOBS=${4-1} +OUT_DIR=${5-} if [ $# -lt 2 ]; then echo "Usage: $0 [mingw-prefix] [java-comparison-tool] " @@ -32,7 +33,11 @@ cd @abs_top_srcdir@ make distdir mv $DISTDIR linux-build cd linux-build -./configure --disable-silent-rules --disable-ccache --with-comparison-tool="$JAVA_COMPARISON_TOOL" +if [ $RUN_LARGE_REORGS = 1 ]; then + ./configure --disable-silent-rules --disable-ccache --with-comparison-tool="$JAVA_COMPARISON_TOOL" --enable-comparison-tool-reorg-tests +else + ./configure --disable-silent-rules --disable-ccache --with-comparison-tool="$JAVA_COMPARISON_TOOL" +fi make -j$JOBS # link interesting binaries to parent out/ directory, if it exists. Do this before -- cgit v1.2.3