-
Notifications
You must be signed in to change notification settings - Fork 7.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
tests: Add options. #6916
tests: Add options. #6916
Conversation
d7b077e
to
011a52c
Compare
S3 builds are failing with:
Why doesn't S3 have a (This doesn't fail on the on-push workflow because there we pass a fixed FQBN that does not contain FlashFreq.) |
Yes there is a reason and future chips will probably be the same. We used to have way too many options available and too many cases to cover (8 bootloaders + some different libs for each chip). With OPI and 120MHz as options, that would have brought even more bootloaders, etc. So for S3 we go simple. See here |
Simple is better, however what's the plan for older chips? Is there any plans to drop the extra options and combine flash mode and frequency or S3 is gonna stay as a special case for now? It's simple to just |
Future chips, I hope, will be like S3. For C3 and S2 we can probably go more or less the same, except OPI and 120MHz, but on ESP32 situation is different and I have boards that run on dout, dio and qio (different freqs as well) so for that chip, things must stay as they are |
.github/scripts/sketch_utils.sh
Outdated
;; | ||
esac | ||
|
||
partition="PartitionScheme=$partition_opt" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will suggest to extract the option names also from some argument. We should not be limited by these options, nor we should need to change them if we adjust the options in Arduino's configs. We can have the default FQBNs defined somewhere, if special is needed, then JSON should be provided.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only added the basics that (I thought) will be present in all chips. For further customization one can pass a whole FQBN, this is not very different from passing options with their names. It can save some typing if we extended options to the common parts, for instance for S3 the FQBN will start with espressif:esp32:esp32s3:
and then we extend it with ./tests_build.sh -t esp32s3 -a "FlashMode=qio120,PartitionScheme=huge_app
, the resulting FQBN will be espressif:esp32:esp32s3:FlashMode=qio120,PartitionScheme=huge_app
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this case those flash options are useless and cumbersome, I can just remove them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this case those flash options are useless and cumbersome, I can just remove them.
I did so.
577e88b
to
bf9d239
Compare
b239006
to
480e4fb
Compare
@Ouss4 can this be merged? Thanks! |
From my side yes, unless someone else has any concerns or new idea to add. |
@SuGlider & @P-R-O-C-H-Y Please help with reviews and we can proceed to merging. |
LGTM |
…s in case a customization is required. Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
configurations. Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
script. Multiple arguments and options were not set correctly. Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
with only one option take is supposed to take any extra FQBN addition. Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
up. Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
Looks like the branch was rebased using the Web UI which added a merge commit. Last force push was just to remove it. |
Sorry @Ouss4, my bad. Can you fix it back? |
No problem, I already did. :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lets merge it :)
I promise last question before a merging :) @Ouss4 There is bunch of commits, do you want to keep a history and maybe clean it a bit or can it be squashed into 1 commit? |
Usually, I keep separate logical changes in different commits, but the workflow here was to squash merge everything from the UI, so I may not have payed a lot of attention to the history. Feel free to squash merge everything in one commit. |
Description of Change
Add multiple options to the test scripts.
-e
option. Second, this belongs topytest-embedded
, and should be added there, tests that require to erase the flash will be parameterized something like:There is a function already that does this but it's not public and only part of the IDF service. This needs to be generic.
These options can be used as:
-fm dio
; here the FQBN will be constructed from these options.fqbn
array will have a corresponding build.Tests scenarios
Locally with the provided scripts.
CI will test the rest.
Related links
#6885
Closes #6884