diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-10-08 10:50:27 +1000 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-10-08 10:50:27 +1000 |
| commit | adae2f1819f536ab3e39bb2b4ae3ee772447eb79 (patch) | |
| tree | 4ddcd49faf096c54015156cb9b690d776da724fc | |
| parent | aa56d317a57467cabc28008831b0398485e73f6a (diff) | |
| parent | 583484a656071a04974cda6de50cdd627f2dc616 (diff) | |
| download | bitcoin-adae2f1819f536ab3e39bb2b4ae3ee772447eb79.tar.xz | |
Merge branch 'pulltestwin32'
| -rwxr-xr-x | qa/pull-tester/build-tests.sh.in | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/qa/pull-tester/build-tests.sh.in b/qa/pull-tester/build-tests.sh.in index b353c57909..85d9d55bb2 100755 --- a/qa/pull-tester/build-tests.sh.in +++ b/qa/pull-tester/build-tests.sh.in @@ -17,15 +17,25 @@ fi DISTDIR=@PACKAGE@-@VERSION@ +# Test win32 build first (it breaks the most often) +cd @abs_top_srcdir@ +make distdir +mv $DISTDIR win32-build +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 +make check + +# ... then linux build, with blockchain-tester: cd @abs_top_srcdir@ make distdir mv $DISTDIR linux-build cd linux-build -./configure --with-comparison-tool="$JAVA_COMPARISON_TOOL" +./configure --disable-silent-rules --disable-ccache --with-comparison-tool="$JAVA_COMPARISON_TOOL" make -j$JOBS make check -#Test code coverage +# Test code coverage cd @abs_top_srcdir@ make distdir mv $DISTDIR linux-coverage-build @@ -34,12 +44,3 @@ cd linux-coverage-build make -j$JOBS make cov -# win32 build disabled until pull-tester has updated dependencies -##Test win32 build -#cd @abs_top_srcdir@ -#make distdir -#mv $DISTDIR win32-build -#cd win32-build -#./configure --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 --with-comparison-tool="$JAVA_COMPARISON_TOOL" CPPFLAGS=-I$MINGWPREFIX/include LDFLAGS=-L$MINGWPREFIX/lib -#make -j$JOBS -#make check |