Make drd regtests work again following core changes. (Bart Van Assche)

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

diff --git a/exp-drd/tests/abort.cpp b/exp-drd/tests/abort.cpp
index 78942d9254357e3ab361783e8fc37737dff98c1a..45d24014e74bce7aae7cd1a2403cbd66788e5f54 100644 (file)
--- a/exp-drd/tests/abort.cpp
+++ b/exp-drd/tests/abort.cpp
@@ -8,7 +8,7 @@
 #include <fstream>
 #include <cassert>
 #include <pthread.h>
-#include <stdio.h>.
+#include <stdio.h>
 static pthread_mutex_t s_mutex;
 
 void* thread_func(void*)

diff --git a/exp-drd/tests/filter_stderr b/exp-drd/tests/filter_stderr
index 6f87f94cebc11abd05d4546be4f0f44f9e1c55b9..103d8f72fa847aab8ba3f320b69620bd78ea679b 100755 (executable)
--- a/exp-drd/tests/filter_stderr
+++ b/exp-drd/tests/filter_stderr
@@ -9,7 +9,7 @@ $dir/../../tests/filter_stderr_basic |
 # Remove libpthread's version number.
 # Remove line numbers from stack traces.
 sed \
--e "/^drd, a data race detector\.$/d" \
+-e "/^exp-drd, a data race detector\.$/d" \
 -e "/^NOTE: This is an Experimental-Class Valgrind Tool.$/d"  \
 -e "/^Copyright (C) 2006-200., and GNU GPL'd, by Bart Van Assche.$/d" \
 -e "s/in [^ ]*libpthread-[0-9]*\.[0-9]*\.so/in libpthread-?.?.so/" \

diff --git a/glibc-2.X-drd.supp b/glibc-2.X-drd.supp
index f594b6bd48e36cc3ffe1834a3ea88d44462890bf..7c0e66824a459679427e60c479a0a275c962fa94 100644 (file)
--- a/glibc-2.X-drd.supp
+++ b/glibc-2.X-drd.supp
@@ -75,6 +75,30 @@
    fun:start_thread
    fun:clone
 } 
+{
+   pthread
+   exp-drd:ConflictingAccess
+   obj:/lib64/libpthread-2.6.1.so
+   fun:start_thread
+   fun:clone
+}
+{
+   pthread
+   exp-drd:ConflictingAccess
+   obj:/lib64/libc-2.6.1.so
+   fun:__libc_thread_freeres
+   fun:start_thread
+   fun:clone
+}
+{
+   pthread
+   exp-drd:ConflictingAccess
+   obj:/lib64/libc-2.6.1.so
+   obj:/lib64/libc-2.6.1.so
+   fun:__libc_thread_freeres
+   fun:start_thread
+   fun:clone
+}
 {
    pthread
    exp-drd:ConflictingAccess