synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test_crossdirect_rust: run on stable channel (MR 1966) 

This test is failing with Alpine edge, because x86_64 has a different
rustc version than armv7:
	found crate `std` compiled by an incompatible version of rustc

Run the test with the latest Alpine stable version instead, where it is
more likely that rustc has the same version across all arches.
This commit is contained in:
Oliver Smith 2020-08-05 10:34:36 +02:00
parent 554dbd73ba
commit 7c26c1e9e5
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
test/test_crossdirect.py
View File

@ -36,21 +36,30 @@ def test_crossdirect_rust(args):
check() function, which makes sure that the built program is actually
working. """
pmbootstrap_run(args, ["-y", "zap"])
pmbootstrap_run(args, ["build_init", "-barmv7"])
pmbootstrap_run(args, ["chroot", "--add=rust", "-barmv7", "--",
"mv", "/usr/bin/rustc", "/usr/bin/rustc_"])
pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armv7",
"--force"])
# Make /native/usr/bin/rustc unusuable too, to make the build fail
pmbootstrap_run(args, ["chroot", "--", "rm", "/usr/bin/rustc"])
assert pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armv7",
"--force"], check=False) == 1
try:
# Switch to "stable" channel, as the stable release of alpine is more
# likely to have the same rustc version across various architectures.
# If armv7/x86_64 have a different rustc version, this test will fail:
# 'found crate `std` compiled by an incompatible version of rustc'
pmb.config.pmaports.switch_to_channel_branch(args, "stable")
# Make /usr/bin/rustc usable again, to test fallback with qemu
pmbootstrap_run(args, ["chroot", "-barmv7", "--",
"mv", "/usr/bin/rustc_", "/usr/bin/rustc"])
pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armv7",
"--force"])
pmbootstrap_run(args, ["build_init", "-barmv7"])
pmbootstrap_run(args, ["chroot", "--add=rust", "-barmv7", "--",
"mv", "/usr/bin/rustc", "/usr/bin/rustc_"])
pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armv7",
"--force"])
# Make /native/usr/bin/rustc unusuable too, to make the build fail
pmbootstrap_run(args, ["chroot", "--", "rm", "/usr/bin/rustc"])
assert pmbootstrap_run(args, ["build", "hello-world-rust",
"--arch=armv7", "--force"],
check=False) == 1
# Clean up
pmbootstrap_run(args, ["-y", "zap"])
# Make /usr/bin/rustc usable again, to test fallback with qemu
pmbootstrap_run(args, ["chroot", "-barmv7", "--",
"mv", "/usr/bin/rustc_", "/usr/bin/rustc"])
pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armv7",
"--force"])
finally:
# Clean up
pmb.config.pmaports.switch_to_channel_branch(args, "edge")
pmbootstrap_run(args, ["-y", "zap"])