Skip to content

Commit

Permalink
Merge #535: test setup: Always build bitcoind depends and configure
Browse files Browse the repository at this point in the history
1800e68 test setup: Always build bitcoind depends and configure (Andrew Chow)

Pull request description:

  CI seems to be having some linker problems, probably because this isn't being done every time bitcoind is being built.

Top commit has no ACKs.

Tree-SHA512: a334d54f68c2f2ff2a671a13ee4140b8638e33788264b448366741683923cc6d8c244dd38a75e0af026907125a3603685f1758f9f2964655d6c0061dce6b81aa
  • Loading branch information
achow101 committed Oct 24, 2021
2 parents d564b27 + 1800e68 commit 618158a
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions test/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -284,12 +284,10 @@ if [[ -n ${build_bitcoind} ]]; then
fi

# Build bitcoind. This is super slow, but it is cached so it runs fairly quickly.
if [ "$bitcoind_setup_needed" == true ] ; then
pushd depends
make NO_QT=1 NO_QR=1 NO_ZMQ=1 NO_UPNP=1 NO_NATPMP=1
popd
./autogen.sh
CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site ./configure --with-incompatible-bdb --with-miniupnpc=no --without-gui --disable-zmq --disable-tests --disable-bench --with-libs=no --with-utils=no
fi
pushd depends
make NO_QT=1 NO_QR=1 NO_ZMQ=1 NO_UPNP=1 NO_NATPMP=1
popd
./autogen.sh
CONFIG_SITE=$PWD/depends/x86_64-pc-linux-gnu/share/config.site ./configure --with-incompatible-bdb --with-miniupnpc=no --without-gui --disable-zmq --disable-tests --disable-bench --with-libs=no --with-utils=no
make src/bitcoind
fi

0 comments on commit 618158a

Please sign in to comment.