Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "FIX: Support working directories containing whitespace" #665

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Revert "FIX: Support working directories containing whitespace" #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions runner/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"reflect"
"regexp"
"runtime"
"strings"
"time"

"dario.cat/mergo"
Expand Down Expand Up @@ -308,7 +307,6 @@
if c.TestDataDir == "" {
c.TestDataDir = "testdata"
}

ed := c.Build.ExcludeDir
for i := range ed {
ed[i] = cleanPath(ed[i])
Expand All @@ -329,9 +327,6 @@
// CMD will not recognize relative path like ./tmp/server
c.Build.Bin, err = filepath.Abs(c.Build.Bin)

// Account for spaces in filepath
c.Build.Bin = fmt.Sprintf("%q", c.Build.Bin)

return err
}

Expand Down Expand Up @@ -367,8 +362,7 @@
}

func (c *Config) binPath() string {
bin := strings.Trim(c.Build.Bin, "\"")
return fmt.Sprintf("%q", filepath.Join(c.Root, bin))
return filepath.Join(c.Root, c.Build.Bin)

Check warning on line 365 in runner/config.go

View check run for this annotation

Codecov / codecov/patch

runner/config.go#L365 

Added line #L365 was not covered by tests
}

func (c *Config) tmpPath() string {
Expand Down
51 changes: 9 additions & 42 deletions runner/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,49 +117,16 @@ func TestReadConfByName(t *testing.T) {
}

func TestConfPreprocess(t *testing.T) {
tests := []struct {
name string
space bool
suffix string
}{
{
name: "no spaces",
space: false,
suffix: "/_testdata/toml/tmp/main\"",
},
{
name: "with spaces",
space: true,
suffix: "/_testdata/toml/tmp space/main\"",
},
t.Setenv(airWd, "_testdata/toml")
df := defaultConfig()
err := df.preprocess()
if err != nil {
t.Fatalf("preprocess error %v", err)
}

for _, tt := range tests {

oWD, err := os.Getwd()
if err != nil {
t.Fatalf("failed to get currWD: %v", err)
}

t.Setenv(airWd, "_testdata/toml")
df := defaultConfig()
if tt.space {
df.Build.Bin = "./tmp space/main"
}
err = df.preprocess()
if err != nil {
t.Fatalf("%s: preprocess error %v", tt.name, err)
}

binPath := df.Build.Bin
if !strings.HasSuffix(binPath, tt.suffix) {
t.Fatalf("%s: bin path is %s, but not have suffix %s.", tt.name, binPath, tt.suffix)
}

err = os.Chdir(oWD)
if err != nil {
t.Fatalf("failed to change back to original WD: %v", err)
}
suffix := "/_testdata/toml/tmp/main"
binPath := df.Build.Bin
if !strings.HasSuffix(binPath, suffix) {
t.Fatalf("bin path is %s, but not have suffix %s.", binPath, suffix)
}
}

Expand Down
5 changes: 1 addition & 4 deletions runner/engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,10 +721,7 @@ func TestRebuildWhenRunCmdUsingDLV(t *testing.T) {
dlvPort, f := GetPort()
f()
engine.config.Build.FullBin = fmt.Sprintf("dlv exec --accept-multiclient --log --headless --continue --listen :%d --api-version 2 ./tmp/main", dlvPort)
err = engine.config.preprocess()
if err != nil {
t.Fatal("config preprocess fialed! - Error: ", err)
}
_ = engine.config.preprocess()
go func() {
engine.Run()
}()
Expand Down
Loading