From 5fcee06dc7f368770c17f9a69b59fa68119a1cec Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 19 Dec 2024 15:38:59 +0000 Subject: [PATCH] Update kernel version to 6.12 in header constant tests There are no new constants covered by tst-mman-consts.py, tst-mount-consts.py or tst-pidfd-consts.py in Linux 6.12 that need any header changes, so update the kernel version in those tests. (tst-sched-consts.py will need updating separately along with adding SCHED_EXT.) Tested with build-many-glibcs.py. --- sysdeps/unix/sysv/linux/tst-mman-consts.py | 2 +- sysdeps/unix/sysv/linux/tst-mount-consts.py | 4 ++-- sysdeps/unix/sysv/linux/tst-pidfd-consts.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py index 2191bea36f..584936efec 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, 11) + linux_version_glibc = (6, 12) sys.exit(glibcextract.compare_macro_consts( '#define _GNU_SOURCE 1\n' '#include \n', diff --git a/sysdeps/unix/sysv/linux/tst-mount-consts.py b/sysdeps/unix/sysv/linux/tst-mount-consts.py index b71d8a489d..e77579033b 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.10. When glibc + # Constants in glibc were updated to match Linux v6.12. 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, 11) + linux_version_glibc = (6, 12) def check(cte, exclude=None): return glibcextract.compare_macro_consts( '#include \n', diff --git a/sysdeps/unix/sysv/linux/tst-pidfd-consts.py b/sysdeps/unix/sysv/linux/tst-pidfd-consts.py index 9d53102cbd..ef896394bd 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, 11) + linux_version_glibc = (6, 12) sys.exit(glibcextract.compare_macro_consts( '#include \n', '#include \n'