Skip to content

Commit 4bcaffa

Browse files
committed
tests/ci: only install qemu-user-static if QEMUSTATIC is set
In an upcoming patch, arm64 hosts will default to using bhyve to run CI. However, emulators/qemu-user-static does not exist for arm64, and is not needed when the target is also arm64. This patch ensures that qemu-user-static will only be requested for install if QEMUSTATIC is set. Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation
1 parent a2f8656 commit 4bcaffa

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tests/ci/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ portinstall-pkg: .PHONY
151151
.endif
152152

153153
portinstall-qemu: portinstall-pkg .PHONY
154-
.if !exists(/usr/local/bin/qemu-${QEMU_ARCH}-static)
154+
.if !empty(QEMUSTATIC) && !exists(${QEMUSTATIC})
155155
env ASSUME_ALWAYS_YES=yes pkg install emulators/qemu-user-static
156156
.endif
157157
.if !exists(${QEMUBIN})

0 commit comments

Comments
 (0)