Yet another thread test scheduler sensitivity fix

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

diff --git a/drd/tests/rwlock_race.stderr.exp b/drd/tests/rwlock_race.stderr.exp
index 124b2c4cd1cfd57dc64845901b140c3b8838cf8a..8350b50e764664ac77582d7997a7a67b95b5df7f 100644 (file)
--- a/drd/tests/rwlock_race.stderr.exp
+++ b/drd/tests/rwlock_race.stderr.exp
@@ -1,16 +1,15 @@
 
-Thread 3:
-Conflicting load by thread 3 at 0x........ size 4
+Conflicting load by thread x at 0x........ size 4
    at 0x........: thread_func (rwlock_race.c:?)
    by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
 Location 0x........ is 0 bytes inside local var "s_racy"
-declared at rwlock_race.c:18, in frame #? of thread 3
+declared at rwlock_race.c:18, in frame #? of thread x
 
-Conflicting store by thread 3 at 0x........ size 4
+Conflicting store by thread x at 0x........ size 4
    at 0x........: thread_func (rwlock_race.c:?)
    by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
 Location 0x........ is 0 bytes inside local var "s_racy"
-declared at rwlock_race.c:18, in frame #? of thread 3
+declared at rwlock_race.c:18, in frame #? of thread x
 
 Result: 2
 

diff --git a/drd/tests/rwlock_race.vgtest b/drd/tests/rwlock_race.vgtest
index b5834ebaec4905ed0b4740ca2c632cc930230212..c6a60ff251c3fa2591e6f5768939667385c7706c 100644 (file)
--- a/drd/tests/rwlock_race.vgtest
+++ b/drd/tests/rwlock_race.vgtest
@@ -1,3 +1,4 @@
 prereq: ./supported_libpthread
 vgopts: --show-confl-seg=no --read-var-info=yes --num-callers=2
 prog: rwlock_race
+stderr_filter: filter_stderr_and_thread_no