tests/ci: separate ci-runtest into qemu and bhyve variants

Bhyve is only supported on amd64/amd64, amd64/i386, and
arm64/arm64. Furthermore, amd64 and arm64 have different
command-line arguments and requirements for running bhyve.

This patch separates the bhyve version of ci-runtest into
architecture-specific Makefiles.

Signed-off-by: Siva Mahadevan <[email protected]>
Sponsored by: The FreeBSD Foundation

Author: svmhdvn

tests/ci/Makefile

@@ -210,26 +210,6 @@ ci-extract-meta: .PHONY
 .endif
 
 ci-runtest: ci-buildimage-${TARGET_ARCH:tl} portinstall .PHONY
-.if ${MACHINE} == "amd64" && ( ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" ) && ( !defined(USE_QEMU) || empty(USE_QEMU) )
-	/usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy || true
-	expect -c "set timeout ${TIMEOUT_EXPECT}; \
-		spawn /usr/bin/timeout -k 5s 30s /usr/sbin/bhyveload \
-		-c stdio -m ${VM_MEM_SIZE} -d ${CIDISK} ${TEST_VM_NAME}; \
-		expect { eof }; \
-		exit [lindex [wait] 3]"
-	expect -c "set timeout ${TIMEOUT_EXPECT}; \
-		spawn /usr/bin/timeout -k 60 ${TIMEOUT_VM} /usr/sbin/bhyve \
-		-c ${PARALLEL_JOBS} -m ${VM_MEM_SIZE} -A -H -P \
-		-s 0:0,hostbridge \
-		-s 1:0,lpc \
-		-s 2:0,virtio-blk,${CIDISK} \
-		-s 3:0,virtio-blk,${META_TAR} \
-		${BHYVE_EXTRA_DISK_PARAM} \
-		-l com1,stdio \
-		${TEST_VM_NAME}; \
-		expect { eof }"
-	/usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy
-.else
 	timeout -k 60 ${TIMEOUT_VM} ${QEMUBIN} \
 		-machine ${QEMU_MACHINE} \
 		-smp ${QEMU_CPU_COUNT} \
@@ -242,7 +222,6 @@ ci-runtest: ci-buildimage-${TARGET_ARCH:tl} portinstall .PHONY
 		-blockdev driver=raw,node-name=hd0,file.driver=file,file.filename=${CIDISK} \
 		-blockdev driver=raw,node-name=hd1,file.driver=file,file.filename=${META_TAR} \
 		${QEMU_DEVICES}
-.endif
 
 ci-checktarget: .PHONY
 .if ${TARGET_ARCH} != "aarch64" && \

tests/ci/Makefile.amd64

@@ -23,4 +23,26 @@ ci-buildkernel-amd64: ci-buildkernel .PHONY
 
 ci-buildimage-amd64: ci-buildimage .PHONY
 
+.if ${MACHINE} == "amd64" && ( !defined(USE_QEMU) || empty(USE_QEMU) )
+ci-runtest-amd64: ci-buildimage-amd64 .PHONY
+	/usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy || true
+	expect -c "set timeout ${TIMEOUT_EXPECT}; \
+		spawn /usr/bin/timeout -k 5s 30s /usr/sbin/bhyveload \
+		-c stdio -m ${VM_MEM_SIZE} -d ${CIDISK} ${TEST_VM_NAME}; \
+		expect { eof }; \
+		exit [lindex [wait] 3]"
+	expect -c "set timeout ${TIMEOUT_EXPECT}; \
+		spawn /usr/bin/timeout -k 60 ${TIMEOUT_VM} /usr/sbin/bhyve \
+		-c ${PARALLEL_JOBS} -m ${VM_MEM_SIZE} -A -H -P \
+		-s 0:0,hostbridge \
+		-s 1:0,lpc \
+		-s 2:0,virtio-blk,${CIDISK} \
+		-s 3:0,virtio-blk,${META_TAR} \
+		${BHYVE_EXTRA_DISK_PARAM} \
+		-l com1,stdio \
+		${TEST_VM_NAME}; \
+		expect { eof }"
+	/usr/sbin/bhyvectl --vm=${TEST_VM_NAME} --destroy
+.else
 ci-runtest-amd64: ci-runtest .PHONY
+.endif