Added test for burn bootloader with bootloader.tool options override

Author: cmaglie

commands/upload/testdata/hardware/alice/avr/platform.txt

@@ -62,10 +62,18 @@ tools.one-extra-params.program.pattern={cmd.path} {conf.board} {conf.general} {p
 
 # Upload with programmer test 1
 tools.two.cmd.path=echo
-tools.two.conf.general=conf-general
-tools.two.upload.conf=conf-upload
-tools.two.upload.params.verbose=verbose
-tools.two.upload.params.quiet=quiet
-tools.two.upload.params.verify=verify
-tools.two.upload.params.noverify=noverify
-tools.two.upload.pattern={cmd.path} two {conf.board} {conf.general} {upload.conf} {upload.verbose} {upload.verify} {upload.protocol} "{serial.port}" -b{upload.speed} "{build.path}/{build.project_name}.hex"
+tools.two.conf.general=conf-two-general
+
+tools.two.erase.conf=conf-two-erase
+tools.two.erase.params.verbose=verbose
+tools.two.erase.params.quiet=quiet
+tools.two.erase.params.verify=verify
+tools.two.erase.params.noverify=noverify
+tools.two.erase.pattern={cmd.path} ERASE {conf.board} {conf.general} {erase.conf} {erase.verbose} {erase.verify} {bootloader.protocol} "{serial.port}" -b{upload.speed}
+
+tools.two.bootloader.conf=conf-two-bootloader
+tools.two.bootloader.params.verbose=verbose
+tools.two.bootloader.params.quiet=quiet
+tools.two.bootloader.params.verify=verify
+tools.two.bootloader.params.noverify=noverify
+tools.two.bootloader.pattern={cmd.path} BURN {conf.board} {conf.general} {bootloader.conf} {bootloader.verbose} {bootloader.verify} {bootloader.protocol} "{serial.port}" -b{upload.speed} -F{bootloader.fuses} "{runtime.platform.path}/bootloaders/{bootloader.file}"

commands/upload/testdata/hardware/alice/avr/programmers.txt

@@ -13,8 +13,7 @@ progr3.program.tool=one-extra-params
 progr3.program.extra_params={serial.port}
 
 progr4.name=Programmer 4
-progr4.program.protocol=prog4protocol
+progr4.program.protocol=prog4protocol-upload
 progr4.program.tool=one
 progr4.bootloader.protocol=prog4protocol-bootloader
-progr4.bootloader.tool=one
-progr4.protocol=genprog4protocol
+progr4.bootloader.tool=two

commands/upload/upload_test.go

@@ -166,6 +166,11 @@ func TestUploadPropertiesComposition(t *testing.T) {
 		{buildPath1, "alice:avr:board1", "port", "progr1", true,
 			"ERASE conf-board1 conf-general conf-erase $$VERBOSE-VERIFY$$ genprog1protocol port -bspeed",
 			"BURN conf-board1 conf-general conf-bootloader $$VERBOSE-VERIFY$$ genprog1protocol port -bspeed -F0xFF " + cwd + "/testdata/hardware/alice/avr/bootloaders/niceboot/niceboot.hex"},
+
+		// 12: burn bootloader, preferences override from programmers.txt
+		{buildPath1, "alice:avr:board1", "port", "progr4", true,
+			"ERASE conf-board1 conf-two-general conf-two-erase $$VERBOSE-VERIFY$$ prog4protocol-bootloader port -bspeed",
+			"BURN conf-board1 conf-two-general conf-two-bootloader $$VERBOSE-VERIFY$$ prog4protocol-bootloader port -bspeed -F0xFF " + cwd + "/testdata/hardware/alice/avr/bootloaders/niceboot/niceboot.hex"},
 	}
 	for i, test := range tests {
 		t.Run(fmt.Sprintf("SubTest%02d", i), func(t *testing.T) {