Make test 'tc21_pthonce' less scheduling-sensitive.

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

diff --git a/helgrind/tests/tc21_pthonce.stderr.exp-glibc23-amd64 b/helgrind/tests/tc21_pthonce.stderr.exp-glibc23-amd64
index 72cc0d8fc402e00d9e5afc4bd7ed12b265acc3b7..61a5660855ebe5602f0c1080bb53d64f77448f42 100644 (file)
--- a/helgrind/tests/tc21_pthonce.stderr.exp-glibc23-amd64
+++ b/helgrind/tests/tc21_pthonce.stderr.exp-glibc23-amd64
@@ -1,12 +1,12 @@
 
-Thread #2 was created
+Thread #x was created
    at 0x........: clone (in /...libc...)
    by 0x........: ...
    by 0x........: pthread_create@GLIBC_ (in /lib/libpthread...)
    by 0x........: pthread_create@* (hg_intercepts.c:...)
    by 0x........: main (tc21_pthonce.c:86)
 
-Thread #3 was created
+Thread #x was created
    at 0x........: clone (in /...libc...)
    by 0x........: ...
    by 0x........: pthread_create@GLIBC_ (in /lib/libpthread...)

diff --git a/helgrind/tests/tc21_pthonce.stderr.exp-glibc25-amd64 b/helgrind/tests/tc21_pthonce.stderr.exp-glibc25-amd64
index 69ce61da167535581d861c3d60eb26200199557c..3c07dac197a7d64b5aef61f3afc255df21a64b1e 100644 (file)
--- a/helgrind/tests/tc21_pthonce.stderr.exp-glibc25-amd64
+++ b/helgrind/tests/tc21_pthonce.stderr.exp-glibc25-amd64
@@ -1,24 +1,24 @@
 
-Thread #3 was created
+Thread #x was created
    at 0x........: clone (in /...libc...)
    by 0x........: ...
    by 0x........: pthread_create@GLIBC_ (in /lib/libpthread...)
    by 0x........: pthread_create@* (hg_intercepts.c:...)
    by 0x........: main (tc21_pthonce.c:86)
 
-Thread #2 was created
+Thread #x was created
    at 0x........: clone (in /...libc...)
    by 0x........: ...
    by 0x........: pthread_create@GLIBC_ (in /lib/libpthread...)
    by 0x........: pthread_create@* (hg_intercepts.c:...)
    by 0x........: main (tc21_pthonce.c:86)
 
-Possible data race during read of size 4 at 0x........ by thread #3
+Possible data race during read of size 4 at 0x........ by thread #x
    at 0x........: child (tc21_pthonce.c:74)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    by 0x........: ...
    by 0x........: ...
- This conflicts with a previous access by thread #2
+ This conflicts with a previous access by thread #x
    at 0x........: child (tc21_pthonce.c:74)
    by 0x........: mythread_wrapper (hg_intercepts.c:...)
    by 0x........: ...

diff --git a/helgrind/tests/tc21_pthonce.stderr.exp-glibc25-x86 b/helgrind/tests/tc21_pthonce.stderr.exp-glibc25-x86
index bd082139b4e4233016dc452c80c367732c0cc4ec..901d1d4de2907016a6488ec064f9ab4b4bfa0f1c 100644 (file)
--- a/helgrind/tests/tc21_pthonce.stderr.exp-glibc25-x86
+++ b/helgrind/tests/tc21_pthonce.stderr.exp-glibc25-x86
@@ -1,11 +1,11 @@
 
-Thread #2 was created
+Thread #x was created
    at 0x........: clone (in /...libc...)
    by 0x........: pthread_create@GLIBC_ (in /lib/libpthread...)
    by 0x........: pthread_create@* (hg_intercepts.c:...)
    by 0x........: main (tc21_pthonce.c:86)
 
-Thread #3 was created
+Thread #x was created
    at 0x........: clone (in /...libc...)
    by 0x........: pthread_create@GLIBC_ (in /lib/libpthread...)
    by 0x........: pthread_create@* (hg_intercepts.c:...)

diff --git a/helgrind/tests/tc21_pthonce.vgtest b/helgrind/tests/tc21_pthonce.vgtest
index d9b9a81be1b2f29baed88b374c526a6c99ef6a6e..37688a1252fe3f312ddcc13691269e660aeb84ec 100644 (file)
--- a/helgrind/tests/tc21_pthonce.vgtest
+++ b/helgrind/tests/tc21_pthonce.vgtest
@@ -1 +1,2 @@
 prog: tc21_pthonce
+stderr_filter: ./filter_threadnums