|
From: <sv...@va...> - 2016-11-02 22:33:27
|
Author: iraisr
Date: Wed Nov 2 22:33:16 2016
New Revision: 16114
Log:
Move scalar test of lwp_private syscall to platform specific directories
n-i-bz
Added:
trunk/memcheck/tests/amd64-solaris/scalar.c
trunk/memcheck/tests/amd64-solaris/scalar.stderr.exp
trunk/memcheck/tests/amd64-solaris/scalar.stdout.exp
trunk/memcheck/tests/amd64-solaris/scalar.vgtest
Modified:
trunk/memcheck/tests/amd64-solaris/ (props changed)
trunk/memcheck/tests/amd64-solaris/Makefile.am
trunk/memcheck/tests/solaris/scalar.c
trunk/memcheck/tests/solaris/scalar.stderr.exp
trunk/memcheck/tests/x86-solaris/Makefile.am
trunk/memcheck/tests/x86-solaris/scalar.c
trunk/memcheck/tests/x86-solaris/scalar.stderr.exp
Modified: trunk/memcheck/tests/amd64-solaris/Makefile.am
==============================================================================
--- trunk/memcheck/tests/amd64-solaris/Makefile.am (original)
+++ trunk/memcheck/tests/amd64-solaris/Makefile.am Wed Nov 2 22:33:16 2016
@@ -9,7 +9,8 @@
context_rflags.stderr.exp context_rflags.stdout.exp context_rflags.vgtest \
context_rflags2.stderr.exp context_rflags2.stdout.exp context_rflags2.vgtest \
context_sse.stderr.exp context_sse.stdout.exp context_sse.vgtest \
- ldsoexec.stderr.exp ldsoexec.vgtest
+ ldsoexec.stderr.exp ldsoexec.vgtest \
+ scalar.stderr.exp scalar.stdout.exp scalar.vgtest
check_PROGRAMS = \
context_fpu \
@@ -17,9 +18,11 @@
context_rflags \
context_rflags2 \
context_sse \
- ldsoexec
+ ldsoexec \
+ scalar
AM_CFLAGS += @FLAG_M64@
AM_CXXFLAGS += @FLAG_M64@
AM_CCASFLAGS += @FLAG_M64@
+scalar_CFLAGS = $(AM_CFLAGS) -I../solaris
Added: trunk/memcheck/tests/amd64-solaris/scalar.c
==============================================================================
--- trunk/memcheck/tests/amd64-solaris/scalar.c (added)
+++ trunk/memcheck/tests/amd64-solaris/scalar.c Wed Nov 2 22:33:16 2016
@@ -0,0 +1,18 @@
+/* Basic syscall test for Solaris/amd64 specific syscalls. */
+
+#include "scalar.h"
+
+#include <sys/lwp.h>
+
+int main(void)
+{
+ /* Uninitialised, but we know px[0] is 0x0. */
+ long *px = malloc(sizeof(long));
+ x0 = px[0];
+
+ /* SYS_lwp_private 166 */
+ GO(SYS_lwp_private, "3s 1m");
+ SY(SYS_lwp_private, x0 + _LWP_GETPRIVATE, x0 + _LWP_FSBASE, x0); FAIL;
+
+ return 0;
+}
Added: trunk/memcheck/tests/amd64-solaris/scalar.stderr.exp
==============================================================================
--- trunk/memcheck/tests/amd64-solaris/scalar.stderr.exp (added)
+++ trunk/memcheck/tests/amd64-solaris/scalar.stderr.exp Wed Nov 2 22:33:16 2016
@@ -0,0 +1,16 @@
+---------------------------------------------------------
+166: SYS_lwp_private 3s 1m
+---------------------------------------------------------
+Syscall param lwp_private(cmd) contains uninitialised byte(s)
+ ...
+
+Syscall param lwp_private(which) contains uninitialised byte(s)
+ ...
+
+Syscall param lwp_private(base) contains uninitialised byte(s)
+ ...
+
+Syscall param lwp_private(base) points to unaddressable byte(s)
+ ...
+ Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
Added: trunk/memcheck/tests/amd64-solaris/scalar.stdout.exp
==============================================================================
(empty)
Added: trunk/memcheck/tests/amd64-solaris/scalar.vgtest
==============================================================================
--- trunk/memcheck/tests/amd64-solaris/scalar.vgtest (added)
+++ trunk/memcheck/tests/amd64-solaris/scalar.vgtest Wed Nov 2 22:33:16 2016
@@ -0,0 +1,3 @@
+prog: scalar
+vgopts: -q
+stderr_filter_args:
Modified: trunk/memcheck/tests/solaris/scalar.c
==============================================================================
--- trunk/memcheck/tests/solaris/scalar.c (original)
+++ trunk/memcheck/tests/solaris/scalar.c Wed Nov 2 22:33:16 2016
@@ -9,7 +9,6 @@
#include <sys/door.h>
#include <sys/fcntl.h>
#include <sys/fstyp.h>
-#include <sys/lwp.h>
#include <sys/mman.h>
#include <sys/modctl.h>
#include <sys/mount.h>
@@ -2138,14 +2137,7 @@
SY(SYS_lwp_sigmask, x0, x0, x0, x0, x0); FAIL;
/* SYS_lwp_private 166 */
- GO(SYS_lwp_private, "3s 1m");
-#if defined(__i386)
- SY(SYS_lwp_private, x0 + _LWP_GETPRIVATE, x0 + _LWP_GSBASE, x0); FAIL;
-#elif defined(__amd64)
- SY(SYS_lwp_private, x0 + _LWP_GETPRIVATE, x0 + _LWP_FSBASE, x0); FAIL;
-#else
-#error Unsupported platform
-#endif
+ /* Tested in amd64-solaris/scalar and x86-solaris/scalar */
/* SYS_lwp_wait 167 */
GO(SYS_lwp_wait, "2s 1m");
Modified: trunk/memcheck/tests/solaris/scalar.stderr.exp
==============================================================================
--- trunk/memcheck/tests/solaris/scalar.stderr.exp (original)
+++ trunk/memcheck/tests/solaris/scalar.stderr.exp Wed Nov 2 22:33:16 2016
@@ -2652,22 +2652,6 @@
sigprocmask: unknown 'how' field 0
---------------------------------------------------------
-166: SYS_lwp_private 3s 1m
----------------------------------------------------------
-Syscall param lwp_private(cmd) contains uninitialised byte(s)
- ...
-
-Syscall param lwp_private(which) contains uninitialised byte(s)
- ...
-
-Syscall param lwp_private(base) contains uninitialised byte(s)
- ...
-
-Syscall param lwp_private(base) points to unaddressable byte(s)
- ...
- Address 0x........ is not stack'd, malloc'd or (recently) free'd
-
----------------------------------------------------------
167: SYS_lwp_wait 2s 1m
---------------------------------------------------------
Syscall param lwp_wait(lwpid) contains uninitialised byte(s)
Modified: trunk/memcheck/tests/x86-solaris/Makefile.am
==============================================================================
--- trunk/memcheck/tests/x86-solaris/Makefile.am (original)
+++ trunk/memcheck/tests/x86-solaris/Makefile.am Wed Nov 2 22:33:16 2016
@@ -30,3 +30,4 @@
AM_CXXFLAGS += @FLAG_M32@
AM_CCASFLAGS += @FLAG_M32@
+scalar_CFLAGS = $(AM_CFLAGS) -I../solaris
Modified: trunk/memcheck/tests/x86-solaris/scalar.c
==============================================================================
--- trunk/memcheck/tests/x86-solaris/scalar.c (original)
+++ trunk/memcheck/tests/x86-solaris/scalar.c Wed Nov 2 22:33:16 2016
@@ -1,9 +1,10 @@
/* Basic syscall test for Solaris/x86 specific syscalls. */
-#include "../solaris/scalar.h"
+#include "scalar.h"
#include <string.h>
#include <sys/fcntl.h>
+#include <sys/lwp.h>
#include <sys/statvfs.h>
/* Helper functions. These are necessary if we've got two tests for a single
@@ -63,6 +64,10 @@
sys_openat64();
sys_openat642();
+ /* SYS_lwp_private 166 */
+ GO(SYS_lwp_private, "3s 1m");
+ SY(SYS_lwp_private, x0 + _LWP_GETPRIVATE, x0 + _LWP_GSBASE, x0); FAIL;
+
/* SYS_llseek 175 */
GO(SYS_llseek, "4s 0m");
SY(SYS_llseek, x0 - 1, x0, x0, x0); FAILx(EBADF);
Modified: trunk/memcheck/tests/x86-solaris/scalar.stderr.exp
==============================================================================
--- trunk/memcheck/tests/x86-solaris/scalar.stderr.exp (original)
+++ trunk/memcheck/tests/x86-solaris/scalar.stderr.exp Wed Nov 2 22:33:16 2016
@@ -57,6 +57,22 @@
Address 0x........ is not stack'd, malloc'd or (recently) free'd
---------------------------------------------------------
+166: SYS_lwp_private 3s 1m
+---------------------------------------------------------
+Syscall param lwp_private(cmd) contains uninitialised byte(s)
+ ...
+
+Syscall param lwp_private(which) contains uninitialised byte(s)
+ ...
+
+Syscall param lwp_private(base) contains uninitialised byte(s)
+ ...
+
+Syscall param lwp_private(base) points to unaddressable byte(s)
+ ...
+ Address 0x........ is not stack'd, malloc'd or (recently) free'd
+
+---------------------------------------------------------
175: SYS_llseek 4s 0m
---------------------------------------------------------
Syscall param llseek(fildes) contains uninitialised byte(s)
|