Fix util shell scripts to be compatible with BSD #5774
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
|
GNU testsuite comparison: |
- For shell scripts using bash, use #!/usr/bin/env bash instead of #!/bin/bash.
On some OS, bash is not the default shell and is not installed as /bin/bash
Signed-off-by: Laurent Cheylus <[email protected]>
- Define variables for GNU version of make, nproc, readlink and sed and use them on BSD.
- In specific cases (option -z not available on BSD and with command /c), use GNU sed instead of
BSD sed.
- For xargs, --no-run-if-empty option is a GNU extension. Replace it by -r to be compatible with
FreeBSD and OpenBSD xargs command.
Signed-off-by: Laurent Cheylus <[email protected]>
- Use /usr/bin/env bash instead of /bin/sh to define OSTYPE - Use GNU realpath on BSD OS (FreeBSD and OpenBSD) Signed-off-by: Laurent Cheylus <[email protected]>
- Use /usr/bin/env bash instead of /bin/sh to use OSTYPE
- Use readlink from GNU coreutils on BSD OS in util/build-code_coverage.sh and
util/show-code_coverage.sh scripts
Signed-off-by: Laurent Cheylus <[email protected]>
- Use /usr/bin/env bash instead of /bin/sh to use OSTYPE - Define variables for GNU version of make, nproc, readlink and use them on BSD. Signed-off-by: Laurent Cheylus <[email protected]>
- util/show-utils.sh script is used by FreeBSD workflow => use realpath
command from GNU coreutils instead of FreeBSD realpath.
- install GNU coreutils (FreeBSD package coreutils) in style job
Signed-off-by: Laurent Cheylus <[email protected]>
…n tests Signed-off-by: Laurent Cheylus <[email protected]>
|
Good job, thanks! |
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.
stylejob forutil/show-utils.shscript)Fix #5598
Tested on Linux (Debian testing), FreeBSD 14.0 and OpenBSD-current (amd64):
util/build-gnu.shscriptutil/run-gnu-test.shscript