From: Bart Van Assche <bvanassche@acm.org>
Date: Fri, 24 Jul 2009 08:36:18 +0000 (+0000)
Subject: Made test output operating system independent by suppressing information about confli... 
X-Git-Tag: svn/VALGRIND_3_5_0~262
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae6ca7c3d9a92dd9886f434f0e476d0011007dae;p=thirdparty%2Fvalgrind.git

Made test output operating system independent by suppressing information about conflicting segments.

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

diff --git a/drd/tests/tc01_simple_race.stderr.exp b/drd/tests/tc01_simple_race.stderr.exp
index abe4f211e3..2b9fdf73da 100644
--- a/drd/tests/tc01_simple_race.stderr.exp
+++ b/drd/tests/tc01_simple_race.stderr.exp
@@ -3,18 +3,10 @@ Conflicting load 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)
 
 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 eb958f082d..5ceb452aca 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 35bfc961af..d2e233d11d 100644
--- a/drd/tests/tc16_byterace.stderr.exp
+++ b/drd/tests/tc16_byterace.stderr.exp
@@ -3,18 +3,10 @@ Conflicting load 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)
 
 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 32aff34ac0..0c81dddf23 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