2 Commits

Author	SHA1	Message	Date
Pieter12345	e2d2998075	Fix MergeSketchWithUploaderText failing under Windows ... When having "autocrlf=input" (as described in the Building Arduino guide), the `.hex` files used in the test will be a different size due to the test expecting `\n` and git cloning as `\r\n`. This commit fixes this issue by removing cariage returns before running the test.	2019-03-26 18:46:09 +01:00
Federico Fissore	88e8019419	Extending remote upload. Sketch merge with bootloader is done by the IDE (using "noblink" bootloader if board definition provides one). If platform provides a "remote" upload tool, that tool is used, otherwise falls back to hardcoded "run-avrdude"	2015-06-18 15:43:10 +02:00