Skip to content

Commit 7039ab2

Browse files
committed
Genereated installer test execution changes.
1 parent 1aab222 commit 7039ab2

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

install.sh

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,16 @@ make_tests()
401401

402402
# Build and run unit tests relative to the primary directory.
403403
# VERBOSE=1 ensures test-suite.log output sent to console (gcc).
404-
make_jobs $JOBS check VERBOSE=1
404+
if ! make_jobs $JOBS check VERBOSE=1; then
405+
if [ -e "test-suite.log" ]; then
406+
echo "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
407+
echo "cat test-suite.log"
408+
echo "------------------------------"
409+
cat "test-suite.log"
410+
echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"
411+
fi
412+
exit 1
413+
fi
405414
}
406415

407416
pop_directory()
@@ -566,11 +575,11 @@ build_all()
566575
build_from_github zeromq czmq master $PARALLEL "$@" $CZMQ_OPTIONS
567576
build_from_github zeromq czmqpp master $PARALLEL "$@" $CZMQPP_OPTIONS
568577
build_from_github libbitcoin secp256k1 version3 $PARALLEL "$@" $SECP256K1_OPTIONS
569-
build_from_github libbitcoin libbitcoin version2 $PARALLEL "$@" $BITCOIN_OPTIONS
578+
build_from_github libbitcoin libbitcoin master $PARALLEL "$@" $BITCOIN_OPTIONS
570579
build_from_github libbitcoin libbitcoin-consensus version1 $PARALLEL "$@" $BITCOIN_CONSENSUS_OPTIONS
571-
build_from_github libbitcoin libbitcoin-blockchain version2 $PARALLEL "$@" $BITCOIN_BLOCKCHAIN_OPTIONS
572-
build_from_github libbitcoin libbitcoin-node version2 $PARALLEL "$@" $BITCOIN_NODE_OPTIONS
573-
build_from_travis libbitcoin libbitcoin-server version2 $PARALLEL "$@" $BITCOIN_SERVER_OPTIONS
580+
build_from_github libbitcoin libbitcoin-blockchain master $PARALLEL "$@" $BITCOIN_BLOCKCHAIN_OPTIONS
581+
build_from_github libbitcoin libbitcoin-node master $PARALLEL "$@" $BITCOIN_NODE_OPTIONS
582+
build_from_travis libbitcoin libbitcoin-server master $PARALLEL "$@" $BITCOIN_SERVER_OPTIONS
574583
}
575584

576585

0 commit comments

Comments
 (0)