@@ -13,11 +13,6 @@ QEMU_EXTRA_PARAM=-bios /usr/local/share/u-boot/u-boot-qemu-arm64/u-boot.bin -cpu
13
13
QEMU_MAX_CPU_COUNT=64
14
14
QEMU_MAX_MEM_SIZE=64
15
15
16
- portinstall-aarch64: portinstall-pkg .PHONY
17
- .if !exists(/usr/local/share/u-boot/u-boot-qemu-arm64/u-boot.bin)
18
- env ASSUME_ALWAYS_YES=yes pkg install sysutils/u-boot-qemu-arm64
19
- .endif
20
-
21
16
# NOTE: Nothing should be changed below this line unless explicitly required.
22
17
23
18
ci-buildworld-aarch64: ci-buildworld .PHONY
@@ -26,4 +21,31 @@ ci-buildkernel-aarch64: ci-buildkernel .PHONY
26
21
27
22
ci-buildimage-aarch64: ci-buildimage .PHONY
28
23
24
+ .if ${MACHINE} == "arm64" && ( !defined(USE_QEMU) || empty(USE_QEMU) )
25
+ portinstall-aarch64: portinstall-pkg .PHONY
26
+ .if !exists(/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin)
27
+ env ASSUME_ALWAYS_YES=yes pkg install sysutils/u-boot-bhyve-arm64
28
+ .endif
29
+
30
+ ci-runtest-aarch64: ci-buildimage-aarch64 .PHONY
31
+ /usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy || true
32
+ expect -c "set timeout ${TIMEOUT_EXPECT}; \
33
+ spawn /usr/bin/timeout -k 60 ${TIMEOUT_VM} /usr/sbin/bhyve \
34
+ -c ${PARALLEL_JOBS} -m ${VM_MEM_SIZE} \
35
+ -s 0:0,hostbridge \
36
+ -s 2:0,virtio-blk,${CIDISK} \
37
+ -s 3:0,virtio-blk,${META_TAR} \
38
+ ${BHYVE_EXTRA_DISK_PARAM} \
39
+ -o console=stdio \
40
+ -o bootrom=/usr/local/share/u-boot/u-boot-bhyve-arm64/u-boot.bin \
41
+ ${TEST_VM_NAME}; \
42
+ expect { eof }"
43
+ /usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy
44
+ .else
45
+ portinstall-aarch64: portinstall-pkg .PHONY
46
+ .if !exists(/usr/local/share/u-boot/u-boot-qemu-arm64/u-boot.bin)
47
+ env ASSUME_ALWAYS_YES=yes pkg install sysutils/u-boot-qemu-arm64
48
+ .endif
49
+
29
50
ci-runtest-aarch64: ci-runtest .PHONY
51
+ .endif
0 commit comments