diff options
| author | Matt Corallo <git@bluematt.me> | 2013-10-28 02:59:45 -0400 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2013-10-28 03:12:14 -0400 |
| commit | 473eabada2158832ac55dbd14a005e4575d22d83 (patch) | |
| tree | b7d9c3fd1ba5b19512b2974cd3bfeb38e7675a4a /qa/pull-tester | |
| parent | cd1fc2434ce80f50242e41b5e675f6d0b36045ad (diff) | |
| download | bitcoin-473eabada2158832ac55dbd14a005e4575d22d83.tar.xz | |
Gracefully handle the case when a DISTDIR already exists
Diffstat (limited to 'qa/pull-tester')
| -rwxr-xr-x | qa/pull-tester/build-tests.sh.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/qa/pull-tester/build-tests.sh.in b/qa/pull-tester/build-tests.sh.in index 9640bcaf67..74a92f79d5 100755 --- a/qa/pull-tester/build-tests.sh.in +++ b/qa/pull-tester/build-tests.sh.in @@ -9,7 +9,7 @@ set -o xtrace MINGWPREFIX=$1 JAVA_COMPARISON_TOOL=$2 -RUN_LARGE_REORGS=$3 +RUN_EXPENSIVE_TESTS=$3 JOBS=${4-1} OUT_DIR=${5-} @@ -23,17 +23,22 @@ DISTDIR=@PACKAGE@-@VERSION@ # Cross-compile for windows first (breaking the mingw/windows build is most common) cd @abs_top_srcdir@ make distdir -mv $DISTDIR win32-build +mkdir -p win32-build +rsync -av $DISTDIR/ win32-build/ +rm -r $DISTDIR cd win32-build + ./configure --disable-silent-rules --disable-ccache --prefix=$MINGWPREFIX --host=i586-mingw32msvc --with-qt-bindir=$MINGWPREFIX/host/bin --with-qt-plugindir=$MINGWPREFIX/plugins --with-qt-incdir=$MINGWPREFIX/include --with-boost=$MINGWPREFIX --with-protoc-bindir=$MINGWPREFIX/host/bin CPPFLAGS=-I$MINGWPREFIX/include LDFLAGS=-L$MINGWPREFIX/lib make -j$JOBS # And compile for Linux: cd @abs_top_srcdir@ make distdir -mv $DISTDIR linux-build +mkdir -p linux-build +rsync -av $DISTDIR/ linux-build/ +rm -r $DISTDIR cd linux-build -if [ $RUN_LARGE_REORGS = 1 ]; then +if [ $RUN_EXPENSIVE_TESTS = 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" |