Made test output operating system independent by suppressing information about conflicting segments.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10586 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/tests/tc01_simple_race.stderr.exp b/drd/tests/tc01_simple_race.stderr.exp
index abe4f21..2b9fdf7 100644
--- a/drd/tests/tc01_simple_race.stderr.exp
+++ b/drd/tests/tc01_simple_race.stderr.exp
@@ -3,18 +3,10 @@
at 0x........: main (tc01_simple_race.c:28)
Location 0x........ is 0 bytes inside global var "x"
declared at tc01_simple_race.c:9
-Other segment start (thread 2)
- (thread finished, call stack no longer available)
-Other segment end (thread 2)
- (thread finished, call stack no longer available)
Conflicting store by thread 1 at 0x........ size 4
at 0x........: main (tc01_simple_race.c:28)
Location 0x........ is 0 bytes inside global var "x"
declared at tc01_simple_race.c:9
-Other segment start (thread 2)
- (thread finished, call stack no longer available)
-Other segment end (thread 2)
- (thread finished, call stack no longer available)
ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
diff --git a/drd/tests/tc01_simple_race.vgtest b/drd/tests/tc01_simple_race.vgtest
index eb958f0..5ceb452 100644
--- a/drd/tests/tc01_simple_race.vgtest
+++ b/drd/tests/tc01_simple_race.vgtest
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
-vgopts: --read-var-info=yes
+vgopts: --check-stack-var=yes --read-var-info=yes --show-confl-seg=no
prog: ../../helgrind/tests/tc01_simple_race
diff --git a/drd/tests/tc16_byterace.stderr.exp b/drd/tests/tc16_byterace.stderr.exp
index 35bfc96..d2e233d 100644
--- a/drd/tests/tc16_byterace.stderr.exp
+++ b/drd/tests/tc16_byterace.stderr.exp
@@ -3,18 +3,10 @@
at 0x........: main (tc16_byterace.c:34)
Location 0x........ is 0 bytes inside bytes[4],
a global variable declared at tc16_byterace.c:7
-Other segment start (thread 2)
- (thread finished, call stack no longer available)
-Other segment end (thread 2)
- (thread finished, call stack no longer available)
Conflicting store by thread 1 at 0x........ size 1
at 0x........: main (tc16_byterace.c:34)
Location 0x........ is 0 bytes inside bytes[4],
a global variable declared at tc16_byterace.c:7
-Other segment start (thread 2)
- (thread finished, call stack no longer available)
-Other segment end (thread 2)
- (thread finished, call stack no longer available)
ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0)
diff --git a/drd/tests/tc16_byterace.vgtest b/drd/tests/tc16_byterace.vgtest
index 32aff34..0c81ddd 100644
--- a/drd/tests/tc16_byterace.vgtest
+++ b/drd/tests/tc16_byterace.vgtest
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
-vgopts: --read-var-info=yes
+vgopts: --check-stack-var=yes --read-var-info=yes --show-confl-seg=no
prog: ../../helgrind/tests/tc16_byterace