From: Paul Floyd Date: Sun, 27 Oct 2024 19:17:03 +0000 (+0100) Subject: FreeBSD regtest: remove test for version 13+ syscalls X-Git-Tag: VALGRIND_3_24_0~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbec9641c6f09b2c41a1a37b16b52d0398dc0eb8;p=thirdparty%2Fvalgrind.git FreeBSD regtest: remove test for version 13+ syscalls Now merged into main scalar.c --- diff --git a/.gitignore b/.gitignore index 8275e9f90..9757543e6 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_13_plus /memcheck/tests/freebsd/scalar_15_plus /memcheck/tests/freebsd/scalar_abort2 /memcheck/tests/freebsd/scalar_fork diff --git a/configure.ac b/configure.ac index 7a740a2da..39885a63c 100755 --- a/configure.ac +++ b/configure.ac @@ -4783,22 +4783,6 @@ AC_MSG_RESULT([no]) ]) AM_CONDITIONAL(FREEBSD_REALPATHAT_SYSCALL, test x$freebsd_realpathat_syscall = xyes) -AC_MSG_CHECKING([for syscalls only in FreeBSD 13 and later]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include -]], [[ - return !SYS_aio_readv; -]])], [ -freebsd_syscall13=yes -AC_MSG_RESULT([yes]) -AC_DEFINE([FREEBSD_SYSCALL13], 1, - [Define to 1 if you are using FreeBSD 13 or later.]) -], [ -freebsd_syscall13=no -AC_MSG_RESULT([no]) -]) -AM_CONDITIONAL(FREEBSD_SYSCALL13, test x$freebsd_syscall13 = xyes) - AC_MSG_CHECKING([for the SYS_kqueuex syscall (FreeBSD-specific)]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include @@ -4851,7 +4835,6 @@ else AM_CONDITIONAL(FREEBSD_EVENTFD, false) AM_CONDITIONAL(FREEBSD_REALPATHAT_SYSCALL, false) -AM_CONDITIONAL(FREEBSD_SYSCALL13, false) AM_CONDITIONAL(FREEBSD_KQUEUEX_SYSCALL, false) AM_CONDITIONAL(FREEBSD_TIMERFD_SYSCALL, false) AM_CONDITIONAL(FREEBSD_SYSCALL15, false) diff --git a/memcheck/tests/freebsd/Makefile.am b/memcheck/tests/freebsd/Makefile.am index 0a144cd3d..4f7e35b39 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_13_plus.vgtest \ - scalar_13_plus.stderr.exp \ scalar_15_plus.vgtest \ scalar_15_plus.stderr.exp \ scalar_abort2.stderr.exp \ @@ -187,11 +185,6 @@ inlinfo_nested_so_LDFLAGS = -Wl,-rpath,$(top_builddir)/memcheck/tests/freebsd -s bug464476_SOURCES = bug464476.cpp bug470713_SOURCES = bug470713.cpp -if FREEBSD_SYSCALL13 -check_PROGRAMS += scalar_13_plus -scalar_13_plus_CFLAGS = ${AM_CFLAGS} -g -endif - if FREEBSD_EVENTFD check_PROGRAMS += eventfd1 eventfd2 endif diff --git a/memcheck/tests/freebsd/scalar_13_plus.c b/memcheck/tests/freebsd/scalar_13_plus.c deleted file mode 100644 index 799dcfc8b..000000000 --- a/memcheck/tests/freebsd/scalar_13_plus.c +++ /dev/null @@ -1,38 +0,0 @@ -#include "scalar.h" -#include - -int main(void) -{ - long *px = malloc(2*sizeof(long)); - x0 = px[0]; - - /* SYS_shm_open2 571 */ - GO(SYS_shm_open2, " 5s 2m"); - SY(SYS_shm_open2, x0+0xf00c, x0+1, x0+2, x0+3, x0+4); FAIL; - - GO(SYS_shm_open2, " 5s 1m"); - SY(SYS_shm_open2, x0+SHM_ANON, x0+1, x0+2, x0+3, x0+4); FAIL; - - /* SYS___realpathat 574 */ - GO(SYS___realpathat, " 5s 2m"); - SY(SYS___realpathat, x0+0xffff, x0, x0, x0+100, x0+2); FAIL; - - /* SYS_close_range 575 */ - GO(SYS_close_range, "3s 0m"); - SY(SYS_close_range, x0+5, x0+10, x0); SUCC; - - /* SYS___specialfd 577 */ - GO(SYS___specialfd, "3s 1m"); - SY(SYS___specialfd, x0+0xf000, x0+1, x0+10); FAIL; - - /* SYS_aio_writev 578 */ - GO(SYS_aio_writev, "1s 1m"); - SY(SYS_aio_writev, x0+1); FAIL; - - /* SYS_aio_readv 579 */ - GO(SYS_aio_readv, "1s 1m"); - SY(SYS_aio_readv, x0+1); FAIL; - - return(0); -} - diff --git a/memcheck/tests/freebsd/scalar_13_plus.stderr.exp b/memcheck/tests/freebsd/scalar_13_plus.stderr.exp deleted file mode 100644 index c7c2e4027..000000000 --- a/memcheck/tests/freebsd/scalar_13_plus.stderr.exp +++ /dev/null @@ -1,122 +0,0 @@ ---------------------------------------------------------- -571: SYS_shm_open2 5s 2m ---------------------------------------------------------- -Syscall param shm_open2(path) contains uninitialised byte(s) - ... - -Syscall param shm_open2(flags) contains uninitialised byte(s) - ... - -Syscall param shm_open2(mode) contains uninitialised byte(s) - ... - -Syscall param shm_open2(shmflags) contains uninitialised byte(s) - ... - -Syscall param shm_open2(name) contains uninitialised byte(s) - ... - -Syscall param shm_open2(path) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - -Syscall param shm_open2(name) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - ---------------------------------------------------------- -571: SYS_shm_open2 5s 1m ---------------------------------------------------------- -Syscall param shm_open2(path) contains uninitialised byte(s) - ... - -Syscall param shm_open2(flags) contains uninitialised byte(s) - ... - -Syscall param shm_open2(mode) contains uninitialised byte(s) - ... - -Syscall param shm_open2(shmflags) contains uninitialised byte(s) - ... - -Syscall param shm_open2(name) contains uninitialised byte(s) - ... - -Syscall param shm_open2(name) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - ---------------------------------------------------------- -574: SYS___realpathat 5s 2m ---------------------------------------------------------- -Syscall param __realpathat(fd) contains uninitialised byte(s) - ... - -Syscall param __realpathat(path) contains uninitialised byte(s) - ... - -Syscall param __realpathat(buf) contains uninitialised byte(s) - ... - -Syscall param __realpathat(size) contains uninitialised byte(s) - ... - -Syscall param __realpathat(flags) contains uninitialised byte(s) - ... - -Syscall param __realpathat(path) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - -Syscall param __realpathat(buf) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - ---------------------------------------------------------- -575: SYS_close_range 3s 0m ---------------------------------------------------------- -Syscall param close_range(lowfd) contains uninitialised byte(s) - ... - -Syscall param close_range(highfd) contains uninitialised byte(s) - ... - -Syscall param close_range(flags) contains uninitialised byte(s) - ... - ---------------------------------------------------------- -577: SYS___specialfd 3s 1m ---------------------------------------------------------- -Syscall param __specialfd(type) contains uninitialised byte(s) - ... - -Syscall param __specialfd(req) contains uninitialised byte(s) - ... - -Syscall param __specialfd(len) contains uninitialised byte(s) - ... - -Syscall param __specialfd(req) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - ---------------------------------------------------------- -578: SYS_aio_writev 1s 1m ---------------------------------------------------------- -Syscall param aio_writev(iocb) contains uninitialised byte(s) - ... - -Syscall param aio_writev(iocb) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - ---------------------------------------------------------- -579: SYS_aio_readv 1s 1m ---------------------------------------------------------- -Syscall param aio_readv(iocb) contains uninitialised byte(s) - ... - -Syscall param aio_readv(iocb) points to unaddressable byte(s) - ... - Address 0x........ is not stack'd, malloc'd or (recently) free'd - diff --git a/memcheck/tests/freebsd/scalar_13_plus.vgtest b/memcheck/tests/freebsd/scalar_13_plus.vgtest deleted file mode 100644 index 09dc90e90..000000000 --- a/memcheck/tests/freebsd/scalar_13_plus.vgtest +++ /dev/null @@ -1,12 +0,0 @@ -prereq: test -e ./scalar_13_plus -prog: scalar_13_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 -