@@ -53,12 +53,12 @@ func TestGetCommandLine(t *testing.T) {
53
53
SketchPath : sketchPath .String (),
54
54
}
55
55
56
- goldCommand := fmt .Sprintf ("%s/arduino-test/tools/arm-none-eabi-gcc/7-2017q4/bin// arm-none-eabi-gdb%s" , dataDir , toolExtension ) +
57
- " --interpreter=console -ex target extended-remote |" +
58
- fmt .Sprintf (" %s/arduino-test/tools/openocd/0.10.0-arduino7/bin/openocd%s" , dataDir , toolExtension ) +
56
+ goldCommand := fmt .Sprintf ("%s/arduino-test/tools/arm-none-eabi-gcc/7-2017q4/bin/arm-none-eabi-gdb%s" , dataDir , toolExtension ) +
57
+ " --interpreter=console -ex set remotetimeout 5 -ex target extended-remote |" +
58
+ fmt .Sprintf (" \" %s/arduino-test/tools/openocd/0.10.0-arduino7/bin/openocd%s\" " , dataDir , toolExtension ) +
59
59
fmt .Sprintf (" -s \" %s/arduino-test/tools/openocd/0.10.0-arduino7/share/openocd/scripts/\" " , dataDir ) +
60
60
fmt .Sprintf (" --file \" %s/arduino-test/samd/variants/arduino_zero/openocd_scripts/arduino_zero.cfg\" " , customHardware ) +
61
- fmt .Sprintf (" -c \" gdb_port pipe\" -c \" telnet_port 0\" -c init -c halt %s/build/arduino-test.samd.arduino_zero_edbg/hello.ino.elf" , sketchPath )
61
+ fmt .Sprintf (" -c \" gdb_port pipe\" -c \" telnet_port 0\" %s/build/arduino-test.samd.arduino_zero_edbg/hello.ino.elf" , sketchPath )
62
62
63
63
command , err := getCommandLine (req , pm )
64
64
require .Nil (t , err )
@@ -74,12 +74,12 @@ func TestGetCommandLine(t *testing.T) {
74
74
Interpreter : "mi1" ,
75
75
}
76
76
77
- goldCommand2 := fmt .Sprintf ("%s/arduino-test/tools/arm-none-eabi-gcc/7-2017q4/bin// arm-none-eabi-gdb%s" , dataDir , toolExtension ) +
78
- " --interpreter=mi1 -ex target extended-remote |" +
79
- fmt .Sprintf (" %s/arduino-test/tools/openocd/0.10.0-arduino7/bin/openocd%s" , dataDir , toolExtension ) +
77
+ goldCommand2 := fmt .Sprintf ("%s/arduino-test/tools/arm-none-eabi-gcc/7-2017q4/bin/arm-none-eabi-gdb%s" , dataDir , toolExtension ) +
78
+ " --interpreter=mi1 -ex set pagination off -ex set remotetimeout 5 -ex target extended-remote |" +
79
+ fmt .Sprintf (" \" %s/arduino-test/tools/openocd/0.10.0-arduino7/bin/openocd%s\" " , dataDir , toolExtension ) +
80
80
fmt .Sprintf (" -s \" %s/arduino-test/tools/openocd/0.10.0-arduino7/share/openocd/scripts/\" " , dataDir ) +
81
81
fmt .Sprintf (" --file \" %s/arduino-test/samd/variants/mkr1000/openocd_scripts/arduino_zero.cfg\" " , customHardware ) +
82
- fmt .Sprintf (" -c \" gdb_port pipe\" -c \" telnet_port 0\" -c init -c halt %s/build/arduino-test.samd.mkr1000/hello.ino.elf" , sketchPath )
82
+ fmt .Sprintf (" -c \" gdb_port pipe\" -c \" telnet_port 0\" %s/build/arduino-test.samd.mkr1000/hello.ino.elf" , sketchPath )
83
83
84
84
command2 , err := getCommandLine (req2 , pm )
85
85
assert .Nil (t , err )
0 commit comments