FreeBSD regtest: remove scalar for version 15+

Now also merged into scalar.c

diff --git a/.gitignore b/.gitignore
index 9757543e68f48a01e0049c9d6821b9a4e4e9928e..1b6e2d002b798d50ae4566b6a3e1df1e606856df 100644 (file)
--- 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 39885a63c3a2797e1f91dfee78a75b096b8d57ec..23e4901060616996bb47d66cd162ff70b96c6f9d 100755 (executable)
--- 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 4f7e35b393598d8e2ad1772b718143ee84fb04d7..b2e84fc03e272f3003ba5f20a250a001f908b26c 100644 (file)
--- 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 bd34487b089907c9750d76c455dca3d3e2bab711..8ddf408c07c71b23f331177abbc4209f83ffc5ad 100644 (file)
--- 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 cdda0a7e0d2e0cd0b0dc12e209789e2b2348310f..ed5f0a9b15f8ac4f99da39374a6de0981b6bf0c4 100644 (file)
--- 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 (file)
index b417c14..0000000
--- 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 (file)
index b95f3ab..0000000
--- 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 (file)
index fe40176..0000000
--- 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
-