Skip to content

Commit 030d7b1

Browse files
committed
debug: fixed test runner
1 parent 0293dc8 commit 030d7b1

File tree

2 files changed

+17
-25
lines changed

2 files changed

+17
-25
lines changed

commands/debug/debug.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,7 @@ func Debug(ctx context.Context, req *dbg.DebugConfigReq, inStream io.Reader, out
109109

110110
// getCommandLine compose a debug command represented by a core recipe
111111
func getCommandLine(req *dbg.DebugConfigReq, pm *packagemanager.PackageManager) ([]string, error) {
112-
debugInfo, err := GetDebugConfig(context.Background(), &dbg.DebugConfigReq{
113-
Instance: req.GetInstance(),
114-
Fqbn: req.GetFqbn(),
115-
SketchPath: req.GetSketchPath(),
116-
ImportDir: req.GetImportDir(),
117-
Port: req.GetPort(),
118-
})
112+
debugInfo, err := getDebugProperties(req, pm)
119113
if err != nil {
120114
return nil, err
121115
}

commands/debug/debug_info.go

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,17 @@ import (
3737
func GetDebugConfig(ctx context.Context, req *debug.DebugConfigReq) (*debug.GetDebugConfigResp, error) {
3838
pm := commands.GetPackageManager(req.GetInstance().GetId())
3939

40-
props, err := getDebugProperties(req, pm)
40+
resp, err := getDebugProperties(req, pm)
4141
if err != nil {
4242
return nil, err
4343
}
44-
45-
if !props.ContainsKey("executable") {
44+
if resp.GetExecutable() == "" {
4645
return nil, status.Error(codes.Unimplemented, fmt.Sprintf("debugging not supported for board %s", req.GetFqbn()))
4746
}
48-
49-
server := props.Get("server")
50-
toolchain := props.Get("toolchain")
51-
resp := &debug.GetDebugConfigResp{
52-
Executable: props.Get("executable"),
53-
Server: server,
54-
ServerPath: props.Get("server." + server + ".path"),
55-
ServerConfiguration: props.SubTree("server." + server).AsMap(),
56-
Toolchain: toolchain,
57-
ToolchainPath: props.Get("toolchain.path"),
58-
ToolchainPrefix: props.Get("toolchain.prefix"),
59-
ToolchainConfiguration: props.SubTree("toolchain." + toolchain).AsMap(),
60-
}
6147
return resp, nil
6248
}
6349

64-
func getDebugProperties(req *debug.DebugConfigReq, pm *packagemanager.PackageManager) (*properties.Map, error) {
50+
func getDebugProperties(req *debug.DebugConfigReq, pm *packagemanager.PackageManager) (*debug.GetDebugConfigResp, error) {
6551
// TODO: make a generic function to extract sketch from request
6652
// and remove duplication in commands/compile.go
6753
if req.GetSketchPath() == "" {
@@ -156,5 +142,17 @@ func getDebugProperties(req *debug.DebugConfigReq, pm *packagemanager.PackageMan
156142
for k, v := range toolProperties.SubTree("debug").AsMap() {
157143
debugProperties.Set(k, toolProperties.ExpandPropsInString(v))
158144
}
159-
return debugProperties, nil
145+
146+
server := debugProperties.Get("server")
147+
toolchain := debugProperties.Get("toolchain")
148+
return &debug.GetDebugConfigResp{
149+
Executable: debugProperties.Get("executable"),
150+
Server: server,
151+
ServerPath: debugProperties.Get("server." + server + ".path"),
152+
ServerConfiguration: debugProperties.SubTree("server." + server).AsMap(),
153+
Toolchain: toolchain,
154+
ToolchainPath: debugProperties.Get("toolchain.path"),
155+
ToolchainPrefix: debugProperties.Get("toolchain.prefix"),
156+
ToolchainConfiguration: debugProperties.SubTree("toolchain." + toolchain).AsMap(),
157+
}, nil
160158
}

0 commit comments

Comments
 (0)