Add the drd/tests/bug322621 regression test

diff --git a/.gitignore b/.gitignore
index 4a38b11e4e35ea02c60b29a3e97aa534b86f36f9..2eb268348517334b8f7806a76f1919ba568506ff 100644 (file)
--- 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 6a9fd23fff14fb5d2235b6243348b9b94286b553..2a2c461296a08e8606955c013e2095ae0df92329 100644 (file)
--- 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 (file)
index 0000000..e3561f4
--- /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 (file)
index 0000000..1095603
--- /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