Skip to content

Commit dba1231

Browse files
Sjorsprusnak
andcommitted
test: previous releases: add v23.0
Starting from v23.0 there is a separate macOS release for x86_64 and aarch64. Co-authored-by: Pavol Rusnak <[email protected]>
1 parent d17bbc3 commit dba1231

File tree

4 files changed

+20
-6
lines changed

4 files changed

+20
-6
lines changed

ci/test/00_setup_env_native_qt5.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude fe
1414
export RUN_UNIT_TESTS_SEQUENTIAL="true"
1515
export RUN_UNIT_TESTS="false"
1616
export GOAL="install"
17-
export PREVIOUS_RELEASES_TO_DOWNLOAD="v0.14.3 v0.15.2 v0.16.3 v0.17.2 v0.18.1 v0.19.1 v0.20.1 v0.21.0 v22.0"
17+
export PREVIOUS_RELEASES_TO_DOWNLOAD="v0.14.3 v0.15.2 v0.16.3 v0.17.2 v0.18.1 v0.19.1 v0.20.1 v0.21.0 v22.0 v23.0"
1818
export BITCOIN_CONFIG="--enable-zmq --with-libs=no --with-gui=qt5 --enable-reduce-exports \
1919
--enable-debug CFLAGS=\"-g0 -O2 -funsigned-char\" CXXFLAGS=\"-g0 -O2 -funsigned-char\" CC=gcc-8 CXX=g++-8"

test/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ test/functional/test_runner.py --extended
9898
In order to run backwards compatibility tests, download the previous node binaries:
9999

100100
```
101-
test/get_previous_releases.py -b v22.0 v0.21.0 v0.20.1 v0.19.1 v0.18.1 v0.17.2 v0.16.3 v0.15.2 v0.14.3
101+
test/get_previous_releases.py -b v23.0 v22.0 v0.21.0 v0.20.1 v0.19.1 v0.18.1 v0.17.2 v0.16.3 v0.15.2 v0.14.3
102102
```
103103

104104
By default, up to 4 tests will be run in parallel by test_runner. To specify

test/functional/feature_backwards_compatibility.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@
3434
class BackwardsCompatibilityTest(BitcoinTestFramework):
3535
def set_test_params(self):
3636
self.setup_clean_chain = True
37-
self.num_nodes = 9
37+
self.num_nodes = 10
3838
# Add new version after each release:
3939
self.extra_args = [
4040
["-addresstype=bech32", "[email protected]"], # Pre-release: use to mine blocks. noban for immediate tx relay
4141
["-nowallet", "-walletrbf=1", "-addresstype=bech32", "[email protected]"], # Pre-release: use to receive coins, swap wallets, etc
42+
["-nowallet", "-walletrbf=1", "-addresstype=bech32", "[email protected]"], # v23.0
4243
["-nowallet", "-walletrbf=1", "-addresstype=bech32", "[email protected]"], # v22.0
4344
["-nowallet", "-walletrbf=1", "-addresstype=bech32", "[email protected]"], # v0.21.0
4445
["-nowallet", "-walletrbf=1", "-addresstype=bech32", "[email protected]"], # v0.20.1
@@ -57,6 +58,7 @@ def setup_nodes(self):
5758
self.add_nodes(self.num_nodes, extra_args=self.extra_args, versions=[
5859
None,
5960
None,
61+
230000,
6062
220000,
6163
210000,
6264
200100,

test/get_previous_releases.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,15 @@
7171
"91b1e012975c5a363b5b5fcc81b5b7495e86ff703ec8262d4b9afcfec633c30d": "bitcoin-22.0-powerpc64le-linux-gnu.tar.gz",
7272
"9cc3a62c469fe57e11485fdd32c916f10ce7a2899299855a2e479256ff49ff3c": "bitcoin-22.0-riscv64-linux-gnu.tar.gz",
7373
"59ebd25dd82a51638b7a6bb914586201e67db67b919b2a1ff08925a7936d1b16": "bitcoin-22.0-x86_64-linux-gnu.tar.gz",
74+
75+
"06f4c78271a77752ba5990d60d81b1751507f77efda1e5981b4e92fd4d9969fb": "bitcoin-23.0-aarch64-linux-gnu.tar.gz",
76+
"952c574366aff76f6d6ad1c9ee45a361d64fa04155e973e926dfe7e26f9703a3": "bitcoin-23.0-arm-linux-gnueabihf.tar.gz",
77+
"7c8bc63731aa872b7b334a8a7d96e33536ad77d49029bad179b09dca32cd77ac": "bitcoin-23.0-arm64-apple-darwin.tar.gz",
78+
"2caa5898399e415f61d9af80a366a3008e5856efa15aaff74b88acf429674c99": "bitcoin-23.0-powerpc64-linux-gnu.tar.gz",
79+
"217dd0469d0f4962d22818c368358575f6a0abcba8804807bb75325eb2f28b19": "bitcoin-23.0-powerpc64le-linux-gnu.tar.gz",
80+
"078f96b1e92895009c798ab827fb3fde5f6719eee886bd0c0e93acab18ea4865": "bitcoin-23.0-riscv64-linux-gnu.tar.gz",
81+
"c816780583009a9dad426dc0c183c89be9da98906e1e2c7ebae91041c1aaaaf3": "bitcoin-23.0-x86_64-apple-darwin.tar.gz",
82+
"2cca490c1f2842884a3c5b0606f179f9f937177da4eadd628e3f7fd7e25d26d0": "bitcoin-23.0-x86_64-linux-gnu.tar.gz",
7483
}
7584

7685

@@ -96,8 +105,11 @@ def download_binary(tag, args) -> int:
96105
if match:
97106
bin_path = 'bin/bitcoin-core-{}/test.{}'.format(
98107
match.group(1), match.group(2))
108+
platform = args.platform
109+
if tag < "v23" and platform in ["x86_64-apple-darwin", "aarch64-apple-darwin"]:
110+
platform = "osx64"
99111
tarball = 'bitcoin-{tag}-{platform}.tar.gz'.format(
100-
tag=tag[1:], platform=args.platform)
112+
tag=tag[1:], platform=platform)
101113
tarballUrl = 'https://bitcoincore.org/{bin_path}/{tarball}'.format(
102114
bin_path=bin_path, tarball=tarball)
103115

@@ -201,8 +213,8 @@ def check_host(args) -> int:
201213
platforms = {
202214
'aarch64-*-linux*': 'aarch64-linux-gnu',
203215
'x86_64-*-linux*': 'x86_64-linux-gnu',
204-
'x86_64-apple-darwin*': 'osx64',
205-
'aarch64-apple-darwin*': 'osx64',
216+
'x86_64-apple-darwin*': 'x86_64-apple-darwin',
217+
'aarch64-apple-darwin*': 'aarch64-apple-darwin',
206218
}
207219
args.platform = ''
208220
for pattern, target in platforms.items():

0 commit comments

Comments
 (0)