From b08c1142409c5a3d41ade6616a0af7277352ead5 Mon Sep 17 00:00:00 2001 From: Taras Madan Date: Thu, 29 Aug 2024 14:13:59 +0200 Subject: pkg/covermerger: use filepath.Join instead of plus --- pkg/covermerger/covermerger_test.go | 2 +- pkg/covermerger/provider_monorepo.go | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'pkg') diff --git a/pkg/covermerger/covermerger_test.go b/pkg/covermerger/covermerger_test.go index f01599bf6..035e5972d 100644 --- a/pkg/covermerger/covermerger_test.go +++ b/pkg/covermerger/covermerger_test.go @@ -139,7 +139,7 @@ func (m *fileVersProviderMock) GetFileVersions(c *Config, targetFilePath string, ) (fileVersions, error) { res := make(fileVersions) for _, rbc := range rbcs { - filePath := c.Workdir + "/repos/" + rbc.Commit + "/" + targetFilePath + filePath := filepath.Join(c.Workdir, "repos", rbc.Commit, targetFilePath) if bytes, err := os.ReadFile(filePath); err == nil { res[rbc] = string(bytes) } diff --git a/pkg/covermerger/provider_monorepo.go b/pkg/covermerger/provider_monorepo.go index 32da2f8a5..4f908606f 100644 --- a/pkg/covermerger/provider_monorepo.go +++ b/pkg/covermerger/provider_monorepo.go @@ -5,6 +5,7 @@ package covermerger import ( "fmt" + "path/filepath" "sync" "github.com/google/syzkaller/pkg/log" @@ -75,7 +76,7 @@ func (mr *monoRepo) addRepoCommit(rbc RepoCommit) { } func MakeMonoRepo(workdir string) FileVersProvider { - rbcPath := workdir + "/repos/linux_kernels" + rbcPath := filepath.Join(workdir, "repos", "linux_kernels") mr := &monoRepo{ repoCommits: map[RepoCommit]struct{}{}, } -- cgit mrf-deployment