Further refine the cases handled by --input-dir #991
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
Using `--input-dir path/to/firmware` with a directory containing: path/to/firmware/firmware.ino.bin path/to/firmware/some_other_firmware_name.ino.bin should not fail but select `firmware.ino.bin` for upload because the containing folder has the same name. See arduino#765 (comment)
silvanocerza
approved these changes
Oct 14, 2020
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 comes as a regression fix after seeing the comment from @janjongboom #765 (comment).
In arduino-cli 0.12.0 (and previous) using
--input-dir path/to/firmwarewith a directory containing:will not produce any error and the CLI will successfully upload using
firmware.ino.bin(because the containing folder had the same namefirmwareas the file used for uploadfirmware.ino.bin).After reintroducing the
--input-fileflag in #777 we had to change the search algorithm in the build-path folder, but to avoid regressions we also implemented a very long unit-test coverage... but the case listed above was not considered 🤦This PR restore the previous behavior in that particular case and adds the case in the test coverage.