From 615f4f67599e0b0da63e3cc3f0bc26f85135fdde Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 19 Nov 2024 09:45:02 -0800 Subject: [PATCH] bake: windows entitlement path fixes Signed-off-by: Tonis Tiigi --- bake/entitlements_test.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/bake/entitlements_test.go b/bake/entitlements_test.go index 191d2ef4..41a1d9f1 100644 --- a/bake/entitlements_test.go +++ b/bake/entitlements_test.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "path/filepath" + "runtime" "slices" "testing" @@ -80,9 +81,15 @@ func TestEvaluateToExistingPath(t *testing.T) { expectErr: false, }, { - name: "Root path", - input: "/", - expected: "/", + name: "Root path", + input: "/", + expected: func() string { + root := "/" + if runtime.GOOS == "windows" { + root = filepath.VolumeName(root) + } + return root + }(), expectErr: false, }, } @@ -163,7 +170,7 @@ func TestDedupePaths(t *testing.T) { arr = toRelativePaths(arr, wd) m := make(map[string]struct{}) for _, v := range arr { - m[v] = struct{}{} + m[filepath.ToSlash(v)] = struct{}{} } require.Equal(t, tc.out, m) })