| Message ID | 5986364-58d1-fb92-dda8-2532b23710f@codesourcery.com |
|---|---|
| State | New |
| Headers | show |
| Series | Update kernel version to 6.1 in header constant tests | expand |
* Joseph Myers: > This patch updates the kernel version in the tests tst-mman-consts.py, > tst-mount-consts.py and tst-pidfd-consts.py to 6.1. (There are no new > constants covered by these tests in 6.1 that need any other header > changes.) > > Tested with build-many-glibcs.py. > > diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py > index 026f2b7072..7f6f2d12e6 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, 0) > + linux_version_glibc = (6, 1) > 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 813e1b047f..40fec7b4c2 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.0. When glibc > + # Constants in glibc were updated to match Linux v6.1. 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, 0) > + linux_version_glibc = (6, 1) > 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 7c2fb67342..eaa3a776e2 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, 0) > + linux_version_glibc = (6, 1) > sys.exit(glibcextract.compare_macro_consts( > '#include <sys/pidfd.h>\n', > '#include <asm/fcntl.h>\n' This looks okay, too, thanks. Florian
diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py index 026f2b7072..7f6f2d12e6 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, 0) + linux_version_glibc = (6, 1) 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 813e1b047f..40fec7b4c2 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.0. When glibc + # Constants in glibc were updated to match Linux v6.1. 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, 0) + linux_version_glibc = (6, 1) 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 7c2fb67342..eaa3a776e2 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, 0) + linux_version_glibc = (6, 1) sys.exit(glibcextract.compare_macro_consts( '#include <sys/pidfd.h>\n', '#include <asm/fcntl.h>\n'