From: Bart Van Assche <bvanassche@acm.org>
Date: Wed, 5 Oct 2011 13:10:30 +0000 (+0000)
Subject: drd, s390: Make the annotate_ignore_* and the pth_barrier* tests produce
X-Git-Tag: svn/VALGRIND_3_7_0~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58b046b78d082da261c90a5aead2220de0c63400;p=thirdparty%2Fvalgrind.git

drd, s390: Make the annotate_ignore_* and the pth_barrier* tests produce
the same output on s390 as on other systems (not tested yet).


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

diff --git a/drd/tests/annotate_ignore_rw.c b/drd/tests/annotate_ignore_rw.c
index d8913dbc51..1202781702 100644
--- a/drd/tests/annotate_ignore_rw.c
+++ b/drd/tests/annotate_ignore_rw.c
@@ -2,13 +2,14 @@
 
 #include <assert.h>  /* assert() */
 #include <pthread.h>
+#include <stdint.h>
 #include <stdio.h>   /* EOF */
 #include <unistd.h>  /* getopt() */
 #include "../../drd/drd.h"
 
-static int s_a;
-static int s_b;
-static int s_c;
+static int8_t s_a;
+static int8_t s_b;
+static int8_t s_c;
 
 static void* thread_func(void* arg)
 {
diff --git a/drd/tests/annotate_ignore_rw.stderr.exp b/drd/tests/annotate_ignore_rw.stderr.exp
index 384490af0b..24684da139 100644
--- a/drd/tests/annotate_ignore_rw.stderr.exp
+++ b/drd/tests/annotate_ignore_rw.stderr.exp
@@ -1,8 +1,8 @@
 
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_rw.c:?)
 Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_rw.c:11, in frame #? of thread 1
+declared at annotate_ignore_rw.c:12, in frame #? of thread 1
 
 Finished.
 
diff --git a/drd/tests/annotate_ignore_rw2.stderr.exp b/drd/tests/annotate_ignore_rw2.stderr.exp
index 617dd2d581..ffdb76fc78 100644
--- a/drd/tests/annotate_ignore_rw2.stderr.exp
+++ b/drd/tests/annotate_ignore_rw2.stderr.exp
@@ -1,18 +1,18 @@
 
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_rw.c:?)
 Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_rw.c:10, in frame #? of thread 1
+declared at annotate_ignore_rw.c:11, in frame #? of thread 1
 
-Conflicting store by thread 1 at 0x........ size 4
+Conflicting store by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_rw.c:?)
 Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_rw.c:9, in frame #? of thread 1
+declared at annotate_ignore_rw.c:10, in frame #? of thread 1
 
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_rw.c:?)
 Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_rw.c:11, in frame #? of thread 1
+declared at annotate_ignore_rw.c:12, in frame #? of thread 1
 
 Finished.
 
diff --git a/drd/tests/annotate_ignore_rw2.stderr.exp-s390x-mvc b/drd/tests/annotate_ignore_rw2.stderr.exp-s390x-mvc
deleted file mode 100644
index 7c607b1972..0000000000
--- a/drd/tests/annotate_ignore_rw2.stderr.exp-s390x-mvc
+++ /dev/null
@@ -1,19 +0,0 @@
-
-Conflicting load by thread 1 at 0x........ size 1
-   at 0x........: main (annotate_ignore_rw.c:?)
-Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_rw.c:10, in frame #? of thread 1
-
-Conflicting store by thread 1 at 0x........ size 1
-   at 0x........: main (annotate_ignore_rw.c:?)
-Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_rw.c:9, in frame #? of thread 1
-
-Conflicting load by thread 1 at 0x........ size 4
-   at 0x........: main (annotate_ignore_rw.c:?)
-Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_rw.c:11, in frame #? of thread 1
-
-Finished.
-
-ERROR SUMMARY: 9 errors from 3 contexts (suppressed: 0 from 0)
diff --git a/drd/tests/annotate_ignore_write.c b/drd/tests/annotate_ignore_write.c
index 8b7dc2f166..b1b9b622a9 100644
--- a/drd/tests/annotate_ignore_write.c
+++ b/drd/tests/annotate_ignore_write.c
@@ -2,13 +2,14 @@
 
 #include <assert.h>  /* assert() */
 #include <pthread.h>
+#include <stdint.h>
 #include <stdio.h>   /* EOF */
 #include <unistd.h>  /* getopt() */
 #include "../../drd/drd.h"
 
-static int s_a;
-static int s_b;
-static int s_c;
+static int8_t s_a;
+static int8_t s_b;
+static int8_t s_c;
 
 static void* thread_func(void* arg)
 {
diff --git a/drd/tests/annotate_ignore_write.stderr.exp b/drd/tests/annotate_ignore_write.stderr.exp
index 63ade6c052..f26242e5b9 100644
--- a/drd/tests/annotate_ignore_write.stderr.exp
+++ b/drd/tests/annotate_ignore_write.stderr.exp
@@ -1,18 +1,18 @@
 
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_write.c:?)
 Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_write.c:10, in frame #? of thread 1
+declared at annotate_ignore_write.c:11, in frame #? of thread 1
 
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_write.c:?)
 Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_write.c:11, in frame #? of thread 1
+declared at annotate_ignore_write.c:12, in frame #? of thread 1
 
-Conflicting store by thread 1 at 0x........ size 4
+Conflicting store by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_write.c:?)
 Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
+declared at annotate_ignore_write.c:10, in frame #? of thread 1
 
 Finished.
 
diff --git a/drd/tests/annotate_ignore_write.stderr.exp-s390x-mvc b/drd/tests/annotate_ignore_write.stderr.exp-s390x-mvc
deleted file mode 100644
index 66d9691f81..0000000000
--- a/drd/tests/annotate_ignore_write.stderr.exp-s390x-mvc
+++ /dev/null
@@ -1,19 +0,0 @@
-
-Conflicting load by thread 1 at 0x........ size 1
-   at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_write.c:10, in frame #? of thread 1
-
-Conflicting load by thread 1 at 0x........ size 1
-   at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_write.c:11, in frame #? of thread 1
-
-Conflicting store by thread 1 at 0x........ size 1
-   at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
-
-Finished.
-
-ERROR SUMMARY: 12 errors from 3 contexts (suppressed: 0 from 0)
diff --git a/drd/tests/annotate_ignore_write2.stderr.exp b/drd/tests/annotate_ignore_write2.stderr.exp
index e0eef71875..03c77661de 100644
--- a/drd/tests/annotate_ignore_write2.stderr.exp
+++ b/drd/tests/annotate_ignore_write2.stderr.exp
@@ -1,23 +1,23 @@
 
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_write.c:?)
 Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_write.c:10, in frame #? of thread 1
+declared at annotate_ignore_write.c:11, in frame #? of thread 1
 
-Conflicting store by thread 1 at 0x........ size 4
+Conflicting store by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_write.c:?)
 Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
+declared at annotate_ignore_write.c:10, in frame #? of thread 1
 
-Conflicting load by thread 1 at 0x........ size 4
+Conflicting load by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_write.c:?)
 Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_write.c:11, in frame #? of thread 1
+declared at annotate_ignore_write.c:12, in frame #? of thread 1
 
-Conflicting store by thread 1 at 0x........ size 4
+Conflicting store by thread 1 at 0x........ size 1
    at 0x........: main (annotate_ignore_write.c:?)
 Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
+declared at annotate_ignore_write.c:10, in frame #? of thread 1
 
 Finished.
 
diff --git a/drd/tests/annotate_ignore_write2.stderr.exp-s390x-mvc b/drd/tests/annotate_ignore_write2.stderr.exp-s390x-mvc
deleted file mode 100644
index ff49794679..0000000000
--- a/drd/tests/annotate_ignore_write2.stderr.exp-s390x-mvc
+++ /dev/null
@@ -1,24 +0,0 @@
-
-Conflicting load by thread 1 at 0x........ size 1
-   at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_b"
-declared at annotate_ignore_write.c:10, in frame #? of thread 1
-
-Conflicting store by thread 1 at 0x........ size 1
-   at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
-
-Conflicting load by thread 1 at 0x........ size 1
-   at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_c"
-declared at annotate_ignore_write.c:11, in frame #? of thread 1
-
-Conflicting store by thread 1 at 0x........ size 1
-   at 0x........: main (annotate_ignore_write.c:?)
-Location 0x........ is 0 bytes inside local var "s_a"
-declared at annotate_ignore_write.c:9, in frame #? of thread 1
-
-Finished.
-
-ERROR SUMMARY: 16 errors from 4 contexts (suppressed: 0 from 0)
diff --git a/drd/tests/pth_barrier.c b/drd/tests/pth_barrier.c
index 0aea190289..3b83dd6342 100644
--- a/drd/tests/pth_barrier.c
+++ b/drd/tests/pth_barrier.c
@@ -12,6 +12,7 @@
 #include <assert.h>
 #include <limits.h>
 #include <pthread.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -25,7 +26,7 @@ struct threadinfo
 {
   pthread_barrier_t* b;
   pthread_t          tid;
-  int*               array;
+  int8_t*            array;
   int                iterations;
 };
 
diff --git a/drd/tests/pth_barrier.stderr.exp-s390x-mvc b/drd/tests/pth_barrier.stderr.exp-s390x-mvc
deleted file mode 100644
index f2cb7e81a2..0000000000
--- a/drd/tests/pth_barrier.stderr.exp-s390x-mvc
+++ /dev/null
@@ -1 +0,0 @@
-ERROR SUMMARY: 4 errors from 1 contexts
diff --git a/drd/tests/pth_barrier2.stderr.exp-s390x-mvc b/drd/tests/pth_barrier2.stderr.exp-s390x-mvc
deleted file mode 100644
index 423af00f16..0000000000
--- a/drd/tests/pth_barrier2.stderr.exp-s390x-mvc
+++ /dev/null
@@ -1 +0,0 @@
-ERROR SUMMARY: 128 errors
diff --git a/drd/tests/pth_barrier3.stderr.exp-s390x-mvc b/drd/tests/pth_barrier3.stderr.exp-s390x-mvc
deleted file mode 100644
index 370e88fd62..0000000000
--- a/drd/tests/pth_barrier3.stderr.exp-s390x-mvc
+++ /dev/null
@@ -1 +0,0 @@
-ERROR SUMMARY: 124 errors