From 661d256b85725a9ecde5b4d05d2f38a1f0b23c16 Mon Sep 17 00:00:00 2001 From: Shane Dell <32347414+Shanedell@users.noreply.github.com> Date: Wed, 12 Apr 2023 11:11:05 -0400 Subject: [PATCH] Update tests to not fail on Mac M1's. (#1730) Closes #1673 Signed-off-by: Shane Dell --- syft/source/image_all_layers_resolver_test.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/syft/source/image_all_layers_resolver_test.go b/syft/source/image_all_layers_resolver_test.go index 1ba11304d..a94039e73 100644 --- a/syft/source/image_all_layers_resolver_test.go +++ b/syft/source/image_all_layers_resolver_test.go @@ -1,7 +1,9 @@ package source import ( + "fmt" "io" + "runtime" "sort" "testing" @@ -689,6 +691,11 @@ func Test_imageAllLayersResolver_resolvesLinks(t *testing.T) { func TestAllLayersResolver_AllLocations(t *testing.T) { img := imagetest.GetFixtureImage(t, "docker-archive", "image-files-deleted") + arch := "x86_64" + if runtime.GOARCH == "arm64" { + arch = "aarch64" + } + resolver, err := newAllLayersResolver(img) assert.NoError(t, err) @@ -799,9 +806,9 @@ func TestAllLayersResolver_AllLocations(t *testing.T) { "/lib/apk/db/triggers", "/lib/apk/exec", "/lib/firmware", - "/lib/ld-musl-x86_64.so.1", + fmt.Sprintf("/lib/ld-musl-%s.so.1", arch), "/lib/libapk.so.3.12.0", - "/lib/libc.musl-x86_64.so.1", + fmt.Sprintf("/lib/libc.musl-%s.so.1", arch), "/lib/libcrypto.so.3", "/lib/libssl.so.3", "/lib/libz.so.1",