From 7f1affc7f7f17279961b3d19b9f97aea04b2dd22 Mon Sep 17 00:00:00 2001 From: Chris Koch Date: Tue, 26 Dec 2023 08:02:15 -0800 Subject: [PATCH] Disable cgo in uroot building tests Signed-off-by: Chris Koch --- pkg/uroot/builder/binary_test.go | 6 +++--- pkg/uroot/builder/gbb_test.go | 6 +++--- pkg/uroot/uroot_test.go | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/pkg/uroot/builder/binary_test.go b/pkg/uroot/builder/binary_test.go index e68f44f4b2..e8e151e405 100644 --- a/pkg/uroot/builder/binary_test.go +++ b/pkg/uroot/builder/binary_test.go @@ -7,7 +7,7 @@ package builder import ( "testing" - gbbgolang "github.com/u-root/gobusybox/src/pkg/golang" + "github.com/u-root/gobusybox/src/pkg/golang" "github.com/u-root/u-root/pkg/ulog/ulogtest" "github.com/u-root/u-root/pkg/uroot/initramfs" ) @@ -16,7 +16,7 @@ func TestBinaryBuild(t *testing.T) { dir := t.TempDir() opts := Opts{ - Env: gbbgolang.Default(), + Env: golang.Default(golang.DisableCGO()), Packages: []string{ "../test/foo", "../../../cmds/core/elvish", @@ -25,7 +25,7 @@ func TestBinaryBuild(t *testing.T) { }, TempDir: dir, BinaryDir: "bbin", - BuildOpts: &gbbgolang.BuildOpts{}, + BuildOpts: &golang.BuildOpts{}, } af := initramfs.NewFiles() var b BinaryBuilder diff --git a/pkg/uroot/builder/gbb_test.go b/pkg/uroot/builder/gbb_test.go index 596c72332e..faae5a2238 100644 --- a/pkg/uroot/builder/gbb_test.go +++ b/pkg/uroot/builder/gbb_test.go @@ -7,7 +7,7 @@ package builder import ( "testing" - gbbgolang "github.com/u-root/gobusybox/src/pkg/golang" + "github.com/u-root/gobusybox/src/pkg/golang" "github.com/u-root/u-root/pkg/ulog/ulogtest" "github.com/u-root/u-root/pkg/uroot/initramfs" ) @@ -16,14 +16,14 @@ func TestGBBBuild(t *testing.T) { dir := t.TempDir() opts := Opts{ - Env: gbbgolang.Default(), + Env: golang.Default(golang.DisableCGO()), Packages: []string{ "../test/foo", "../../../cmds/core/elvish", }, TempDir: dir, BinaryDir: "bbin", - BuildOpts: &gbbgolang.BuildOpts{}, + BuildOpts: &golang.BuildOpts{}, } af := initramfs.NewFiles() var gbb GBBBuilder diff --git a/pkg/uroot/uroot_test.go b/pkg/uroot/uroot_test.go index 344f4a7f85..f4eb5f144e 100644 --- a/pkg/uroot/uroot_test.go +++ b/pkg/uroot/uroot_test.go @@ -11,6 +11,7 @@ import ( "syscall" "testing" + "github.com/u-root/gobusybox/src/pkg/golang" "github.com/u-root/u-root/pkg/cpio" "github.com/u-root/u-root/pkg/ulog/ulogtest" "github.com/u-root/u-root/pkg/uroot/builder" @@ -49,6 +50,7 @@ func TestCreateInitramfs(t *testing.T) { { name: "BB archive with ls and init", opts: Opts{ + Env: golang.Default(golang.DisableCGO()), TempDir: dir, ExtraFiles: nil, UseExistingInit: false, @@ -98,6 +100,7 @@ func TestCreateInitramfs(t *testing.T) { { name: "init specified, but not in commands", opts: Opts{ + Env: golang.Default(golang.DisableCGO()), TempDir: dir, DefaultShell: "zoocar", InitCmd: "foobar", @@ -130,6 +133,7 @@ func TestCreateInitramfs(t *testing.T) { { name: "multi-mode archive", opts: Opts{ + Env: golang.Default(golang.DisableCGO()), TempDir: dir, ExtraFiles: nil, UseExistingInit: false,