- Added support for most of the ANNOTATE_...() macro's supported by             
  ThreadSanitizer.                                                              
- Modified DRD's error reporting code such that it does no longer let           
  the Valgrind core print the Valgrind thread ID but that it now prints         
  the DRD thread ID and name. Updated expected output files where               
  necessary.                                                                    
- Modified drd/test/Makefile.am such that the tests using gcc's built-in        
  functions for atomic memory access such that these are only compiled when     
  the gcc version in use supports these built-in functions.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10186 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index e88372e..e42d201 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -14,6 +14,16 @@
 
 EXTRA_DIST =                                        \
 	$(noinst_SCRIPTS)                           \
+	annotate_order_1.stderr.exp		    \
+	annotate_order_1.vgtest			    \
+	annotate_order_2.stderr.exp		    \
+	annotate_order_2.vgtest			    \
+	annotate_rwlock.stderr.exp		    \
+	annotate_rwlock.vgtest			    \
+	annotate_ignore_read.stderr.exp		    \
+	annotate_ignore_read.vgtest		    \
+	annotate_trace_memory.stderr.exp	    \
+	annotate_trace_memory.vgtest		    \
 	atomic_var.stderr.exp-with-atomic-builtins  \
 	atomic_var.stderr.exp-without-atomic-builtins \
 	atomic_var.vgtest			    \
@@ -203,12 +213,12 @@
 	tc23_bogus_condwait.vgtest                  \
 	tc24_nonzero_sem.stderr.exp                 \
 	tc24_nonzero_sem.vgtest                     \
+	thread_name.stderr.exp			    \
+	thread_name.vgtest			    \
 	trylock.stderr.exp                          \
 	trylock.vgtest
 
 check_PROGRAMS =      \
-  atomic_var          \
-  circular_buffer     \
   drd_bitmap_test     \
   fp_race             \
   hold_lock           \
@@ -230,12 +240,18 @@
   rwlock_test         \
   sem_as_mutex        \
   sigalrm             \
-  trylock
+  thread_name         \
+  trylock             \
+  tsan_unittest
 
 if HAVE_BOOST_1_35
 check_PROGRAMS += boost_thread
 endif
 
+if HAVE_BUILTIN_ATOMIC
+check_PROGRAMS += annotate_rwlock atomic_var circular_buffer
+endif
+
 if HAVE_OPENMP
 check_PROGRAMS += omp_matinv omp_prime omp_printf
 endif
@@ -266,11 +282,15 @@
 drd_bitmap_test_CFLAGS      = $(AM_CFLAGS) -O2 \
                               -DENABLE_DRD_CONSISTENCY_CHECKS\
                               @FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
-drd_bitmap_test_LDADD       = # nothing, ie. not -lpthread
+drd_bitmap_test_LDADD       = # nothing, i.e. not -lpthread
 
 monitor_example_SOURCES     = monitor_example.cpp
 new_delete_SOURCES          = new_delete.cpp
 
+tsan_unittest_SOURCES       = tsan_unittest.cpp
+tsan_unittest_CXXFLAGS      = $(AM_CXXFLAGS) -Wno-deprecated -Wno-sign-compare\
+			      -Wno-shadow @FLAG_W_NO_EMPTY_BODY@
+
 if HAVE_BOOST_1_35
 boost_thread_SOURCES        = boost_thread.cpp
 boost_thread_CXXFLAGS       = $(AM_CXXFLAGS) $(BOOST_CFLAGS)