treewide: migrate to qemu-kvm in toolchain-bundle
Change-Id: I42a10a9adf7bdccb83ef997c6d554140ffaade4b
Reviewed-on: https://review.monogon.dev/c/monogon/+/4052
Reviewed-by: Jan Schär <jan@monogon.tech>
Tested-by: Jenkins CI
diff --git a/osbase/bringup/test/BUILD.bazel b/osbase/bringup/test/BUILD.bazel
index 66803bb..f63b0d6 100644
--- a/osbase/bringup/test/BUILD.bazel
+++ b/osbase/bringup/test/BUILD.bazel
@@ -15,6 +15,7 @@
":kernel_error",
":kernel_panic",
":kernel_succeeded",
+ "//build/toolchain/toolchain-bundle:qemu-kvm",
"//third_party/edk2:OVMF_CODE.fd",
"//third_party/edk2:OVMF_VARS.fd",
],
@@ -26,6 +27,7 @@
"xSucceedKernelPath": "$(rlocationpath :kernel_succeeded )",
"xPanicKernelPath": "$(rlocationpath :kernel_panic )",
"xErrorKernelPath": "$(rlocationpath :kernel_error )",
+ "xQEMUPath": "$(rlocationpath //build/toolchain/toolchain-bundle:qemu-kvm )",
},
deps = [
"//osbase/cmd",
diff --git a/osbase/bringup/test/run_test.go b/osbase/bringup/test/run_test.go
index 085b875..5b9b4cb 100644
--- a/osbase/bringup/test/run_test.go
+++ b/osbase/bringup/test/run_test.go
@@ -22,12 +22,13 @@
xSucceedKernelPath string
xPanicKernelPath string
xErrorKernelPath string
+ xQEMUPath string
)
func init() {
var err error
for _, path := range []*string{
- &xOvmfCodePath, &xOvmfVarsPath,
+ &xOvmfCodePath, &xOvmfVarsPath, &xQEMUPath,
&xSucceedKernelPath, &xPanicKernelPath, &xErrorKernelPath,
} {
*path, err = runfiles.Rlocation(*path)
@@ -56,7 +57,7 @@
}
qemuArgs := append(defaultArgs, args...)
pf := cmd.TerminateIfFound(expectedOutput, nil)
- return cmd.RunCommand(ctx, "qemu-system-x86_64", qemuArgs, pf)
+ return cmd.RunCommand(ctx, xQEMUPath, qemuArgs, pf)
}
func TestBringupSuccess(t *testing.T) {