From 8bdd5a7c9a381578399a514f410f944fa49ba56d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 14 Jun 2024 10:53:32 -0700 Subject: [PATCH] maint: avoid some test getpagesize dependencies * modules/memcasecmp-tests, modules/memchr-tests: * modules/memchr2-tests, modules/memcmp-tests: * modules/memmem-tests, modules/memrchr-tests: * modules/rawmemchr-tests, modules/strncat-tests: * modules/strnlen-tests, modules/strstr-tests: * modules/unistr/u16-chr-tests, modules/unistr/u16-cmp-tests: * modules/unistr/u16-stpncpy-tests: * modules/unistr/u16-strchr-tests: * modules/unistr/u16-strncat-tests: * modules/unistr/u16-strncpy-tests: * modules/unistr/u16-strnlen-tests, modules/unistr/u32-chr-tests: * modules/unistr/u32-cmp-tests, modules/unistr/u32-stpncpy-tests: * modules/unistr/u32-strchr-tests: * modules/unistr/u32-strncat-tests: * modules/unistr/u32-strncpy-tests: * modules/unistr/u32-strnlen-tests, modules/unistr/u8-chr-tests: * modules/unistr/u8-cmp-tests, modules/unistr/u8-stpncpy-tests: * modules/unistr/u8-strchr-tests, modules/unistr/u8-strncat-tests: * modules/unistr/u8-strncpy-tests: * modules/unistr/u8-strnlen-tests, modules/wcsstr-tests: Do not depend on getpagesize. * tests/zerosize-ptr.h (zerosize_ptr): Use sysconf (_SC_PAGESIZE) instead of getpagesize, as this code is compiled only on platforms that have _SC_PAGESIZE. --- ChangeLog | 26 ++++++++++++++++++++++++++ modules/memcasecmp-tests | 1 - modules/memchr-tests | 1 - modules/memchr2-tests | 1 - modules/memcmp-tests | 1 - modules/memmem-tests | 2 -- modules/memrchr-tests | 1 - modules/rawmemchr-tests | 1 - modules/strncat-tests | 1 - modules/strnlen-tests | 1 - modules/strstr-tests | 1 - modules/unistr/u16-chr-tests | 1 - modules/unistr/u16-cmp-tests | 1 - modules/unistr/u16-stpncpy-tests | 1 - modules/unistr/u16-strchr-tests | 1 - modules/unistr/u16-strncat-tests | 1 - modules/unistr/u16-strncpy-tests | 1 - modules/unistr/u16-strnlen-tests | 1 - modules/unistr/u32-chr-tests | 1 - modules/unistr/u32-cmp-tests | 1 - modules/unistr/u32-stpncpy-tests | 1 - modules/unistr/u32-strchr-tests | 1 - modules/unistr/u32-strncat-tests | 1 - modules/unistr/u32-strncpy-tests | 1 - modules/unistr/u32-strnlen-tests | 1 - modules/unistr/u8-chr-tests | 1 - modules/unistr/u8-cmp-tests | 1 - modules/unistr/u8-stpncpy-tests | 1 - modules/unistr/u8-strchr-tests | 1 - modules/unistr/u8-strncat-tests | 1 - modules/unistr/u8-strncpy-tests | 1 - modules/unistr/u8-strnlen-tests | 1 - modules/wcsstr-tests | 1 - tests/zerosize-ptr.h | 2 +- 34 files changed, 27 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 690c886f78..19ecdc1a67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,31 @@ 2024-06-14 Paul Eggert + maint: avoid some test getpagesize dependencies + * modules/memcasecmp-tests, modules/memchr-tests: + * modules/memchr2-tests, modules/memcmp-tests: + * modules/memmem-tests, modules/memrchr-tests: + * modules/rawmemchr-tests, modules/strncat-tests: + * modules/strnlen-tests, modules/strstr-tests: + * modules/unistr/u16-chr-tests, modules/unistr/u16-cmp-tests: + * modules/unistr/u16-stpncpy-tests: + * modules/unistr/u16-strchr-tests: + * modules/unistr/u16-strncat-tests: + * modules/unistr/u16-strncpy-tests: + * modules/unistr/u16-strnlen-tests, modules/unistr/u32-chr-tests: + * modules/unistr/u32-cmp-tests, modules/unistr/u32-stpncpy-tests: + * modules/unistr/u32-strchr-tests: + * modules/unistr/u32-strncat-tests: + * modules/unistr/u32-strncpy-tests: + * modules/unistr/u32-strnlen-tests, modules/unistr/u8-chr-tests: + * modules/unistr/u8-cmp-tests, modules/unistr/u8-stpncpy-tests: + * modules/unistr/u8-strchr-tests, modules/unistr/u8-strncat-tests: + * modules/unistr/u8-strncpy-tests: + * modules/unistr/u8-strnlen-tests, modules/wcsstr-tests: + Do not depend on getpagesize. + * tests/zerosize-ptr.h (zerosize_ptr): Use sysconf (_SC_PAGESIZE) + instead of getpagesize, as this code is compiled only on + platforms that have _SC_PAGESIZE. + mprotect: don’t assume pointers fit in long * m4/mprotect.m4 (gl_FUNC_MPROTECT_WORKS): Don’t assume pointers fit into unsigned long, as this is not true on CheriBSD. Prefer diff --git a/modules/memcasecmp-tests b/modules/memcasecmp-tests index ecdf5d1882..d86baea9f9 100644 --- a/modules/memcasecmp-tests +++ b/modules/memcasecmp-tests @@ -6,7 +6,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/memchr-tests b/modules/memchr-tests index 3022471fe6..dccd7a6388 100644 --- a/modules/memchr-tests +++ b/modules/memchr-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: dnl Check for prerequisites for memory fence checks. diff --git a/modules/memchr2-tests b/modules/memchr2-tests index cbd9cd22d0..69a889460f 100644 --- a/modules/memchr2-tests +++ b/modules/memchr2-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: c99 extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/memcmp-tests b/modules/memcmp-tests index 15f099c032..40b079cd91 100644 --- a/modules/memcmp-tests +++ b/modules/memcmp-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/memmem-tests b/modules/memmem-tests index 084ee1b9c3..f6c44ec4f2 100644 --- a/modules/memmem-tests +++ b/modules/memmem-tests @@ -8,7 +8,6 @@ m4/mmap-anon.m4 Depends-on: c99 extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON @@ -19,4 +18,3 @@ AC_CHECK_DECLS_ONCE([alarm]) Makefile.am: TESTS += test-memmem check_PROGRAMS += test-memmem - diff --git a/modules/memrchr-tests b/modules/memrchr-tests index 2b4a9bd4b0..812ec90e78 100644 --- a/modules/memrchr-tests +++ b/modules/memrchr-tests @@ -8,7 +8,6 @@ m4/mmap-anon.m4 Depends-on: c99 extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/rawmemchr-tests b/modules/rawmemchr-tests index f2d4c622c8..c0f6e98f28 100644 --- a/modules/rawmemchr-tests +++ b/modules/rawmemchr-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: dnl Check for prerequisites for memory fence checks. diff --git a/modules/strncat-tests b/modules/strncat-tests index 263043019b..222d7997ed 100644 --- a/modules/strncat-tests +++ b/modules/strncat-tests @@ -8,7 +8,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/strnlen-tests b/modules/strnlen-tests index 31a36cf6c5..729caf4f7f 100644 --- a/modules/strnlen-tests +++ b/modules/strnlen-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: dnl Check for prerequisites for memory fence checks. diff --git a/modules/strstr-tests b/modules/strstr-tests index 4817177913..624204a237 100644 --- a/modules/strstr-tests +++ b/modules/strstr-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: AC_CHECK_DECLS_ONCE([alarm]) diff --git a/modules/unistr/u16-chr-tests b/modules/unistr/u16-chr-tests index d6bf77197f..f2dcc14810 100644 --- a/modules/unistr/u16-chr-tests +++ b/modules/unistr/u16-chr-tests @@ -8,7 +8,6 @@ m4/mmap-anon.m4 Depends-on: c99 extensions -getpagesize unistr/u16-set unistr/u32-set unistr/u32-to-u16 diff --git a/modules/unistr/u16-cmp-tests b/modules/unistr/u16-cmp-tests index 84f704f354..2b58983907 100644 --- a/modules/unistr/u16-cmp-tests +++ b/modules/unistr/u16-cmp-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u16-stpncpy-tests b/modules/unistr/u16-stpncpy-tests index 6190d4ecb9..6c6a24d024 100644 --- a/modules/unistr/u16-stpncpy-tests +++ b/modules/unistr/u16-stpncpy-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u16-strchr-tests b/modules/unistr/u16-strchr-tests index 9ed85cc0ac..05417ee5ad 100644 --- a/modules/unistr/u16-strchr-tests +++ b/modules/unistr/u16-strchr-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize unistr/u16-set unistr/u32-set unistr/u32-to-u16 diff --git a/modules/unistr/u16-strncat-tests b/modules/unistr/u16-strncat-tests index 2bee4db549..6a82701b89 100644 --- a/modules/unistr/u16-strncat-tests +++ b/modules/unistr/u16-strncat-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u16-strncpy-tests b/modules/unistr/u16-strncpy-tests index 9631223cc2..3dbdbe5846 100644 --- a/modules/unistr/u16-strncpy-tests +++ b/modules/unistr/u16-strncpy-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u16-strnlen-tests b/modules/unistr/u16-strnlen-tests index f1c851462d..fc5dcad71d 100644 --- a/modules/unistr/u16-strnlen-tests +++ b/modules/unistr/u16-strnlen-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u32-chr-tests b/modules/unistr/u32-chr-tests index 81fc8d78b3..191c9786da 100644 --- a/modules/unistr/u32-chr-tests +++ b/modules/unistr/u32-chr-tests @@ -8,7 +8,6 @@ m4/mmap-anon.m4 Depends-on: c99 extensions -getpagesize unistr/u32-set configure.ac: diff --git a/modules/unistr/u32-cmp-tests b/modules/unistr/u32-cmp-tests index 6e14bc9923..d2892beaa4 100644 --- a/modules/unistr/u32-cmp-tests +++ b/modules/unistr/u32-cmp-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u32-stpncpy-tests b/modules/unistr/u32-stpncpy-tests index bf56f53c7a..3615414642 100644 --- a/modules/unistr/u32-stpncpy-tests +++ b/modules/unistr/u32-stpncpy-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u32-strchr-tests b/modules/unistr/u32-strchr-tests index f8278e921a..3408c834c9 100644 --- a/modules/unistr/u32-strchr-tests +++ b/modules/unistr/u32-strchr-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize unistr/u32-set configure.ac: diff --git a/modules/unistr/u32-strncat-tests b/modules/unistr/u32-strncat-tests index 858107e39d..d2a1abde40 100644 --- a/modules/unistr/u32-strncat-tests +++ b/modules/unistr/u32-strncat-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u32-strncpy-tests b/modules/unistr/u32-strncpy-tests index 37489ec7e2..60e7f0e1eb 100644 --- a/modules/unistr/u32-strncpy-tests +++ b/modules/unistr/u32-strncpy-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u32-strnlen-tests b/modules/unistr/u32-strnlen-tests index 9e54c13c71..79232af968 100644 --- a/modules/unistr/u32-strnlen-tests +++ b/modules/unistr/u32-strnlen-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u8-chr-tests b/modules/unistr/u8-chr-tests index 7b0bf8d4f9..c60904ce60 100644 --- a/modules/unistr/u8-chr-tests +++ b/modules/unistr/u8-chr-tests @@ -8,7 +8,6 @@ m4/mmap-anon.m4 Depends-on: c99 extensions -getpagesize unistr/u8-set unistr/u32-set unistr/u32-to-u8 diff --git a/modules/unistr/u8-cmp-tests b/modules/unistr/u8-cmp-tests index 32adb601f2..ee426dc1d4 100644 --- a/modules/unistr/u8-cmp-tests +++ b/modules/unistr/u8-cmp-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u8-stpncpy-tests b/modules/unistr/u8-stpncpy-tests index adef10fdb3..9217e9992c 100644 --- a/modules/unistr/u8-stpncpy-tests +++ b/modules/unistr/u8-stpncpy-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u8-strchr-tests b/modules/unistr/u8-strchr-tests index bbecc7f8f3..5043faf7ab 100644 --- a/modules/unistr/u8-strchr-tests +++ b/modules/unistr/u8-strchr-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize unistr/u8-set unistr/u32-set unistr/u32-to-u8 diff --git a/modules/unistr/u8-strncat-tests b/modules/unistr/u8-strncat-tests index 6c63436954..88069a98be 100644 --- a/modules/unistr/u8-strncat-tests +++ b/modules/unistr/u8-strncat-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u8-strncpy-tests b/modules/unistr/u8-strncpy-tests index b408e2c1bf..1d4fa583f9 100644 --- a/modules/unistr/u8-strncpy-tests +++ b/modules/unistr/u8-strncpy-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/unistr/u8-strnlen-tests b/modules/unistr/u8-strnlen-tests index 944d570724..66ab285cfb 100644 --- a/modules/unistr/u8-strnlen-tests +++ b/modules/unistr/u8-strnlen-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize configure.ac: gl_FUNC_MMAP_ANON diff --git a/modules/wcsstr-tests b/modules/wcsstr-tests index 128720f237..b17c596411 100644 --- a/modules/wcsstr-tests +++ b/modules/wcsstr-tests @@ -7,7 +7,6 @@ m4/mmap-anon.m4 Depends-on: extensions -getpagesize wcscpy wmemset diff --git a/tests/zerosize-ptr.h b/tests/zerosize-ptr.h index 90ab26f9d1..a66acf3306 100644 --- a/tests/zerosize-ptr.h +++ b/tests/zerosize-ptr.h @@ -69,7 +69,7 @@ zerosize_ptr (void) if (fd >= 0) # endif { - int pagesize = getpagesize (); + size_t pagesize = sysconf (_SC_PAGESIZE); char *two_pages = (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE, flags, fd, 0); -- 2.39.5