Skip to content

build system: fix feature resolution#15974

Merged
fjmolinas merged 1 commit intoRIOT-OS:masterfrom
maribu:bugfix-features-required-any
Feb 9, 2021
Merged

build system: fix feature resolution#15974
fjmolinas merged 1 commit intoRIOT-OS:masterfrom
maribu:bugfix-features-required-any

Conversation

@maribu
Copy link
Member

@maribu maribu commented Feb 9, 2021

Contribution description

Fix FEATURES_REQUIRED_ANY using more features than needed.

Testing procedure

Test provided in #15973 should now pass.

Issues/PRs references

Bug introduced in #15957, fix suggested in #15957 (comment)

Fix FEATURES_REQUIRED_ANY using more features than needed.
@maribu maribu added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Area: build system Area: Build system labels Feb 9, 2021
@aabadie
Copy link
Contributor

aabadie commented Feb 9, 2021

Once this is merged, we should rerun all the PRs that took less than 20 minutes on Murdock.

@maribu
Copy link
Member Author

maribu commented Feb 9, 2021

Once this is merged, we should rerun all the PRs that took less than 20 minutes on Murdock.

Yeah, since #15957 is in the number of boards returned by make info-boards-supported is cut down to 30% of what it should be :-/

@maribu maribu added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Feb 9, 2021
@maribu
Copy link
Member Author

maribu commented Feb 9, 2021

OK, Murdock is slow again with this PR. I think this and the fact that it fixes the issue in the unit test indicates it fixes the regression :-)

@fjmolinas
Copy link
Contributor

OK, Murdock is slow again with this PR. I think this and the fact that it fixes the issue in the unit test indicates it fixes the regression :-)

I agree, lets ping ping a bit on the unittests but I rebased this one on top of #15973 and added a few test cases as well. Let's go ahead with this one.

Copy link
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK.

@fjmolinas
Copy link
Contributor

./tests/feature_resolution/check.sh 
Running test blacklist-success
Success
Running test blacklist-failure
Success
Running test required-any-order-2
Success
Running test empty
Success
Running test conflict-success
Success
Running test conflict-failure
Success
Running test required-any-corner-case
Success
Running test required-any-fail
Success
Running test required-any-reuse
Success
Running test required-any-order
Success
Running test trivial-success
Success
Running test trivial-failure
Success

@fjmolinas fjmolinas merged commit 92bc4c1 into RIOT-OS:master Feb 9, 2021
@maribu maribu deleted the bugfix-features-required-any branch March 31, 2021 08:02
@kaspar030 kaspar030 added this to the Release 2021.04 milestone Apr 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants