Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

An update to vmtest #2918

Merged
merged 14 commits into from
Feb 17, 2024
Merged

An update to vmtest #2918

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7779e85
Update vmtest
hugelgupf Feb 16, 2024
967a312
Remove basic_test
hugelgupf Feb 16, 2024
12bfd21
Convert dhclient test
hugelgupf Feb 16, 2024
891fbf9
Convert ESXi boot test
hugelgupf Feb 16, 2024
cd87e57
Convert io_test
hugelgupf Feb 16, 2024
f922c73
Convert kexec test
hugelgupf Feb 16, 2024
3a8df3d
Convert multiboot test
hugelgupf Feb 16, 2024
e8c9c42
Convert pxeboot
hugelgupf Feb 16, 2024
295d850
Convert tcz test
hugelgupf Feb 16, 2024
c01071b
Convert uefiboot
hugelgupf Feb 16, 2024
47e55fa
Convert uinit
hugelgupf Feb 16, 2024
86f2205
Convert gotest
hugelgupf Feb 16, 2024
d678d74
Convert govmtest users
hugelgupf Feb 16, 2024
67b2ddb
go mod vendor
hugelgupf Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Convert uefiboot 
Signed-off-by: Chris Koch <[email protected]>
  • Loading branch information
@hugelgupf
hugelgupf committed Feb 16, 2024
commit c01071ba63a40a70e9a65cecb381e0135f396cc3
32 changes: 14 additions & 18 deletions integration/generic-tests/uefiboot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@ import (
"time"

"github.com/Netflix/go-expect"
"github.com/hugelgupf/vmtest"
"github.com/hugelgupf/vmtest/qemu"
"github.com/u-root/gobusybox/src/pkg/golang"
"github.com/u-root/u-root/pkg/uroot"
"github.com/hugelgupf/vmtest/scriptvm"
"github.com/u-root/mkuimage/uimage"
)

// TestUefiboot tests uefiboot commmands to boot to uefishell.
func TestUEFIBoot(t *testing.T) {
vmtest.SkipIfNotArch(t, qemu.ArchAMD64)
qemu.SkipIfNotArch(t, qemu.ArchAMD64)

var payload string
if tk := os.Getenv("UROOT_TEST_UEFIPAYLOAD"); len(tk) == 0 {
Expand All @@ -40,26 +39,23 @@ func TestUEFIBoot(t *testing.T) {
sync
kexec -e
`
vm := vmtest.StartVMAndRunCmds(t, script,
vmtest.WithBusyboxCommands(
"github.com/u-root/u-root/cmds/core/kexec",
"github.com/u-root/u-root/cmds/core/sync",
vm := scriptvm.Start(t, "vm", script,
scriptvm.WithUimage(
uimage.WithBusyboxCommands(
"github.com/u-root/u-root/cmds/core/kexec",
"github.com/u-root/u-root/cmds/core/sync",
),
// Since busybox mode rewrites commands, build uefiboot
// straight up as a binary to get integration test coverage.
uimage.WithCoveredCommands("github.com/u-root/u-root/cmds/exp/uefiboot"),
),
// Since busybox mode rewrites commands, build uefiboot
// straight up as a binary to get integration test coverage.
vmtest.WithMergedInitramfs(uroot.Opts{
Commands: uroot.BinaryCmds("github.com/u-root/u-root/cmds/exp/uefiboot"),
}),
vmtest.WithQEMUFn(
scriptvm.WithQEMUFn(
qemu.WithVMTimeout(2*time.Minute),
qemu.IDEBlockDevice(payload),
qemu.ArbitraryArgs("-machine", "q35"),
qemu.ArbitraryArgs("-m", "4096"),
qemu.VirtioRandom(),
),
// Build uefiboot (and all other initramfs commands) with coverage enabled.
vmtest.WithGoBuildOpts(&golang.BuildOpts{
ExtraArgs: []string{"-cover", "-coverpkg=github.com/u-root/u-root/...", "-covermode=atomic"},
}),
)

// Edk2 debug mode will print PROGRESS CODE. We will want to make sure
Expand Down