diff mbox series

Update kernel version to 6.0 in header constant tests

Message ID alpine.DEB.2.22.394.2210052140080.917581@digraph.polyomino.org.uk
State New
Headers show
Series Update kernel version to 6.0 in header constant tests | expand

Commit Message

Joseph Myers Oct. 5, 2022, 9:40 p.m. UTC
This patch updates the kernel version in the tests tst-mman-consts.py,
tst-mount-consts.py and tst-pidfd-consts.py to 6.0.  (There are no new
constants covered by these tests in 6.0 that need any other header
changes.)

Tested with build-many-glibcs.py.

Comments

H.J. Lu Oct. 5, 2022, 9:59 p.m. UTC | #1
On Wed, Oct 5, 2022 at 2:40 PM Joseph Myers <joseph@codesourcery.com> 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.0.  (There are no new
> constants covered by these tests in 6.0 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 2374af288b..026f2b7072 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 = (5, 19)
> +    linux_version_glibc = (6, 0)
>      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 c6307cb5c2..813e1b047f 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 v5.19.  When glibc
> +    # Constants in glibc were updated to match Linux v6.0.  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 = (5, 19)
> +    linux_version_glibc = (6, 0)
>      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 d732173abd..7c2fb67342 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 = (5, 19)
> +    linux_version_glibc = (6, 0)
>      sys.exit(glibcextract.compare_macro_consts(
>                  '#include <sys/pidfd.h>\n',
>                  '#include <asm/fcntl.h>\n'
>
> --
> Joseph S. Myers
> joseph@codesourcery.com

LGTM.

Thanks.
diff mbox series

Patch

diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py
index 2374af288b..026f2b7072 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 = (5, 19)
+    linux_version_glibc = (6, 0)
     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 c6307cb5c2..813e1b047f 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 v5.19.  When glibc
+    # Constants in glibc were updated to match Linux v6.0.  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 = (5, 19)
+    linux_version_glibc = (6, 0)
     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 d732173abd..7c2fb67342 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 = (5, 19)
+    linux_version_glibc = (6, 0)
     sys.exit(glibcextract.compare_macro_consts(
                 '#include <sys/pidfd.h>\n',
                 '#include <asm/fcntl.h>\n'