From: Bart Van Assche <bart.vanassche@wdc.com>
Date: Sun, 18 Mar 2018 05:12:31 +0000 (-0700)
Subject: Add the drd/tests/bug322621 regression test
X-Git-Tag: VALGRIND_3_14_0~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85cd72c0a80d64ddbfd3156743037925bb7f8f5f;p=thirdparty%2Fvalgrind.git

Add the drd/tests/bug322621 regression test
---

diff --git a/.gitignore b/.gitignore
index 4a38b11e4e..2eb2683485 100644
--- a/.gitignore
+++ b/.gitignore
@@ -312,6 +312,7 @@
 /drd/tests/bar_trivial
 /drd/tests/boost_thread
 /drd/tests/bug-235681
+/drd/tests/bug322621
 /drd/tests/circular_buffer
 /drd/tests/concurrent_close
 /drd/tests/custom_alloc
diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 6a9fd23fff..2a2c461296 100644
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -81,6 +81,8 @@ EXTRA_DIST =                                        \
 	annotate_static.vgtest		            \
 	atomic_var.stderr.exp			    \
 	atomic_var.vgtest			    \
+	bug322621.vgtest			    \
+	bug322621.stderr.exp			    \
 	bar_bad.stderr.exp			    \
 	bar_bad.stderr.exp-nohang		    \
 	bar_bad.stderr.exp-solaris		    \
@@ -438,8 +440,14 @@ check_PROGRAMS += omp_matinv omp_prime omp_printf
 endif
 
 if HAVE_PTHREAD_BARRIER
-check_PROGRAMS += matinv pth_barrier pth_barrier_race pth_barrier_reinit \
-	pth_barrier_thr_cr thread_name
+check_PROGRAMS +=		\
+	bug322621		\
+	matinv			\
+	pth_barrier		\
+	pth_barrier_race	\
+	pth_barrier_reinit	\
+	pth_barrier_thr_cr	\
+	thread_name
 endif
 
 if HAVE_PTHREAD_CREATE_GLIBC_2_0
@@ -462,6 +470,7 @@ AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ @FLAG_FALIGNED_NEW@ \
 LDADD = -lpthread
 
 
+bug322621_SOURCES	    = ../../helgrind/tests/bug322621.cpp
 concurrent_close_SOURCES    = concurrent_close.cpp
 dlopen_main_LDADD           = -ldl
 dlopen_lib_so_SOURCES       = dlopen_lib.c
diff --git a/drd/tests/bug322621.stderr.exp b/drd/tests/bug322621.stderr.exp
new file mode 100644
index 0000000000..e3561f42c1
--- /dev/null
+++ b/drd/tests/bug322621.stderr.exp
@@ -0,0 +1,7 @@
+
+Main at barrier 0
+Main after barrier 0
+Main at barrier 1
+Main after barrier 1
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
diff --git a/drd/tests/bug322621.vgtest b/drd/tests/bug322621.vgtest
new file mode 100644
index 0000000000..1095603d72
--- /dev/null
+++ b/drd/tests/bug322621.vgtest
@@ -0,0 +1,3 @@
+prereq: test -e bug322621 && ./supported_libpthread
+vgopts: --read-var-info=yes --check-stack-var=yes
+prog: bug322621