Made test output operating system independent by suppressing information about confli...

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 abe4f211e3ab6ed7dff302e7498eec4de4ae3533..2b9fdf73da6d0ef432f016fa7750202d8c3870b6 100644 (file)
--- 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 eb958f082d4efc9c4d1fe678884671453c2291ec..5ceb452acab74729587a5ba94fb354bbb284ae8f 100644 (file)
--- 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 35bfc961afec5bf083190b5fba5d3964fad99167..d2e233d11d59b2234a2b9b5a131e7bb0f6aa607d 100644 (file)
--- 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 32aff34ac0434c4c52fea511133aa14b208d5c7a..0c81dddf23621d373dadbe4a7d9beb46b99eae83 100644 (file)
--- 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