Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1697: Fix run_tests.sh for Bitcoin Core v27

719f242389 Fix run_tests.sh for Bitcoin Core v27 (Kristaps Kaupe)

Pull request description:

  Should fix #1694 CI failure.

Top commit has no ACKs.

Tree-SHA512: 0faea0d53ae483c9b8f2ba7f7c651219d06d8af1ce794208584edbfbb395d675fbd07f6f4a61a18725482c05b2a69ed03870f26a040f229851226a3d8979fd8c
master
Kristaps Kaupe 2 years ago
parent
commit
a149a3a854
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 3
      test/run_tests.sh

3
test/run_tests.sh

@ -211,12 +211,13 @@ run_jm_tests ()
else
bitcoind="bitcoind"
fi
if [[ "$($bitcoind -version -datadir="${jm_test_datadir}" | grep -Eo 'v[0-9]+')" == "v26" ]]; then
if (( $($bitcoind -version -datadir="${jm_test_datadir}" | grep -Eo 'v[0-9]+' | tr -d 'v') >= 26 )); then
echo "deprecatedrpc=create_bdb" >> "${jm_test_datadir}/bitcoin.conf"
fi
fi
${orig_umask}
echo "datadir=${jm_test_datadir}" >> "${jm_test_datadir}/bitcoin.conf"
cat "${jm_test_datadir}/bitcoin.conf"
python -m pytest $additional_pytest_flags \
${HAS_JOSH_K_SEAL_OF_APPROVAL+--cov=jmclient --cov=jmbitcoin --cov=jmbase --cov=jmdaemon --cov-report html} \
--btcconf="$btcconf" \

Loading…
Cancel
Save