From a6600be34ad812ff13c89f45c3cadaac6d994e67 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 30 Mar 2026 18:15:56 +0900 Subject: all: use filepath This makes package check portable, and removes nonportable behaviour from package pkg, pipewire, and system. All other packages remain nonportable due to their nature. No latency increase was observed due to this change on amd64 and arm64 linux. Signed-off-by: Ophestra --- internal/pkg/testdata/main.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'internal/pkg/testdata') diff --git a/internal/pkg/testdata/main.go b/internal/pkg/testdata/main.go index bbe26d69..c969474d 100644 --- a/internal/pkg/testdata/main.go +++ b/internal/pkg/testdata/main.go @@ -7,7 +7,7 @@ import ( "log" "net" "os" - "path" + "path/filepath" "reflect" "slices" "strings" @@ -68,7 +68,7 @@ func main() { if got, err := os.Executable(); err != nil { log.Fatalf("Executable: error = %v", err) } else { - iftPath = path.Join(path.Dir(path.Dir(got)), "ift") + iftPath = filepath.Join(filepath.Dir(filepath.Dir(got)), "ift") if got != wantExec { switch got { @@ -161,7 +161,7 @@ func main() { } } if !layers { - if path.Base(lowerdir) != checksumEmptyDir { + if filepath.Base(lowerdir) != checksumEmptyDir { log.Fatal("unexpected artifact checksum") } } else { @@ -187,8 +187,8 @@ func main() { } if len(lowerdirs) != 2 || - path.Base(lowerdirs[0]) != "MGWmEfjut2QE2xPJwTsmUzpff4BN_FEnQ7T0j7gvUCCiugJQNwqt9m151fm9D1yU" || - path.Base(lowerdirs[1]) != "nY_CUdiaUM1OL4cPr5TS92FCJ3rCRV7Hm5oVTzAvMXwC03_QnTRfQ5PPs7mOU9fK" { + filepath.Base(lowerdirs[0]) != "MGWmEfjut2QE2xPJwTsmUzpff4BN_FEnQ7T0j7gvUCCiugJQNwqt9m151fm9D1yU" || + filepath.Base(lowerdirs[1]) != "nY_CUdiaUM1OL4cPr5TS92FCJ3rCRV7Hm5oVTzAvMXwC03_QnTRfQ5PPs7mOU9fK" { log.Fatalf("unexpected lowerdirs %s", strings.Join(lowerdirs, ", ")) } } @@ -202,12 +202,12 @@ func main() { } next() - if path.Base(m.Root) != "OLBgp1GsljhM2TJ-sbHjaiH9txEUvgdDTAzHv2P24donTt6_529l-9Ua0vFImLlb" { + if filepath.Base(m.Root) != "OLBgp1GsljhM2TJ-sbHjaiH9txEUvgdDTAzHv2P24donTt6_529l-9Ua0vFImLlb" { log.Fatal("unexpected file artifact checksum") } next() - if path.Base(m.Root) != checksumEmptyDir { + if filepath.Base(m.Root) != checksumEmptyDir { log.Fatal("unexpected artifact checksum") } } @@ -226,13 +226,13 @@ func main() { log.Fatal("unexpected work mount entry") } } else { - if path.Base(m.Root) != ident || m.Target != "/work" { + if filepath.Base(m.Root) != ident || m.Target != "/work" { log.Fatal("unexpected work mount entry") } } next() - if path.Base(m.Root) != ident || m.Target != "/tmp" { + if filepath.Base(m.Root) != ident || m.Target != "/tmp" { log.Fatal("unexpected temp mount entry") } -- cgit v1.3.1