diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-10-27 22:42:44 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-10-27 22:42:44 -0700 |
| commit | cd1fc2434ce80f50242e41b5e675f6d0b36045ad (patch) | |
| tree | e0729ec1713fa42a00d14c2fb41c201fa09ec7c9 /qa/pull-tester/build-tests.sh.in | |
| parent | aa5822f9c3a71818231101b414bd90f5eb40f356 (diff) | |
| parent | a27253dc007faaa37efa090a26c2515522efc141 (diff) | |
| download | bitcoin-cd1fc2434ce80f50242e41b5e675f6d0b36045ad.tar.xz | |
Merge pull request #3164 from TheBlueMatt/master
Re-enable BitcoindComparisonTool on pull-tester
Diffstat (limited to 'qa/pull-tester/build-tests.sh.in')
| -rwxr-xr-x | qa/pull-tester/build-tests.sh.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/qa/pull-tester/build-tests.sh.in b/qa/pull-tester/build-tests.sh.in index 461e7be048..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] <make jobs> <save output dir>" @@ -32,10 +33,11 @@ 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 +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 |