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 d8913dbc51fe344c1ef4acb3bf7ed89d0214aaad..1202781702ced6ac6caae453d5e11989327a16af 100644 (file)
--- 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 384490af0bc6a268102f78c7405190f5c13bfdd1..24684da1399d61db35424a7514a857386d854ff0 100644 (file)
--- 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 617dd2d5813d3ee90954bf53e5d2981853a3a34c..ffdb76fc7818dc40336b75a9e37e7f2e0a7ca372 100644 (file)
--- 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 (file)
index 7c607b1..0000000
--- 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 8b7dc2f1660cb4419d3dbd8d443f4141f517380c..b1b9b622a905754d3e88700fa2152681b67bc08d 100644 (file)
--- 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 63ade6c05290322bf75db1f04095170d5a4e40c8..f26242e5b9696f6e2322d8dc33aef91ad092bba7 100644 (file)
--- 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 (file)
index 66d9691..0000000
--- 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 e0eef7187593ebfe7757b5f1920f2a7b44d84319..03c77661de013a360641b03e46805f0c1d0be869 100644 (file)
--- 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 (file)
index ff49794..0000000
--- 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 0aea190289553d59ec30abbb4cefc401277c891a..3b83dd6342782f1c89402a8136cb3ee910ad8eb3 100644 (file)
--- 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 (file)
index f2cb7e8..0000000
--- 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 (file)
index 423af00..0000000
--- 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 (file)
index 370e88f..0000000
--- a/drd/tests/pth_barrier3.stderr.exp-s390x-mvc
+++ /dev/null
@@ -1 +0,0 @@
-ERROR SUMMARY: 124 errors