From d8c52499c196646fe58923d6209043a82d820a1e Mon Sep 17 00:00:00 2001 From: mappu Date: Fri, 7 Feb 2025 19:11:25 +1300 Subject: [PATCH] rcc/test: support PATH separator difference on Windows --- cmd/miqt-rcc/integration_test.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/miqt-rcc/integration_test.go b/cmd/miqt-rcc/integration_test.go index 6c3ccbd6..fd495a08 100644 --- a/cmd/miqt-rcc/integration_test.go +++ b/cmd/miqt-rcc/integration_test.go @@ -5,6 +5,7 @@ import ( "os" "os/exec" "path/filepath" + "runtime" "strings" "testing" ) @@ -60,6 +61,10 @@ replace github.com/mappu/miqt => ` + filepath.Clean(RccDir+`/../../`) + ` // Build miqt-rcc and add it to our fake tools path toolsDir := t.TempDir() + newPathEnv := "PATH=" + toolsDir + `:` + os.Getenv(`PATH`) + if runtime.GOOS == "windows" { // uses a different separator + newPathEnv = "PATH=" + toolsDir + `;` + os.Getenv(`PATH`) + } t.Run("Compile miqt-rcc", func(t *testing.T) { @@ -116,7 +121,7 @@ replace github.com/mappu/miqt => ` + filepath.Clean(RccDir+`/../../`) + ` // Verify that `go generate` works regenCmd := exec.Command(`go`, `generate`) - regenCmd.Env = []string{"PATH=" + toolsDir + ":" + os.Getenv("PATH")} + regenCmd.Env = []string{newPathEnv} regenCmd.Dir = td regenCmd.Stderr = os.Stderr err = regenCmd.Run()