tools: add capability to provide make command via environment #14459
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
Not all operating systems name the GNU Make `make`. FreeBSD e.g. uses a different dialect of Make, that seems to be incompatible with GNU make. (I wasn't able to get `make` run, but `gmake` works). This allows our test scripts to be configured via the environment variable `MAKE` to point to a different make command.
miri64
added
Type: enhancement
miri64
requested review from
aabadie,
leandrolanzieri,
MrKevinWeiss and
fjmolinas
miri64
added
the
CI: run tests
aabadie
added
the
CI: ready for build
aabadie
approved these changes
Jul 9, 2020
There was a problem hiding this comment.
Tested all mentioned tools and all worked as expected (except tests/warn_conflict but that's a different issue and is addressed by #14474).
For testing, I did the opposite as you did in FreeBSD:
sudo /usr/bin/ln -s /usr/bin/make /usr/bin/gmake
Code changes are good.
ACK!
aabadie
reviewed
Jul 9, 2020
| @@ -41,13 +41,14 @@ | |||
| TESTRUNNER_RESET_AFTER_TERM = int(os.environ.get('TESTRUNNER_RESET_AFTER_TERM') | |||
| or '0') | |||
|
|
|||
| MAKE = os.environ.get('MAKE', 'make') | |||
There was a problem hiding this comment.
Reported by Travis:
Suggested change
| MAKE = os.environ.get('MAKE', 'make') | |
| MAKE = os.environ.get('MAKE', 'make') | |
For those tests that don't use the tooling fixed in the previous commit
miri64
force-pushed
the
tools/enh/make-env
branch
from
77ebb41 to
1cb0e09
Compare
|
The run failures on Murdock are unrelated. I think there's an issue with one of the nrf52dk workers. Re-triggering Murdock without "run tests" label. |
aabadie
added
CI: ready for build
|
Then |
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.
Contribution description
This PR enables the user to set the name of the
makecommand via theMAKEenvironment variable in our test scripts. If it is not provided it defaults to justmakein all cases.While not strictly necessary for the use with FreeBSD, as one could bend the
gmakecommand accordingly there to not use the incompatible BSD MakeRIOT/dist/tools/vagrant/freebsd/Vagrantfile
Lines 24 to 28 in 8204931
I find it friendlier if that would be not needed to run our scripts (I can imagine similar problems might be faced on Mac OS X and Windows).
Testing procedure
Touched tools and tests should be run
dist/tools/ci/print_toolchain_versions.shtestrunner(one should be enough, but we can also just runCI: run tests)dist/tools/compile_and_test_for_board/compile_and_test_for_board.pyfor at least one boarddist/tools/compile_test/compile_test.pyfor at most one application combination (can be canceled after the first application passes)tests/lwiponnativetests/riotboottests/warn_conflictsIssues/PRs references
Discovered while working on #14458, but not required for it.