From 456513d71e153d1a1280012e9de5f85db1e8610a Mon Sep 17 00:00:00 2001 From: David Dworken Date: Sun, 6 Nov 2022 14:42:01 -0800 Subject: [PATCH] windows: restore the cd ../ behavior, but for windows --- shared/testutils/testutils.go | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/shared/testutils/testutils.go b/shared/testutils/testutils.go index 8c1b297..80393d4 100644 --- a/shared/testutils/testutils.go +++ b/shared/testutils/testutils.go @@ -162,22 +162,20 @@ func checkError(err error) { } func buildServer() { - if runtime.GOOS != "windows" { - for { - wd, err := os.Getwd() - if err != nil { - panic(fmt.Sprintf("failed to getwd: %v", err)) - } - if strings.HasSuffix(wd, "/hishtory") { - break - } - err = os.Chdir("../") - if err != nil { - panic(fmt.Sprintf("failed to chdir: %v", err)) - } - if wd == "/" { - panic("failed to cd into hishtory dir!") - } + for i := 0; i < 100; i++ { + wd, err := os.Getwd() + if err != nil { + panic(fmt.Sprintf("failed to getwd: %v", err)) + } + if strings.HasSuffix(wd, "hishtory") { + break + } + err = os.Chdir("../") + if err != nil { + panic(fmt.Sprintf("failed to chdir: %v", err)) + } + if wd == "/" { + panic("failed to cd into hishtory dir!") } } version, err := os.ReadFile("VERSION")