aboutsummaryrefslogtreecommitdiff
path: root/qa/pull-tester
diff options
context:
space:
mode:
authorMatt Corallo <git@bluematt.me>2013-10-28 03:20:12 -0400
committerMatt Corallo <git@bluematt.me>2013-10-28 03:20:12 -0400
commita18a408067229d2474dc7e88ef8b074b5c48cb95 (patch)
tree02d0273e44cf762d603fbcf505137318c4d345de /qa/pull-tester
parent473eabada2158832ac55dbd14a005e4575d22d83 (diff)
Run block tester and test suite on Windows too (only on Jenkins)
Diffstat (limited to 'qa/pull-tester')
-rwxr-xr-xqa/pull-tester/build-tests.sh.in12
1 files changed, 11 insertions, 1 deletions
diff --git a/qa/pull-tester/build-tests.sh.in b/qa/pull-tester/build-tests.sh.in
index 74a92f79d5..73f046a0f5 100755
--- a/qa/pull-tester/build-tests.sh.in
+++ b/qa/pull-tester/build-tests.sh.in
@@ -28,7 +28,11 @@ 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
+if [ $RUN_EXPENSIVE_TESTS = 1 ]; then
+ ./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 --with-comparison-tool="$JAVA_COMPARISON_TOOL" --enable-comparison-tool-reorg-tests
+else
+ ./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
+fi
make -j$JOBS
# And compile for Linux:
@@ -64,6 +68,12 @@ fi
cd @abs_top_srcdir@/linux-build
make check
+if [ $RUN_EXPENSIVE_TESTS = 1 ]; then
+ # Run unit tests and blockchain-tester on Windows:
+ cd @abs_top_srcdir@/win32-build
+ make check
+fi
+
# Clean up builds (pull-tester machine doesn't have infinite disk space)
cd @abs_top_srcdir@/linux-build
make clean