Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

test_crossdirect: s/armhf/armv7 (!1888)

Browse source 
Work around old rust version in Alpine's armhf repository (builder
currently stuck?) compared to other arches. Armv7 is fine, so switch to
that and avoid this error:

error[E0514]: found crate `std` compiled by an incompatible version of rustc
This commit is contained in:
Oliver Smith 2020-03-14 00:53:21 +01:00
parent 0997a46b3a
commit 7c4db04b9d
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/test_crossdirect.py
View file

@ -30,26 +30,26 @@ def pmbootstrap_run(args, parameters, check=True):
def test_crossdirect_rust(args): def test_crossdirect_rust(args):
""" Set up buildroot_armhf chroot for building, but remove /usr/bin/rustc. """ Set up buildroot_armv7 chroot for building, but remove /usr/bin/rustc.
Build hello-world-rust for armhf, to verify that it uses Build hello-world-rust for armv7, to verify that it uses
/native/usr/bin/rustc instead of /usr/bin/rustc. The package has a /native/usr/bin/rustc instead of /usr/bin/rustc. The package has a
check() function, which makes sure that the built program is actually check() function, which makes sure that the built program is actually
working. """ working. """
pmbootstrap_run(args, ["-y", "zap"]) pmbootstrap_run(args, ["-y", "zap"])
pmbootstrap_run(args, ["build_init", "-barmhf"]) pmbootstrap_run(args, ["build_init", "-barmv7"])
pmbootstrap_run(args, ["chroot", "--add=rust", "-barmhf", "--", pmbootstrap_run(args, ["chroot", "--add=rust", "-barmv7", "--",
"mv", "/usr/bin/rustc", "/usr/bin/rustc_"]) "mv", "/usr/bin/rustc", "/usr/bin/rustc_"])
pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armhf", pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armv7",
"--force"]) "--force"])
# Make /native/usr/bin/rustc unusuable too, to make the build fail # Make /native/usr/bin/rustc unusuable too, to make the build fail
pmbootstrap_run(args, ["chroot", "--", "rm", "/usr/bin/rustc"]) pmbootstrap_run(args, ["chroot", "--", "rm", "/usr/bin/rustc"])
assert pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armhf", assert pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armv7",
"--force"], check=False) == 1 "--force"], check=False) == 1
# Make /usr/bin/rustc usable again, to test fallback with qemu # Make /usr/bin/rustc usable again, to test fallback with qemu
pmbootstrap_run(args, ["chroot", "-barmhf", "--", pmbootstrap_run(args, ["chroot", "-barmv7", "--",
"mv", "/usr/bin/rustc_", "/usr/bin/rustc"]) "mv", "/usr/bin/rustc_", "/usr/bin/rustc"])
pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armhf", pmbootstrap_run(args, ["build", "hello-world-rust", "--arch=armv7",
"--force"]) "--force"])
# Clean up # Clean up