Added more regression tests.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11637 a5019735-40e9-0310-863c-91ae7b9d1cf9

5 files changed, 30 insertions, 1 deletions

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 665a428b..2bbd9691 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -72,8 +72,10 @@ EXTRA_DIST =                                        \
 	fp_race.vgtest                              \
 	fp_race2.stderr.exp                         \
 	fp_race2.vgtest                             \
-	free_is_write.vgtest			    \
 	free_is_write.stderr.exp		    \
+	free_is_write.vgtest			    \
+	free_is_write2.stderr.exp		    \
+	free_is_write2.vgtest			    \
 	hg01_all_ok.stderr.exp                      \
 	hg01_all_ok.vgtest                          \
 	hg02_deadlock.stderr.exp                    \
@@ -175,6 +177,8 @@ EXTRA_DIST =                                        \
 	qt4_rwlock.vgtest                           \
 	qt4_semaphore.stderr.exp                    \
 	qt4_semaphore.vgtest                        \
+	read_and_free_race.stderr.exp		    \
+	read_and_free_race.vgtest		    \
 	recursive_mutex.stderr.exp-linux            \
 	recursive_mutex.stderr.exp-darwin           \
 	recursive_mutex.vgtest                      \
diff --git a/drd/tests/free_is_write2.stderr.exp b/drd/tests/free_is_write2.stderr.exp
new file mode 100644
index 00000000..d16127fb
--- /dev/null
+++ b/drd/tests/free_is_write2.stderr.exp
@@ -0,0 +1,4 @@
+
+Done.
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/drd/tests/free_is_write2.vgtest b/drd/tests/free_is_write2.vgtest
new file mode 100644
index 00000000..256959fd
--- /dev/null
+++ b/drd/tests/free_is_write2.vgtest
@@ -0,0 +1,4 @@
+prereq: test -e free_is_write && ./supported_libpthread
+vgopts: --read-var-info=yes --free-is-write=yes --check-stack-var=yes --show-confl-seg=no
+prog: free_is_write
+args: -q
diff --git a/drd/tests/read_and_free_race.stderr.exp b/drd/tests/read_and_free_race.stderr.exp
new file mode 100644
index 00000000..6cc15996
--- /dev/null
+++ b/drd/tests/read_and_free_race.stderr.exp
@@ -0,0 +1,15 @@
+
+Start.
+Thread 2:
+Conflicting store by thread 2 at 0x........ size 10
+   at 0x........: free (vg_replace_malloc.c:...)
+   by 0x........: thread_func (free_is_write.c:?)
+   by 0x........: vgDrd_thread_wrapper (drd_pthread_intercepts.c:?)
+   by 0x........: (within libpthread-?.?.so)
+Address 0x........ is at offset 0 from 0x......... Allocation context:
+   at 0x........: malloc (vg_replace_malloc.c:...)
+   by 0x........: main (free_is_write.c:?)
+
+Done.
+
+ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
diff --git a/drd/tests/read_and_free_race.vgtest b/drd/tests/read_and_free_race.vgtest
new file mode 100644
index 00000000..b927edd3
--- /dev/null
+++ b/drd/tests/read_and_free_race.vgtest
@@ -0,0 +1,2 @@
+prog: ../../helgrind/tests/free_is_write
+vgopts: --free-is-write=yes --show-confl-seg=no