Skip to content

Commit

Permalink
Merge #1697: Fix run_tests.sh for Bitcoin Core v27
Browse files Browse the repository at this point in the history
719f242 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
  • Loading branch information
kristapsk committed May 1, 2024
2 parents 085ef08 + 719f242 commit a149a3a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion test/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down

0 comments on commit a149a3a

Please sign in to comment.