Skip to content

Commit

Permalink
Merge #752: migrate setup_environment.sh to CMake
Browse files Browse the repository at this point in the history
937c1ae migrate `setup_environment.sh` to CMake (Bruno Garcia)

Pull request description:

  Fixes #750

ACKs for top commit:
  achow101:
    ACK 937c1ae
  hebasto:
    ACK 937c1ae.

Tree-SHA512: f92f5000af1034b32ee1ae2972543e9053a4bf370b27fef7e2052af666de0bcdd433c9555ee55f7cf507b2d1c9e59c3fa0adfd167c6ef9ec041cc6350debf2f8
  • Loading branch information
achow101 committed Sep 4, 2024
2 parents 3322cab + 937c1ae commit a90e109
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build-bitcoind/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
ccache --zero-stats
cd test; ./setup_environment.sh --bitcoind; cd ..
ccache --show-stats --verbose
tar -czf bitcoind.tar.gz test/work/bitcoin/src/bitcoind
tar -czf bitcoind.tar.gz test/work/bitcoin/build/src/bitcoind
- uses: actions/cache/save@v4
if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
Expand Down
2 changes: 1 addition & 1 deletion test/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
parser.add_argument('--jade-path', dest='jade_path', help='Path to Jade qemu emulator', default='work/jade/simulator')

parser.add_argument('--all', help='Run tests on all existing simulators', default=False, action='store_true')
parser.add_argument('--bitcoind', help='Path to bitcoind', default='work/bitcoin/src/bitcoind')
parser.add_argument('--bitcoind', help='Path to bitcoind', default='work/bitcoin/build/src/bitcoind')
parser.add_argument('--interface', help='Which interface to send commands over', choices=['library', 'cli', 'bindist', 'stdin'], default='library')

parser.add_argument("--device-only", help="Only run device tests", action="store_true")
Expand Down
7 changes: 3 additions & 4 deletions test/setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -444,11 +444,10 @@ if [[ -n ${build_bitcoind} ]]; then

# Build bitcoind. This is super slow, but it is cached so it runs fairly quickly.
pushd depends
make NO_QT=1 NO_QR=1 NO_ZMQ=1 NO_UPNP=1 NO_NATPMP=1
make NO_QT=1 NO_QR=1 NO_ZMQ=1 NO_UPNP=1 NO_NATPMP=1 NO_USDT=1
popd

# Do the build
./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
cmake -B build --toolchain depends/x86_64-pc-linux-gnu/toolchain.cmake -DBUILD_TESTS=OFF -DBUILD_BENCH=OFF
cmake --build build --target bitcoind
fi

0 comments on commit a90e109

Please sign in to comment.