Commit 95cfd65

authored

Allow optional programmer in debug (#2540)

1 parent 01de174 commit 95cfd65Copy full SHA for 95cfd65

File tree

-18

lines changed

-18

lines changed

Lines changed: 8 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -169,15 +169,14 @@ func getDebugProperties(req rpc.GetDebugConfigRequest, pme packagemanager.Expl`
`169`	`169`	`}`
`170`	`170`	`}`
`171`	`171`
`172`		`- if req.GetProgrammer() == "" {`
`173`		`- return nil, &arduino.MissingProgrammerError{}`
`174`		`- }`
`175`		`- if p, ok := platformRelease.Programmers[req.GetProgrammer()]; ok {`
`176`		`- toolProperties.Merge(p.Properties)`
`177`		`- } else if refP, ok := referencedPlatformRelease.Programmers[req.GetProgrammer()]; ok {`
`178`		`- toolProperties.Merge(refP.Properties)`
`179`		`- } else {`
`180`		`- return nil, &arduino.ProgrammerNotFoundError{Programmer: req.GetProgrammer()}`
	`172`	`+ if req.GetProgrammer() != "" {`
	`173`	`+ if p, ok := platformRelease.Programmers[req.GetProgrammer()]; ok {`
	`174`	`+ toolProperties.Merge(p.Properties)`
	`175`	`+ } else if refP, ok := referencedPlatformRelease.Programmers[req.GetProgrammer()]; ok {`
	`176`	`+ toolProperties.Merge(refP.Properties)`
	`177`	`+ } else {`
	`178`	`+ return nil, &arduino.ProgrammerNotFoundError{Programmer: req.GetProgrammer()}`
	`179`	`+ }`
`181`	`180`	`}`
`182`	`181`
`183`	`182`	`var importPath *paths.Path`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,12 +65,6 @@ func TestGetCommandLine(t *testing.T) {`
`65`	`65`	`pme, release := pm.NewExplorer()`
`66`	`66`	`defer release()`
`67`	`67`
`68`		`- {`
`69`		`- // Check programmer required`
`70`		`- _, err := getCommandLine(req, pme)`
`71`		`- require.Error(t, err)`
`72`		`- }`
`73`		`-`
`74`	`68`	`{`
`75`	`69`	`// Check programmer not found`
`76`	`70`	`req.Programmer = "not-existent"`

Lines changed: 0 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -336,9 +336,6 @@ func testAllDebugInformation(t testing.T, env integrationtest.Environment, cli`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`func testDebugCheck(t testing.T, env integrationtest.Environment, cli *integrationtest.ArduinoCLI) {`
`339`		`- _, _, err := cli.Run("debug", "check", "-b", "arduino:samd:mkr1000")`
`340`		`- require.Error(t, err)`
`341`		`-`
`342`	`339`	`out, _, err := cli.Run("debug", "check", "-b", "arduino:samd:mkr1000", "-P", "atmel_ice")`
`343`	`340`	`require.NoError(t, err)`
`344`	`341`	`require.Contains(t, string(out), "The given board/programmer configuration supports debugging.")`

Comments

(0)