Reduced two expected output files to one for the test called atomic_var.

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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 5ba66ec300dfaace8e7deb2d54041ce47df685b2..ca61cdecd94b3b9c0f3cdc23f23ac5e45a1d82f5 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -14,8 +14,7 @@ noinst_SCRIPTS =                  \
 
 EXTRA_DIST =                                        \
        $(noinst_SCRIPTS)                           \
-       atomic_var.stderr.exp-with-atomic-builtins-1  \
-       atomic_var.stderr.exp-with-atomic-builtins-2  \
+       atomic_var.stderr.exp-with-atomic-builtins  \
        atomic_var.stderr.exp-without-atomic-builtins \
        atomic_var.vgtest                           \
        bar_bad.stderr.exp                          \

diff --git a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-1 b/drd/tests/atomic_var.stderr.exp-with-atomic-builtins
similarity index 75%
rename from drd/tests/atomic_var.stderr.exp-with-atomic-builtins-1
rename to drd/tests/atomic_var.stderr.exp-with-atomic-builtins
index 859f3649c88990074f783732a93324ad262d0a97..0c79ab9c2c6c8afc6faefd4ac66aabf554b99dc6 100644 (file)
--- a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-1
+++ b/drd/tests/atomic_var.stderr.exp-with-atomic-builtins
@@ -1,13 +1,12 @@
 
 Start of test.
-Thread 2:
-Conflicting load by thread 2/3 at 0x........ size 4
+Conflicting load by thread x/x at 0x........ size 4
    at 0x........: thread_func_2 (atomic_var.c:?)
    by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
    by 0x........: (within libpthread-?.?.so)
    by 0x........: clone (in /...libc...)
 Location 0x........ is 0 bytes inside local var "s_y"
-declared at atomic_var.c:35, in frame #? of thread 2
+declared at atomic_var.c:35, in frame #? of thread x
 y = 1
 Test finished.
 

diff --git a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2 b/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2
deleted file mode 100644 (file)
index 45bf438..0000000
--- a/drd/tests/atomic_var.stderr.exp-with-atomic-builtins-2
+++ /dev/null
@@ -1,14 +0,0 @@
-
-Start of test.
-Thread 3:
-Conflicting load by thread 3/3 at 0x........ size 4
-   at 0x........: thread_func_2 (atomic_var.c:?)
-   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
-   by 0x........: (within libpthread-?.?.so)
-   by 0x........: clone (in /...libc...)
-Location 0x........ is 0 bytes inside local var "s_y"
-declared at atomic_var.c:35, in frame #? of thread 3
-y = 1
-Test finished.
-
-ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)

diff --git a/drd/tests/atomic_var.vgtest b/drd/tests/atomic_var.vgtest
index 054312076077ed034ef91b3a55191c023ab687ab..f371eca4ffc41da66a9867855801261710c943f8 100644 (file)
--- a/drd/tests/atomic_var.vgtest
+++ b/drd/tests/atomic_var.vgtest
@@ -1,3 +1,4 @@
 prereq: ./supported_libpthread
 vgopts: --var-info=yes --check-stack-var=yes --show-confl-seg=no
 prog: atomic_var
+stderr_filter: filter_stderr_and_thread_no

diff --git a/drd/tests/filter_stderr_and_thread_no b/drd/tests/filter_stderr_and_thread_no
index 6d1997cfe698a24ed732441c88db3a37bbcd3249..c080b804d0ba83df4c17ddae781071f569e987b8 100755 (executable)
--- a/drd/tests/filter_stderr_and_thread_no
+++ b/drd/tests/filter_stderr_and_thread_no
@@ -5,4 +5,5 @@
 # Get rid of the numbers as these make some tests more scheduling sensitive
 # -- those where there are multiple threads which play interchangeable roles.
 grep -v "^Thread [0-9][0-9]*:$" |
-sed -e "s:hread [0-9][0-9]*/[0-9][0-9]*:hread x/x:g"
+sed -e "s:hread [0-9][0-9]*/[0-9][0-9]*:hread x/x:g" \
+    -e "s:of thread [0-9][0-9]*$:of thread x:g"