ZTS: handle FreeBSD version numbers correctly #16340
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
FreeBSD patchlevel versions are optional and, if present, in a different location in the version string. Sponsored-by: https://despairlabs.com/sponsor/ Signed-off-by: Rob Norris <[email protected]>
robn
referenced
this pull request
in robn/zfs
Jul 11, 2024
Linux kernel versions have a minor number:
$ uname -r
6.1.0-21-amd64
FreeBSD does not (at least, not visibly in the output from uname -r):
$ uname -r
14.1-RELEASE
So, make the minor optional. We'll treat it as zero.
This should be sufficient as long as the FreeBSD minor verson
("patchlevel") is not needed for tests.
Sponsored-by: https://despairlabs.com/sponsor/
Signed-off-by: Rob Norris <[email protected]>
amotin
approved these changes
Jul 11, 2024
tonyhutter
approved these changes
Jul 11, 2024
mcmilk
approved these changes
Jul 11, 2024
Yes, it works as expected on FreeBSD 14 + 15 👍 |
robn
added a commit
to robn/zfs
that referenced
this pull request
Jul 17, 2024
FreeBSD patchlevel versions are optional and, if present, in a different location in the version string. Sponsored-by: https://despairlabs.com/sponsor/ Signed-off-by: Rob Norris <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Tino Reichardt <[email protected]> Reviewed-by: Tony Hutter <[email protected]>
calccrypto
pushed a commit
to hpc/zfs
that referenced
this pull request
Jul 17, 2024
FreeBSD patchlevel versions are optional and, if present, in a different location in the version string. Sponsored-by: https://despairlabs.com/sponsor/ Signed-off-by: Rob Norris <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Tino Reichardt <[email protected]> Reviewed-by: Tony Hutter <[email protected]>
lundman
pushed a commit
to openzfsonwindows/openzfs
that referenced
this pull request
Sep 4, 2024
FreeBSD patchlevel versions are optional and, if present, in a different location in the version string. Sponsored-by: https://despairlabs.com/sponsor/ Signed-off-by: Rob Norris <[email protected]> Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Tino Reichardt <[email protected]> Reviewed-by: Tony Hutter <[email protected]>
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.
Motivation and Context
@mcmilk wondered why the "FreeBSD 14+" version tests in the block cloning tests were failing. This is at least part of why!
Description
FreeBSD kernel version numbers (ie the output from
uname -r) don't match the Linux format; the patchlevel is expressed differently. This sets up OS-specific checks.How Has This Been Tested?
By hand on CentOS 7, Fedora 37 and Debian 12.6, and FreeBSD 13.2-RELEASE-p4, 14.0-RELEASE and 15.0-CURRENT.
Note "by hand": I ran ksh, pasted in the
kernel_versionfunction, setUNAME, then calledkernel_versionand eyeballed output. I don't have ZTS on most of these systems so it hasn't been used for real.Types of changes
Checklist:
Signed-off-by.