Commit ef72bde

authored

Added programmer field in debug info output (#2391)

* Added `programmer` field to debug info response * Added integration test

1 parent 6753a12 commit ef72bdeCopy full SHA for ef72bde

File tree

+26

-6

lines changed

+26

-6

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,7 @@ func getDebugProperties(req rpc.GetDebugConfigRequest, pme packagemanager.Expl`
`197`	`197`	`ToolchainPrefix: debugProperties.Get("toolchain.prefix"),`
`198`	`198`	`ToolchainConfiguration: &toolchainConfiguration,`
`199`	`199`	`CortexDebugCustomJson: cortexDebugCustomJson,`
	`200`	`+ Programmer: req.GetProgrammer(),`
`200`	`201`	`}, nil`
`201`	`202`	`}`
`202`	`203`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ type debugInfoResult struct {`
`126`	`126`	ServerConfig any `json:"server_configuration,omitempty"`
`127`	`127`	SvdFile string `json:"svd_file,omitempty"`
`128`	`128`	CortexDebugCustomConfig any `json:"cortex-debug_custom_configuration,omitempty"`
	`129`	+ Programmer string `json:"programmer"`
`129`	`130`	`}`
`130`	`131`
`131`	`132`	`type openOcdServerConfigResult struct {`
`@@ -166,6 +167,7 @@ func newDebugInfoResult(info rpc.GetDebugConfigResponse) debugInfoResult {`
`166`	`167`	`ServerConfig: serverConfig,`
`167`	`168`	`SvdFile: info.SvdFile,`
`168`	`169`	`CortexDebugCustomConfig: cortexDebugCustomConfig,`
	`170`	`+ Programmer: info.Programmer,`
`169`	`171`	`}`
`170`	`172`	`}`
`171`	`173`

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,8 @@ func testAllDebugInformation(t testing.T, env integrationtest.Environment, cli`
`147`	`147`	`"thb setup",`
`148`	`148`	`"c"`
`149`	`149`	`]`
`150`		`- }`
	`150`	`+ },`
	`151`	`+ "programmer": "atmel_ice"`
`151`	`152`	}`)
`152`	`153`	`}`
`153`	`154`
`@@ -189,7 +190,8 @@ func testAllDebugInformation(t testing.T, env integrationtest.Environment, cli`
`189`	`190`	`"thb setup",`
`190`	`191`	`"c"`
`191`	`192`	`]`
`192`		`- }`
	`193`	`+ },`
	`194`	`+ "programmer": "my_cold_ice"`
`193`	`195`	}`)
`194`	`196`
`195`	`197`	`{`
`@@ -211,7 +213,8 @@ func testAllDebugInformation(t testing.T, env integrationtest.Environment, cli`
`211`	`213`	`"single-script"`
`212`	`214`	`]`
`213`	`215`	`},`
`214`		`- "svd_file": "svd-file"`
	`216`	`+ "svd_file": "svd-file",`
	`217`	`+ "programmer": "atmel_ice"`
`215`	`218`	}`)
`216`	`219`	`}`
`217`	`220`
`@@ -234,7 +237,8 @@ func testAllDebugInformation(t testing.T, env integrationtest.Environment, cli`
`234`	`237`	`"cold_ice_script"`
`235`	`238`	`]`
`236`	`239`	`},`
`237`		`- "svd_file": "svd-file"`
	`240`	`+ "svd_file": "svd-file",`
	`241`	`+ "programmer": "my_cold_ice"`
`238`	`242`	}`)
`239`	`243`	`}`
`240`	`244`

Lines changed: 13 additions & 2 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,8 @@ message GetDebugConfigResponse {`
`96`	`96`	`string cortex_debug_custom_json = 9;`
`97`	`97`	`// the SVD file to use`
`98`	`98`	`string svd_file = 10;`
	`99`	`+ // The programmer specified in the request`
	`100`	`+ string programmer = 11;`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`// Configurations specific for the 'gcc' toolchain`

Comments

(0)