From 7216c87afc75c530fd026d7d51449f63449ff695 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Thu, 21 May 2026 19:37:07 -0600 Subject: [PATCH] fix(cudacompat): fix failing TestGlobFiles/multiple_matches unit test Signed-off-by: Christopher Desiniotis Co-authored-by: Jonathan Steffan --- cmd/nvidia-cdi-hook/cudacompat/container-root_linux.go | 2 ++ cmd/nvidia-cdi-hook/cudacompat/container-root_other.go | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmd/nvidia-cdi-hook/cudacompat/container-root_linux.go b/cmd/nvidia-cdi-hook/cudacompat/container-root_linux.go index b916afdff..1dc9631b1 100644 --- a/cmd/nvidia-cdi-hook/cudacompat/container-root_linux.go +++ b/cmd/nvidia-cdi-hook/cudacompat/container-root_linux.go @@ -22,6 +22,7 @@ import ( "fmt" "os" "path/filepath" + "sort" "strings" pathrs "github.com/cyphar/filepath-securejoin/pathrs-lite" @@ -132,5 +133,6 @@ func (r root) globFiles(pattern string) ([]string, error) { } files = append(files, filepath.Join(dir, dentry.Name())) } + sort.Strings(files) return files, nil } diff --git a/cmd/nvidia-cdi-hook/cudacompat/container-root_other.go b/cmd/nvidia-cdi-hook/cudacompat/container-root_other.go index 3864e0c40..79e36762f 100644 --- a/cmd/nvidia-cdi-hook/cudacompat/container-root_other.go +++ b/cmd/nvidia-cdi-hook/cudacompat/container-root_other.go @@ -22,6 +22,7 @@ import ( "io/fs" "os" "path/filepath" + "sort" "strings" ) @@ -99,6 +100,7 @@ func (r root) globFiles(pattern string) ([]string, error) { } files = append(files, filepath.Join(dir, match)) } + sort.Strings(files) return files, nil }