From: Julian Seward <jseward@acm.org>
Date: Mon, 26 Nov 2007 00:11:04 +0000 (+0000)
Subject: Make drd regtests work again following core changes.  (Bart Van Assche)
X-Git-Tag: svn/VALGRIND_3_3_0~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2b1e846598f562e1d0fe2d8a678d5a9567c39fc;p=thirdparty%2Fvalgrind.git

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 78942d9254..45d24014e7 100644
--- 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 6f87f94ceb..103d8f72fa 100755
--- 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 f594b6bd48..7c0e66824a 100644
--- 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