Update kernel version to 6.7 in header constant tests
Checks
Context |
Check |
Description |
redhat-pt-bot/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
redhat-pt-bot/TryBot-32bit |
success
|
Build for i686
|
linaro-tcwg-bot/tcwg_glibc_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-arm |
warning
|
Patch is already merged
|
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 |
warning
|
Patch is already merged
|
Commit Message
This patch updates the kernel version in the tests tst-mman-consts.py,
tst-mount-consts.py and tst-pidfd-consts.py to 6.7. (There are no new
constants covered by these tests in 6.7 that need any other header
changes.)
Tested with build-many-glibcs.py.
Comments
On 17/01/24 16:18, Joseph Myers wrote:
> This patch updates the kernel version in the tests tst-mman-consts.py,
> tst-mount-consts.py and tst-pidfd-consts.py to 6.7. (There are no new
> constants covered by these tests in 6.7 that need any other header
> changes.)
>
> Tested with build-many-glibcs.py.
>
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py
> index fb81f39b26..a7e1015328 100644
> --- a/sysdeps/unix/sysv/linux/tst-mman-consts.py
> +++ b/sysdeps/unix/sysv/linux/tst-mman-consts.py
> @@ -33,7 +33,7 @@ def main():
> help='C compiler (including options) to use')
> args = parser.parse_args()
> linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc)
> - linux_version_glibc = (6, 6)
> + linux_version_glibc = (6, 7)
> sys.exit(glibcextract.compare_macro_consts(
> '#define _GNU_SOURCE 1\n'
> '#include <sys/mman.h>\n',
> diff --git a/sysdeps/unix/sysv/linux/tst-mount-consts.py b/sysdeps/unix/sysv/linux/tst-mount-consts.py
> index 5724e04c27..175bd8d23a 100755
> --- a/sysdeps/unix/sysv/linux/tst-mount-consts.py
> +++ b/sysdeps/unix/sysv/linux/tst-mount-consts.py
> @@ -39,10 +39,10 @@ def main():
> sys.exit (77)
>
> linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc)
> - # Constants in glibc were updated to match Linux v6.6. When glibc
> + # Constants in glibc were updated to match Linux v6.7. When glibc
> # constants are updated this value should be updated to match the
> # released kernel version from which the constants were taken.
> - linux_version_glibc = (6, 6)
> + linux_version_glibc = (6, 7)
> def check(cte, exclude=None):
> return glibcextract.compare_macro_consts(
> '#include <sys/mount.h>\n',
> diff --git a/sysdeps/unix/sysv/linux/tst-pidfd-consts.py b/sysdeps/unix/sysv/linux/tst-pidfd-consts.py
> index 95224278a0..2f877722ad 100644
> --- a/sysdeps/unix/sysv/linux/tst-pidfd-consts.py
> +++ b/sysdeps/unix/sysv/linux/tst-pidfd-consts.py
> @@ -39,7 +39,7 @@ def main():
> sys.exit (77)
>
> linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc)
> - linux_version_glibc = (6, 6)
> + linux_version_glibc = (6, 7)
> sys.exit(glibcextract.compare_macro_consts(
> '#include <sys/pidfd.h>\n',
> '#include <asm/fcntl.h>\n'
>
@@ -33,7 +33,7 @@ def main():
help='C compiler (including options) to use')
args = parser.parse_args()
linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc)
- linux_version_glibc = (6, 6)
+ linux_version_glibc = (6, 7)
sys.exit(glibcextract.compare_macro_consts(
'#define _GNU_SOURCE 1\n'
'#include <sys/mman.h>\n',
@@ -39,10 +39,10 @@ def main():
sys.exit (77)
linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc)
- # Constants in glibc were updated to match Linux v6.6. When glibc
+ # Constants in glibc were updated to match Linux v6.7. When glibc
# constants are updated this value should be updated to match the
# released kernel version from which the constants were taken.
- linux_version_glibc = (6, 6)
+ linux_version_glibc = (6, 7)
def check(cte, exclude=None):
return glibcextract.compare_macro_consts(
'#include <sys/mount.h>\n',
@@ -39,7 +39,7 @@ def main():
sys.exit (77)
linux_version_headers = glibcsyscalls.linux_kernel_version(args.cc)
- linux_version_glibc = (6, 6)
+ linux_version_glibc = (6, 7)
sys.exit(glibcextract.compare_macro_consts(
'#include <sys/pidfd.h>\n',
'#include <asm/fcntl.h>\n'