Merge branch 'pulltestwin32'
This commit is contained in:
commit
adae2f1819
1 changed files with 12 additions and 11 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue