Fix sketch metadata loader #690
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
case 1: /path/to/sketch case 2: /path/to/sketch/sketch.ino in the case 2 a compile+upload combo gives the following error: Error during Upload: cannot open sketch: stat /tmp/pytest-of-megabug/pytest-35/ArduinoTest1/CompileAndUploadIntegrationTest/CompileAndUploadIntegrationTest.ino/CompileAndUploadIntegrationTest.ino.arduino.samd.mkr1000.bin: not a directory
Paths are converted to \ when extracting Parent(). === RUN TestSketchLoadingFromFolderOrMainFile testdata/Sketch1 == testdata/Sketch1 testdata\Sketch1 == testdata/Sketch1
rsora
approved these changes
May 7, 2020
This was referenced May 8, 2020
per1234
added
topic: code
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR makes
sketches.NewSketchFromPathtolerant to different input paths:sketch := sketches.NewSketchFromPath(paths.New("path/to/sketch"))sketch := sketches.NewSketchFromPath(paths.New("path/to/sketch/sketch.ino"))Previously the function would return different
Sketchstruct with differentNamefields:sketch.Name == "sketch"sketch.Name == "sketch.ino"now it will return the same
Nameconsistently in both cases:sketch.Name == "sketch"sketch.Name == "sketch"This PR solves the different treatment of sketch path argument between
compile,uploadanddebug. In particular, using the combinedcompile + uploadwith a sketch path containing.inopreviously produced a sucessful compile followed by an upload error (because upload will not find the output file due to the extra.ino. This behaviour is now fixed.