Menu
▾
▴
[Valgrind-developers] [valgrind] FreeBSD regtest: remove scalar for version 15+
|
From: Paul F. <pa...@so...> - 2024-10-27 20:22:43
|
https://sourceware.org/git/gitweb.cgi?p=valgrind.git;h=94bca9b9fc14e1c7a1c3a2848cbbacdee3a649ed commit 94bca9b9fc14e1c7a1c3a2848cbbacdee3a649ed Author: Paul Floyd <pj...@wa...> Date: Sun Oct 27 21:21:51 2024 +0100 FreeBSD regtest: remove scalar for version 15+ Now also merged into scalar.c Diff: --- .gitignore | 1 - configure.ac | 17 ------- memcheck/tests/freebsd/Makefile.am | 7 --- memcheck/tests/freebsd/scalar.c | 36 ++++++++++++++ memcheck/tests/freebsd/scalar.stderr.exp | 63 ++++++++++++++++++++++++ memcheck/tests/freebsd/scalar_15_plus.c | 31 ------------ memcheck/tests/freebsd/scalar_15_plus.stderr.exp | 63 ------------------------ memcheck/tests/freebsd/scalar_15_plus.vgtest | 12 ----- 8 files changed, 99 insertions(+), 131 deletions(-) diff --git a/.gitignore b/.gitignore index 9757543e68..1b6e2d002b 100644 --- a/.gitignore +++ b/.gitignore @@ -1433,7 +1433,6 @@ /memcheck/tests/freebsd/realpathat /memcheck/tests/freebsd/revoke /memcheck/tests/freebsd/scalar -/memcheck/tests/freebsd/scalar_15_plus /memcheck/tests/freebsd/scalar_abort2 /memcheck/tests/freebsd/scalar_fork /memcheck/tests/freebsd/scalar_pdfork diff --git a/configure.ac b/configure.ac index 39885a63c3..23e4901060 100755 --- a/configure.ac +++ b/configure.ac @@ -4815,29 +4815,12 @@ AC_MSG_RESULT([no]) ]) AM_CONDITIONAL(FREEBSD_TIMERFD_SYSCALL, test x$freebsd_timerfd_syscall = xyes) -AC_MSG_CHECKING([for syscalls only in FreeBSD 15 and later]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include <sys/syscall.h> -]], [[ - return !SYS_getrlimitusage; -]])], [ -freebsd_syscall15=yes -AC_MSG_RESULT([yes]) -AC_DEFINE([FREEBSD_SYSCALL15], 1, - [Define to 1 if you are using FreeBSD 15 or later.]) -], [ -freebsd_syscall15=no -AC_MSG_RESULT([no]) -]) -AM_CONDITIONAL(FREEBSD_SYSCALL15, test x$freebsd_syscall15 = xyes) - else AM_CONDITIONAL(FREEBSD_EVENTFD, false) AM_CONDITIONAL(FREEBSD_REALPATHAT_SYSCALL, false) AM_CONDITIONAL(FREEBSD_KQUEUEX_SYSCALL, false) AM_CONDITIONAL(FREEBSD_TIMERFD_SYSCALL, false) -AM_CONDITIONAL(FREEBSD_SYSCALL15, false) fi # test "$VGCONF_OS" = "freebsd" diff --git a/memcheck/tests/freebsd/Makefile.am b/memcheck/tests/freebsd/Makefile.am index 4f7e35b393..b2e84fc03e 100644 --- a/memcheck/tests/freebsd/Makefile.am +++ b/memcheck/tests/freebsd/Makefile.am @@ -93,8 +93,6 @@ EXTRA_DIST = \ scalar.stderr.exp-x86 \ scalar.supp \ scalar_abort2.vgtest \ - scalar_15_plus.vgtest \ - scalar_15_plus.stderr.exp \ scalar_abort2.stderr.exp \ scalar_fork.vgtest \ scalar_fork.stderr.exp \ @@ -202,11 +200,6 @@ check_PROGRAMS += timerfd timerfd_LDFLAGS = -lm endif -if FREEBSD_SYSCALL15 -check_PROGRAMS += scalar_15_plus timerfd -scalar_15_plus_CFLAGS = ${AM_CFLAGS} -g -endif - aligned_alloc_CFLAGS = ${AM_CFLAGS} @FLAG_W_NO_NON_POWER_OF_TWO_ALIGNMENT@ delete_sized_mismatch_CXXFLAGS = ${AM_CXXFLAGS} --std=c++14 diff --git a/memcheck/tests/freebsd/scalar.c b/memcheck/tests/freebsd/scalar.c index bd34487b08..8ddf408c07 100644 --- a/memcheck/tests/freebsd/scalar.c +++ b/memcheck/tests/freebsd/scalar.c @@ -2319,6 +2319,42 @@ int main(void) FAKE_SY("\n"); #endif + // FreeBSD 15 (and any backports) + /* SYS_kqueuex 583 */ +#if defined(SYS_kqueuex) + GO(SYS_kqueuex, " 1s 0m"); + SY(SYS_kqueuex, x0+123); FAIL; +#else +#endif + + /* SYS_membarrier 584 */ +#if defined(SYS_membarrier) + GO(SYS_membarrier, " 3s 0m"); + SY(SYS_membarrier, x0+123, x0+456, x0+789); FAIL; +#else +#endif + + /* SYS_timerfd_create 585 */ +#if defined(SYS_timerfd_create) + GO(SYS_timerfd_create, " 2s 0m"); + SY(SYS_timerfd_create, x0+123, x0+23456); FAIL; +#else +#endif + + /* SYS_timerfd_gettime 586 */ +#if defined(SYS_timerfd_gettime) + GO(SYS_timerfd_gettime, " 2s 1m"); + SY(SYS_timerfd_gettime, x0+100, x0); FAIL; +#else +#endif + + /* SYS_timerfd_settime 587 */ +#if defined(SYS_timerfd_settime) + GO(SYS_timerfd_settime, "4s 2m"); + SY(SYS_timerfd_settime, x0+321, x0, x0+10, x0+5); FAIL; +#else +#endif + /* SYS_exit 1 */ GO(SYS_exit, "1s 0m"); SY(SYS_exit, x0); FAIL; diff --git a/memcheck/tests/freebsd/scalar.stderr.exp b/memcheck/tests/freebsd/scalar.stderr.exp index cdda0a7e0d..ed5f0a9b15 100644 --- a/memcheck/tests/freebsd/scalar.stderr.exp +++ b/memcheck/tests/freebsd/scalar.stderr.exp @@ -5647,6 +5647,69 @@ Syscall param aio_readv(iocb) points to unaddressable byte(s) ... Address 0x........ is not stack'd, malloc'd or (recently) free'd +--------------------------------------------------------- +583: SYS_kqueuex 1s 0m +--------------------------------------------------------- +Syscall param kqueuex(flags) contains uninitialised byte(s) + ... + +--------------------------------------------------------- +584: SYS_membarrier 3s 0m +--------------------------------------------------------- +Syscall param membarrier(cmd) contains uninitialised byte(s) + ... + +Syscall param membarrier(flags) contains uninitialised byte(s) + ... + +Syscall param membarrier(cpu_id) contains uninitialised byte(s) + ... + +--------------------------------------------------------- +585: SYS_timerfd_create 2s 0m +--------------------------------------------------------- +Syscall param timerfd_create(clockid) contains uninitialised byte(s) + ... + +Syscall param timerfd_create(flags) contains uninitialised byte(s) + ... + +--------------------------------------------------------- +586: SYS_timerfd_gettime 2s 1m +--------------------------------------------------------- +Syscall param timerfd_gettime(fd) contains uninitialised byte(s) + ... + +Syscall param timerfd_gettime(curr_value) contains uninitialised byte(s) + ... + +Syscall param timerfd_gettime(curr_value) points to unaddressable byte(s) + ... + Address 0x........ is not stack'd, malloc'd or (recently) free'd + +--------------------------------------------------------- +587: SYS_timerfd_settime 4s 2m +--------------------------------------------------------- +Syscall param timerfd_settime(fd) contains uninitialised byte(s) + ... + +Syscall param timerfd_settime(flags) contains uninitialised byte(s) + ... + +Syscall param timerfd_settime(new_value) contains uninitialised byte(s) + ... + +Syscall param timerfd_settime(old_value) contains uninitialised byte(s) + ... + +Syscall param timerfd_settime(new_value) points to unaddressable byte(s) + ... + Address 0x........ is not stack'd, malloc'd or (recently) free'd + +Syscall param timerfd_settime(old_value) points to unaddressable byte(s) + ... + Address 0x........ is not stack'd, malloc'd or (recently) free'd + --------------------------------------------------------- 1: SYS_exit 1s 0m --------------------------------------------------------- diff --git a/memcheck/tests/freebsd/scalar_15_plus.c b/memcheck/tests/freebsd/scalar_15_plus.c deleted file mode 100644 index b417c14373..0000000000 --- a/memcheck/tests/freebsd/scalar_15_plus.c +++ /dev/null @@ -1,31 +0,0 @@ -#include "scalar.h" -#include <sys/mman.h> - -int main(void) -{ - long *px = malloc(2*sizeof(long)); - x0 = px[0]; - - /* SYS_kqueuex 583 */ - GO(SYS_kqueuex, " 1s 0m"); - SY(SYS_kqueuex, x0+123); FAIL; - - /* SYS_membarrier 584 */ - GO(SYS_membarrier, " 3s 0m"); - SY(SYS_membarrier, x0+123, x0+456, x0+789); FAIL; - - /* SYS_timerfd_create 585 */ - GO(SYS_timerfd_create, " 2s 0m"); - SY(SYS_timerfd_create, x0+123, x0+23456); FAIL; - - /* SYS_timerfd_gettime 586 */ - GO(SYS_timerfd_gettime, " 2s 1m"); - SY(SYS_timerfd_gettime, x0+100, x0); FAIL; - - /* SYS_timerfd_settime 587 */ - GO(SYS_timerfd_settime, "4s 2m"); - SY(SYS_timerfd_settime, x0+321, x0, x0+10, x0+5); FAIL; - - return(0); -} - diff --git a/memcheck/tests/freebsd/scalar_15_plus.stderr.exp b/memcheck/tests/freebsd/scalar_15_plus.stderr.exp deleted file mode 100644 index b95f3ab12e..0000000000 --- a/memcheck/tests/freebsd/scalar_15_plus.stderr.exp +++ /dev/null @@ -1,63 +0,0 @@ ---------------------------------------------------------- -583: SYS_kqueuex 1s 0m ---------------------------------------------------------- -Syscall param kqueuex(flags) contains uninitialised byte(s) - ... - ---------------------------------------------------------- -584: SYS_membarrier 3s 0m ---------------------------------------------------------- -Syscall param membarrier(cmd) contains uninitialised byte(s) - ... - -Syscall param membarrier(flags) contains uninitialised byte(s) - ... - -Syscall param membarrier(cpu_id) contains uninitialised byte(s) - ... - ---------------------------------------------------------- -585: SYS_timerfd_create 2s 0m ---------------------------------------------------------- -Syscall param timerfd_create(clockid) contains uninitialised byte(s) - ... - -Syscall param timerfd_create(flags) contains uninitialised byte(s) - ... - ---------------------------------------------------------- -586: SYS_timerfd_gettime 2s 1m ---------------------------------------------------------- -Syscall param timerfd_gettime(fd) contains uninitialised byte(s) - ... - -Syscall param timerfd_gettime(curr_value) contains uninitialised byte(s) - ... - -Syscall param timerfd_gettime(curr_value) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - ---------------------------------------------------------- -587: SYS_timerfd_settime 4s 2m ---------------------------------------------------------- -Syscall param timerfd_settime(fd) contains uninitialised byte(s) - ... - -Syscall param timerfd_settime(flags) contains uninitialised byte(s) - ... - -Syscall param timerfd_settime(new_value) contains uninitialised byte(s) - ... - -Syscall param timerfd_settime(old_value) contains uninitialised byte(s) - ... - -Syscall param timerfd_settime(new_value) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - -Syscall param timerfd_settime(old_value) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - diff --git a/memcheck/tests/freebsd/scalar_15_plus.vgtest b/memcheck/tests/freebsd/scalar_15_plus.vgtest deleted file mode 100644 index fe40176591..0000000000 --- a/memcheck/tests/freebsd/scalar_15_plus.vgtest +++ /dev/null @@ -1,12 +0,0 @@ -prereq: test -e ./scalar_15_plus -prog: scalar_15_plus -vgopts: -q --error-limit=no -stderr_filter: filter_scalar -# Remove all frames from the stack trace except the first one. -# This is important because syscall() function on x86 isn't ABI conformant -# which confuses the Valgrind stack unwinder. -# Therefore x86 and amd64 stack traces are unified so that they contain only -# 'syscall (in libc)' stack frame and this is then filtered out completely. -stderr_filter_args: libc -args: < scalar_13_plus.c - |
