fix windows

grafana · Oct 17, 2024 · 5f7a72c · 5f7a72c
1 parent 47cae66
commit 5f7a72c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/internal/cmd/integration-tests/main.go b/internal/cmd/integration-tests/main.go
@@ -36,25 +36,31 @@ func runIntegrationTests(cmd *cobra.Command, args []string) {
 	if !skipBuild {
 		buildAlloy()
 	}
+
+	testFolder := "./tests/"
+	alloyBinaryPath := filepath.Join("..", "..", "..", "..", "..", "build", "alloy")
+
 	if runtime.GOOS != "windows" {
 		setupEnvironment()
 	} else {
+		testFolder = "./tests-windows/"
+		alloyBinaryPath += ".exe"
 		fmt.Println("Skipping environment setup on Windows.")
 	}
 
 	if specificTest != "" {
 		fmt.Println("Running", specificTest)
-		if !filepath.IsAbs(specificTest) && !strings.HasPrefix(specificTest, "./tests/") {
-			specificTest = "./tests/" + specificTest
+		if !filepath.IsAbs(specificTest) && !strings.HasPrefix(specificTest, testFolder) {
+			specificTest = testFolder + specificTest
 		}
 		logChan = make(chan TestLog, 1)
-		runSingleTest(specificTest, 12345)
+		runSingleTest(alloyBinaryPath, specificTest, 12345)
 	} else {
-		testDirs, err := filepath.Glob("./tests/*")
+		testDirs, err := filepath.Glob(testFolder + "*")
 		if err != nil {
 			panic(err)
 		}
 		logChan = make(chan TestLog, len(testDirs))
-		runAllTests()
+		runAllTests(alloyBinaryPath)
 	}
 }
diff --git a/...egration-tests/tests/windows/config.alloy → ...-tests/tests-windows/windows/config.alloy b/...egration-tests/tests/windows/config.alloy → ...-tests/tests-windows/windows/config.alloy
diff --git a/...sts/tests/windows/windows_metrics_test.go → ...s-windows/windows/windows_metrics_test.go b/...sts/tests/windows/windows_metrics_test.go → ...s-windows/windows/windows_metrics_test.go
diff --git a/internal/cmd/integration-tests/utils.go b/internal/cmd/integration-tests/utils.go
@@ -12,10 +12,6 @@ import (
 	"time"
 )
 
-const (
-	alloyBinaryPath = "../../../../../build/alloy"
-)
-
 type TestLog struct {
 	TestDir    string
 	AlloyLog   string
@@ -44,7 +40,7 @@ func setupEnvironment() {
 	time.Sleep(45 * time.Second)
 }
 
-func runSingleTest(testDir string, port int) {
+func runSingleTest(alloyBinaryPath string, testDir string, port int) {
 	info, err := os.Stat(testDir)
 	if err != nil {
 		panic(err)
@@ -94,7 +90,7 @@ func runSingleTest(testDir string, port int) {
 	}
 }
 
-func runAllTests() {
+func runAllTests(alloyBinaryPath string) {
 	testDirs, err := filepath.Glob("./tests/*")
 	if err != nil {
 		panic(err)
@@ -106,7 +102,7 @@ func runAllTests() {
 		wg.Add(1)
 		go func(td string, offset int) {
 			defer wg.Done()
-			runSingleTest(td, port+offset)
+			runSingleTest(alloyBinaryPath, td, port+offset)
 		}(testDir, i)
 	}
 	wg.Wait()