Made sure that the sigqueue regression test passes on 32-bit and on 64-bit systems.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10922

diff --git a/memcheck/tests/linux/sigqueue.c b/memcheck/tests/linux/sigqueue.c
index 65f4403a81dea441eed883820e22db6627f55132..d18bd728839a656ca9e691e784a797391b349ee2 100644 (file)
--- a/memcheck/tests/linux/sigqueue.c
+++ b/memcheck/tests/linux/sigqueue.c
@@ -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;

diff --git a/memcheck/tests/linux/sigqueue.stderr.exp b/memcheck/tests/linux/sigqueue.stderr.exp
index 6818a6631090cdfe8625e26d7911b8f746dbafb3..324c857b81d1dc76d09a335d9388b3c488752871 100644 (file)
--- a/memcheck/tests/linux/sigqueue.stderr.exp
+++ b/memcheck/tests/linux/sigqueue.stderr.exp
@@ -1,6 +1,4 @@
 
-sizeof(*si) = 128
-0 4 8 16
 Done.
 
 HEAP SUMMARY:

diff --git a/memcheck/tests/linux/sigqueue.vgtest b/memcheck/tests/linux/sigqueue.vgtest
index 38ab7edceb46e4ff457cbb24bdfb5797bdd25c01..1c2ac610708e916131854693ca1a4e75b9d451b5 100644 (file)
--- a/memcheck/tests/linux/sigqueue.vgtest
+++ b/memcheck/tests/linux/sigqueue.vgtest
@@ -1 +1,2 @@
 prog: sigqueue
+args: -q