Added test for upload without programmer (with and w/o port)

Author: cmaglie

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

@@ -26,5 +26,3 @@ board2.bootloader.extended_fuses=0xFD
 board2.bootloader.unlock_bits=0x3F
 board2.bootloader.lock_bits=0x0F
 board2.bootloader.file=optiboot/optiboot_atmega328.hex
-
-

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

@@ -11,6 +11,13 @@ tools.one.upload.params.verify=verify
 tools.one.upload.params.noverify=noverify
 tools.one.upload.pattern={cmd.path} {conf.board} {conf.general} {upload.conf} {upload.verbose} {upload.verify} {upload.protocol} "{serial.port}" -b{upload.speed} "{build.path}/{build.project_name}.hex"
 
+tools.one.program.conf=conf-program
+tools.one.program.params.verbose=verbose
+tools.one.program.params.quiet=quiet
+tools.one.program.params.verify=verify
+tools.one.program.params.noverify=noverify
+tools.one.program.pattern={cmd.path} {conf.board} {conf.general} {program.conf} {program.verbose} {program.verify} {program.protocol} "{serial.port}" -b{upload.speed} "{build.path}/{build.project_name}.hex"
+
 # Upload test 2
 tools.one-noport.cmd.path=echo
 tools.one-noport.conf.general=conf-general
@@ -20,3 +27,31 @@ tools.one-noport.upload.params.quiet=quiet
 tools.one-noport.upload.params.verify=verify
 tools.one-noport.upload.params.noverify=noverify
 tools.one-noport.upload.pattern={cmd.path} {conf.board} {conf.general} {upload.conf} {upload.verbose} {upload.verify} {upload.protocol} -b{upload.speed} "{build.path}/{build.project_name}.hex"
+
+tools.one-noport.program.conf=conf-program
+tools.one-noport.program.params.verbose=verbose
+tools.one-noport.program.params.quiet=quiet
+tools.one-noport.program.params.verify=verify
+tools.one-noport.program.params.noverify=noverify
+tools.one-noport.program.pattern={cmd.path} {conf.board} {conf.general} {program.conf} {program.verbose} {program.verify} {program.protocol} -b{upload.speed} "{build.path}/{build.project_name}.hex"
+
+# Recipes for "tool.one-extra-params"
+tools.one-extra-params.cmd.path=echo
+tools.one-extra-params.conf.general=conf-general
+
+tools.one-extra-params.program.conf=conf-program
+tools.one-extra-params.program.params.verbose=verbose
+tools.one-extra-params.program.params.quiet=quiet
+tools.one-extra-params.program.params.verify=verify
+tools.one-extra-params.program.params.noverify=noverify
+tools.one-extra-params.program.pattern={cmd.path} {conf.board} {conf.general} {program.conf} {program.verbose} {program.verify} {program.protocol} {program.extra_params} -b{upload.speed} "{build.path}/{build.project_name}.hex"
+
+# 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"

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

@@ -0,0 +1,20 @@
+progr1.name=Programmer 1
+progr1.program.protocol=progprotocol
+progr1.program.tool=one
+progr1.protocol=genprog1protocol
+
+progr2.name=Programmer 2
+progr2.program.protocol=prog2protocol
+progr2.program.tool=one-noport
+
+progr3.name=Programmer 3
+progr3.program.protocol=prog3protocol
+progr3.program.tool=one-extra-params
+progr3.program.extra_params={serial.port}
+
+progr4.name=Programmer 4
+progr4.program.protocol=prog4protocol
+progr4.program.tool=one
+progr4.bootloader.protocol=prog4protocol-bootloader
+progr4.bootloader.tool=one
+progr4.protocol=genprog4protocol

commands/upload/upload_test.go

@@ -145,6 +145,16 @@ func TestUploadPropertiesComposition(t *testing.T) {
 		// classic upload, no port
 		{buildPath1, "alice:avr:board2", "port", "", false, "conf-board1 conf-general conf-upload $$VERBOSE-VERIFY$$ protocol -bspeed testdata/build_path_1/sketch.ino.hex"},
 		{buildPath1, "alice:avr:board2", "", "", false, "conf-board1 conf-general conf-upload $$VERBOSE-VERIFY$$ protocol -bspeed testdata/build_path_1/sketch.ino.hex"},
+
+		// upload with programmer, requires port
+		{buildPath1, "alice:avr:board1", "port", "progr1", false, "conf-board1 conf-general conf-program $$VERBOSE-VERIFY$$ progprotocol port -bspeed testdata/build_path_1/sketch.ino.hex"},
+		{buildPath1, "alice:avr:board1", "", "progr1", false, "FAIL"},
+		// upload with programmer, no port
+		{buildPath1, "alice:avr:board1", "port", "progr2", false, "conf-board1 conf-general conf-program $$VERBOSE-VERIFY$$ prog2protocol -bspeed testdata/build_path_1/sketch.ino.hex"},
+		{buildPath1, "alice:avr:board1", "", "progr2", false, "conf-board1 conf-general conf-program $$VERBOSE-VERIFY$$ prog2protocol -bspeed testdata/build_path_1/sketch.ino.hex"},
+		// upload with programmer, require port through extra params
+		{buildPath1, "alice:avr:board1", "port", "progr3", false, "conf-board1 conf-general conf-program $$VERBOSE-VERIFY$$ prog3protocol port -bspeed testdata/build_path_1/sketch.ino.hex"},
+		{buildPath1, "alice:avr:board1", "", "progr3", false, "FAIL"},
 	}
 	for i, test := range tests {
 		t.Run(fmt.Sprintf("SubTest%02d", i), func(t *testing.T) {