|
From: <sv...@va...> - 2009-10-30 11:37:58
|
Author: bart
Date: 2009-10-30 11:37:35 +0000 (Fri, 30 Oct 2009)
New Revision: 10922
Log:
Made sure that the sigqueue regression test passes on 32-bit and on 64-bit systems.
Modified:
trunk/memcheck/tests/linux/sigqueue.c
trunk/memcheck/tests/linux/sigqueue.stderr.exp
trunk/memcheck/tests/linux/sigqueue.vgtest
Modified: trunk/memcheck/tests/linux/sigqueue.c
===================================================================
--- trunk/memcheck/tests/linux/sigqueue.c 2009-10-29 14:03:02 UTC (rev 10921)
+++ trunk/memcheck/tests/linux/sigqueue.c 2009-10-30 11:37:35 UTC (rev 10922)
@@ -8,18 +8,22 @@
#include <syscall.h>
#include <unistd.h>
-int main()
+int main(int argc, char **argv)
{
siginfo_t *si;
const size_t sz = sizeof(*si);
- fprintf(stderr, "sizeof(*si) = %zu\n", sz);
- fprintf(stderr, "%zd %zd %zd %zd\n",
- offsetof(siginfo_t, si_signo),
- offsetof(siginfo_t, si_errno),
- offsetof(siginfo_t, si_code),
- offsetof(siginfo_t, _sifields)
- );
+ if (argc == 1) {
+ fprintf(stderr, "sizeof(*si) = %zu\n", sz);
+ fprintf(stdout, "offsetof(siginfo_t, si_signo) = %zd\n",
+ offsetof(siginfo_t, si_signo));
+ fprintf(stdout, "offsetof(siginfo_t, si_errno) = %zd\n",
+ offsetof(siginfo_t, si_errno));
+ fprintf(stdout, "offsetof(siginfo_t, si_code) = %zd\n",
+ offsetof(siginfo_t, si_code));
+ fprintf(stdout, "offsetof(siginfo_t, _sifields) = %zd\n",
+ offsetof(siginfo_t, _sifields));
+ }
si = calloc(1, sz);
si->si_signo = SIGWINCH;
si->si_code = SI_QUEUE;
Modified: trunk/memcheck/tests/linux/sigqueue.stderr.exp
===================================================================
--- trunk/memcheck/tests/linux/sigqueue.stderr.exp 2009-10-29 14:03:02 UTC (rev 10921)
+++ trunk/memcheck/tests/linux/sigqueue.stderr.exp 2009-10-30 11:37:35 UTC (rev 10922)
@@ -1,6 +1,4 @@
-sizeof(*si) = 128
-0 4 8 16
Done.
HEAP SUMMARY:
Modified: trunk/memcheck/tests/linux/sigqueue.vgtest
===================================================================
--- trunk/memcheck/tests/linux/sigqueue.vgtest 2009-10-29 14:03:02 UTC (rev 10921)
+++ trunk/memcheck/tests/linux/sigqueue.vgtest 2009-10-30 11:37:35 UTC (rev 10922)
@@ -1 +1,2 @@
prog: sigqueue
+args: -q
|