diff mbox series

Update kernel version to 6.2 in header constant tests

Message ID 67149734-443c-f12b-613-dbabd54a9ec@codesourcery.com
State New
Headers show
Series Update kernel version to 6.2 in header constant tests | expand

Commit Message

Joseph Myers Feb. 24, 2023, 12:23 a.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.2.  (There are no new
constants covered by these tests in 6.2 that need any other header
changes, and the removed MAP_VARIABLE for hppa was addressed
separately.)

Tested with build-many-glibcs.py.

Comments

Carlos O'Donell March 4, 2023, 5:16 p.m. UTC | #1
On 2/23/23 19:23, 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.2.  (There are no new
> constants covered by these tests in 6.2 that need any other header
> changes, and the removed MAP_VARIABLE for hppa was addressed
> separately.)
> 
> Tested with build-many-glibcs.py.

LGTM.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

> 
> diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py
> index 92b78a877c..ba6f21992a 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, 1)
> +    linux_version_glibc = (6, 2)

OK. 1/3 required.

>      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 d31b482adb..0845ada0ac 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.1.  When glibc
> +    # Constants in glibc were updated to match Linux v6.2.  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, 1)
> +    linux_version_glibc = (6, 2)

OK. 2/3 required.

>      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 8df3fbd135..cafebb5d17 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, 1)
> +    linux_version_glibc = (6, 2)

OK. 3/3 required.

>      sys.exit(glibcextract.compare_macro_consts(
>                  '#include <sys/pidfd.h>\n',
>                  '#include <asm/fcntl.h>\n'
>
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 92b78a877c..ba6f21992a 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, 1)
+    linux_version_glibc = (6, 2)
     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 d31b482adb..0845ada0ac 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.1.  When glibc
+    # Constants in glibc were updated to match Linux v6.2.  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, 1)
+    linux_version_glibc = (6, 2)
     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 8df3fbd135..cafebb5d17 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, 1)
+    linux_version_glibc = (6, 2)
     sys.exit(glibcextract.compare_macro_consts(
                 '#include <sys/pidfd.h>\n',
                 '#include <asm/fcntl.h>\n'