Added bar_bad and bar_trivial to the regression tests.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8779

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 168daebb285ae4495edc91aa859e06129d141e25..b747e22e030c39830b6f757da60e5794652f3899 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -20,8 +20,12 @@ EXTRA_DIST =                                        \
        atomic_var.stderr.exp-with-atomic-builtins    \
        atomic_var.stderr.exp-without-atomic-builtins \
        atomic_var.vgtest                           \
-       boost_threads.stderr.exp                    \
-       boost_threads.vgtest                        \
+       bar_bad.stderr.exp                          \
+       bar_bad.vgtest                              \
+       bar_trivial.stderr.exp                      \
+       bar_trivial.vgtest                          \
+       boost_thread.stderr.exp                     \
+       boost_thread.vgtest                         \
        drd_bitmap_test.stderr.exp                  \
        drd_bitmap_test.stdout.exp                  \
        drd_bitmap_test.vgtest                      \
@@ -195,6 +199,8 @@ AM_CXXFLAGS = $(AM_CFLAGS)
 
 check_PROGRAMS =      \
   atomic_var          \
+  bar_bad            \
+  bar_trivial         \
   drd_bitmap_test     \
   fp_race             \
   hg01_all_ok         \
@@ -250,7 +256,7 @@ check_PROGRAMS =      \
   trylock
 
 if HAVE_BOOST_1_35
-check_PROGRAMS += boost_threads
+check_PROGRAMS += boost_thread
 endif
 
 if HAVE_OPENMP
@@ -265,6 +271,12 @@ endif
 atomic_var_SOURCES          = atomic_var.c
 atomic_var_LDADD            = -lpthread
 
+bar_bad_SOURCES             = ../../helgrind/tests/bar_bad.c
+bar_bad_LDADD               = -lpthread
+
+bar_trivial_SOURCES         = ../../helgrind/tests/bar_trivial.c
+bar_trivial_LDADD           = -lpthread
+
 drd_bitmap_test_SOURCES     = drd_bitmap_test.c
 drd_bitmap_test_CFLAGS      = $(AM_CFLAGS) -O2 \
                               -DENABLE_DRD_CONSISTENCY_CHECKS\
@@ -425,9 +437,9 @@ trylock_SOURCES             = trylock.c
 trylock_LDADD               = -lpthread -lrt
 
 if HAVE_BOOST_1_35
-boost_threads_SOURCES       = boost_threads.cpp
-boost_threads_CXXFLAGS      = $(AM_CXXFLAGS) $(BOOST_CFLAGS)
-boost_threads_LDADD         = $(BOOST_LIBS)
+boost_thread_SOURCES        = boost_thread.cpp
+boost_thread_CXXFLAGS       = $(AM_CXXFLAGS) $(BOOST_CFLAGS)
+boost_thread_LDADD          = $(BOOST_LIBS)
 endif
 
 if HAVE_OPENMP

diff --git a/drd/tests/bar_bad.stderr.exp b/drd/tests/bar_bad.stderr.exp
new file mode 100644 (file)
index 0000000..a159938
--- /dev/null
+++ b/drd/tests/bar_bad.stderr.exp
@@ -0,0 +1,46 @@
+
+initialise a barrier with zero count
+pthread_barrier_init: 'count' argument is zero: barrier 0x........
+   at 0x........: pthread_barrier_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (bar_bad.c:?)
+
+initialise a barrier twice
+
+Barrier reinitialization: barrier 0x........
+   at 0x........: pthread_barrier_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (bar_bad.c:?)
+barrier 0x........ was first observed at:
+   at 0x........: pthread_barrier_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (bar_bad.c:?)
+
+initialise a barrier which has threads waiting on it
+
+Barrier reinitialization: barrier 0x........
+   at 0x........: pthread_barrier_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (bar_bad.c:?)
+barrier 0x........ was first observed at:
+   at 0x........: pthread_barrier_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (bar_bad.c:?)
+
+destroy a barrier that has waiting threads
+
+Destruction of a barrier with active waiters: barrier 0x........
+   at 0x........: pthread_barrier_destroy (drd_pthread_intercepts.c:?)
+   by 0x........: main (bar_bad.c:?)
+barrier 0x........ was first observed at:
+   at 0x........: pthread_barrier_init (drd_pthread_intercepts.c:?)
+   by 0x........: main (bar_bad.c:?)
+
+Destruction of barrier that is being waited upon: barrier 0x........
+   at 0x........: pthread_barrier_destroy (drd_pthread_intercepts.c:?)
+   by 0x........: main (bar_bad.c:?)
+
+destroy a barrier that was never initialised
+
+Not a barrier
+   at 0x........: pthread_barrier_destroy (drd_pthread_intercepts.c:?)
+   by 0x........: main (bar_bad.c:?)
+
+Destruction of barrier that is being waited upon: barrier 0x........
+   at 0x........: free (vg_replace_malloc.c:...)
+   by 0x........: main (bar_bad.c:?)

diff --git a/drd/tests/bar_bad.vgtest b/drd/tests/bar_bad.vgtest
new file mode 100644 (file)
index 0000000..8333faa
--- /dev/null
+++ b/drd/tests/bar_bad.vgtest
@@ -0,0 +1,2 @@
+prog: bar_bad
+vgopts: -q

diff --git a/drd/tests/bar_trivial.stderr.exp b/drd/tests/bar_trivial.stderr.exp
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/drd/tests/bar_trivial.stdout.exp b/drd/tests/bar_trivial.stdout.exp
new file mode 100644 (file)
index 0000000..407de30
--- /dev/null
+++ b/drd/tests/bar_trivial.stdout.exp
@@ -0,0 +1 @@
+x = 2

diff --git a/drd/tests/bar_trivial.vgtest b/drd/tests/bar_trivial.vgtest
new file mode 100644 (file)
index 0000000..58e85b1
--- /dev/null
+++ b/drd/tests/bar_trivial.vgtest
@@ -0,0 +1,2 @@
+prog: bar_trivial
+vgopts: -q