set bool env var correctly on windows

crc-org · Feb 17, 2025 · f101751 · f101751
1 parent 36c69f1
commit f101751
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/test/extended/crc/cmd/cmd.go b/test/extended/crc/cmd/cmd.go
@@ -89,21 +89,14 @@ func (c Command) Execute() error {
 func (c Command) env() []string {
 	var env []string
 	if !c.updateCheck {
-		env = append(env, envVariable("CRC_DISABLE_UPDATE_CHECK", "true"))
+		env = append(env, util.EnvVariable("CRC_DISABLE_UPDATE_CHECK", "true"))
 	}
 	if c.disableNTP {
-		env = append(env, envVariable("CRC_DEBUG_ENABLE_STOP_NTP", "true"))
+		env = append(env, util.EnvVariable("CRC_DEBUG_ENABLE_STOP_NTP", "true"))
 	}
 	return env
 }
 
-func envVariable(key, value string) string {
-	if runtime.GOOS == "windows" {
-		return fmt.Sprintf("$env:%s=%s;", key, value)
-	}
-	return fmt.Sprintf("%s=%s", key, value)
-}
-
 func (c Command) validate() error {
 	cmdline := strings.Fields(c.command)
 	if len(cmdline) < 1 {

diff --git a/test/extended/util/util.go b/test/extended/util/util.go
@@ -22,6 +22,25 @@ var (
 	CRCHome string
 )
 
+func EnvVariable(key, value string) string {
+	var prefix = ""
+	var suffix = ""
+	if runtime.GOOS == "windows" {
+		prefix = "$env:"
+		suffix = ";"
+		switch value {
+		case "true":
+			value = "$true"
+			break
+		case "false":
+			value = "$false"
+			break
+		default:
+		}
+	}
+	return fmt.Sprintf("%s%s=%s%s", prefix, key, value, suffix)
+}
+
 func CopyFilesToTestDir() error {
 	cwd, err := os.Getwd()
 	if err != nil {

diff --git a/test/integration/utilities_test.go b/test/integration/utilities_test.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/crc-org/crc/v2/test/extended/crc/cmd"
+	"github.com/crc-org/crc/v2/test/extended/util"
 	. "github.com/onsi/gomega"
 )
 
@@ -21,8 +22,8 @@ type CRCBuilder struct {
 // NewCRCCommand returns a CRCBuilder for running CRC.
 func NewCRCCommand(args ...string) *CRCBuilder {
 	cmd := exec.Command("crc", args...)
-	cmd.Env = append(os.Environ(), "CRC_DISABLE_UPDATE_CHECK=true")
-	cmd.Env = append(os.Environ(), "CRC_LOG_LEVEL=debug")
+	cmd.Env = append(os.Environ(), util.EnvVariable("CRC_DISABLE_UPDATE_CHECK", "true"))
+	cmd.Env = append(cmd.Env, util.EnvVariable("CRC_LOG_LEVEL", "debug"))
 	return &CRCBuilder{
 		cmd: cmd,
 	}