Author: njn
Date: 2009-02-23 01:57:26 +0000 (Mon, 23 Feb 2009)
New Revision: 9229
Log:
Merge r9202, 9206, 9222, 9225--9228 (various build system fixes for tests)
from the trunk.
Added:
branches/DARWIN/drd/tests/pth_barrier.c
branches/DARWIN/drd/tests/rwlock_race.c
branches/DARWIN/drd/tests/rwlock_test.c
branches/DARWIN/helgrind/tests/pth_barrier.c
branches/DARWIN/helgrind/tests/rwlock_race.c
branches/DARWIN/helgrind/tests/rwlock_test.c
Removed:
branches/DARWIN/drd/tests/pth_barrier.c
branches/DARWIN/drd/tests/rwlock_race.c
branches/DARWIN/drd/tests/rwlock_test.c
branches/DARWIN/memcheck/tests/hello.c
Modified:
branches/DARWIN/Makefile.tool-tests.am
branches/DARWIN/cachegrind/tests/Makefile.am
branches/DARWIN/cachegrind/tests/x86/Makefile.am
branches/DARWIN/callgrind/tests/Makefile.am
branches/DARWIN/drd/tests/Makefile.am
branches/DARWIN/drd/tests/bar_bad.vgtest
branches/DARWIN/drd/tests/bar_trivial.vgtest
branches/DARWIN/drd/tests/hg01_all_ok.vgtest
branches/DARWIN/drd/tests/hg02_deadlock.vgtest
branches/DARWIN/drd/tests/hg03_inherit.vgtest
branches/DARWIN/drd/tests/hg04_race.vgtest
branches/DARWIN/drd/tests/hg05_race2.vgtest
branches/DARWIN/drd/tests/hg06_readshared.vgtest
branches/DARWIN/drd/tests/rwlock_test.stderr.exp
branches/DARWIN/drd/tests/rwlock_test.vgtest
branches/DARWIN/drd/tests/tc01_simple_race.vgtest
branches/DARWIN/drd/tests/tc02_simple_tls.vgtest
branches/DARWIN/drd/tests/tc03_re_excl.vgtest
branches/DARWIN/drd/tests/tc04_free_lock.vgtest
branches/DARWIN/drd/tests/tc05_simple_race.vgtest
branches/DARWIN/drd/tests/tc06_two_races.vgtest
branches/DARWIN/drd/tests/tc07_hbl1.vgtest
branches/DARWIN/drd/tests/tc08_hbl2.vgtest
branches/DARWIN/drd/tests/tc09_bad_unlock.vgtest
branches/DARWIN/drd/tests/tc10_rec_lock.vgtest
branches/DARWIN/drd/tests/tc11_XCHG.vgtest
branches/DARWIN/drd/tests/tc12_rwl_trivial.vgtest
branches/DARWIN/drd/tests/tc13_laog1.vgtest
branches/DARWIN/drd/tests/tc15_laog_lockdel.vgtest
branches/DARWIN/drd/tests/tc16_byterace.vgtest
branches/DARWIN/drd/tests/tc17_sembar.vgtest
branches/DARWIN/drd/tests/tc18_semabuse.vgtest
branches/DARWIN/drd/tests/tc19_shadowmem.vgtest
branches/DARWIN/drd/tests/tc20_verifywrap.vgtest
branches/DARWIN/drd/tests/tc20_verifywrap2.vgtest
branches/DARWIN/drd/tests/tc21_pthonce.vgtest
branches/DARWIN/drd/tests/tc22_exit_w_lock.vgtest
branches/DARWIN/drd/tests/tc23_bogus_condwait.vgtest
branches/DARWIN/drd/tests/tc24_nonzero_sem.vgtest
branches/DARWIN/exp-ptrcheck/tests/Makefile.am
branches/DARWIN/exp-ptrcheck/tests/x86/Makefile.am
branches/DARWIN/helgrind/tests/Makefile.am
branches/DARWIN/helgrind/tests/pth_barrier1.vgtest
branches/DARWIN/helgrind/tests/pth_barrier2.vgtest
branches/DARWIN/helgrind/tests/pth_barrier3.vgtest
branches/DARWIN/helgrind/tests/rwlock_race.vgtest
branches/DARWIN/helgrind/tests/rwlock_test.vgtest
branches/DARWIN/massif/tests/Makefile.am
branches/DARWIN/memcheck/tests/Makefile.am
branches/DARWIN/memcheck/tests/amd64/Makefile.am
branches/DARWIN/memcheck/tests/linux/Makefile.am
branches/DARWIN/memcheck/tests/linux/timerfd-syscall.c
branches/DARWIN/memcheck/tests/x86-linux/Makefile.am
branches/DARWIN/memcheck/tests/x86/Makefile.am
branches/DARWIN/none/tests/Makefile.am
branches/DARWIN/none/tests/amd64/Makefile.am
branches/DARWIN/none/tests/linux/Makefile.am
branches/DARWIN/none/tests/ppc32/Makefile.am
branches/DARWIN/none/tests/ppc64/Makefile.am
branches/DARWIN/none/tests/x86/Makefile.am
branches/DARWIN/perf/Makefile.am
branches/DARWIN/tests/Makefile.am
Modified: branches/DARWIN/Makefile.tool-tests.am
===================================================================
--- branches/DARWIN/Makefile.tool-tests.am 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/Makefile.tool-tests.am 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,18 @@
+
+include $(top_srcdir)/Makefile.flags.am # For AM_FLAG_M3264_PRI
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
+ -I$(top_srcdir)/coregrind -I$(top_builddir)/include \
+ -I@VEX_DIR@/pub \
+ -DVGA_$(VGCONF_ARCH_PRI)=1 \
+ -DVGO_$(VGCONF_OS)=1 \
+ -DVGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS)=1
+# Nb: Tools need to augment these flags with an arch-selection option, such
+# as $(AM_FLAG_M3264_PRI).
+AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
+AM_CXXFLAGS = $(WERROR) -Winline -Wall -Wshadow -g
+
+
# On Darwin, for a program 'p', the DWARF debug info is stored in the
# directory 'p.dSYM'. This must be generated after the executable is
# created, with 'dsymutil p'. We could redefine LINK with a script that
Modified: branches/DARWIN/cachegrind/tests/Makefile.am
===================================================================
--- branches/DARWIN/cachegrind/tests/Makefile.am 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/cachegrind/tests/Makefile.am 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,8 +1,4 @@
-# For AM_FLAG_M3264_PRI
-include $(top_srcdir)/Makefile.flags.am
-
-# For check-local and clean-local
include $(top_srcdir)/Makefile.tool-tests.am
SUBDIRS = .
@@ -24,15 +20,14 @@
check_PROGRAMS = \
chdir clreq dlclose myprint.so
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
+AM_CFLAGS += $(AM_FLAG_M3264_PRI)
+AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
# C ones
dlclose_LDADD = -ldl
-myprint_so_SOURCES = myprint.c
if VGCONF_OS_IS_DARWIN
-myprint_so_LDFLAGS = $(AM_FLAG_M3264_PRI) -dynamic -dynamiclib -all_load -fpic
+myprint_so_LDFLAGS = $(AM_CFLAGS) -dynamic -dynamiclib -all_load -fpic
else
-myprint_so_LDFLAGS = $(AM_FLAG_M3264_PRI) -shared -fPIC
+myprint_so_LDFLAGS = $(AM_CFLAGS) -shared -fPIC
endif
-myprint_so_CFLAGS = $(AM_FLAG_M3264_PRI) -fPIC
+myprint_so_CFLAGS = $(AM_CFLAGS) -fPIC
Modified: branches/DARWIN/cachegrind/tests/x86/Makefile.am
===================================================================
--- branches/DARWIN/cachegrind/tests/x86/Makefile.am 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/cachegrind/tests/x86/Makefile.am 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,4 +1,4 @@
-# For check-local and clean-local
+
include $(top_srcdir)/Makefile.tool-tests.am
noinst_SCRIPTS = filter_stderr
@@ -9,7 +9,9 @@
check_PROGRAMS = \
fpu-28-108
-AM_CFLAGS = $(WERROR) @FLAG_M32@ -Winline -Wall -Wshadow -g
+
+AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
+AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
AM_CCASFLAGS = @FLAG_M32@
fpu_28_108_SOURCES = fpu-28-108.S
Modified: branches/DARWIN/callgrind/tests/Makefile.am
===================================================================
--- branches/DARWIN/callgrind/tests/Makefile.am 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/callgrind/tests/Makefile.am 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,7 +1,4 @@
-# For AM_FLAG_M3264_PRI
-include $(top_srcdir)/Makefile.flags.am
-# For check-local and clean-local
include $(top_srcdir)/Makefile.tool-tests.am
SUBDIRS = .
@@ -22,7 +19,7 @@
check_PROGRAMS = clreq simwork threads
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
+AM_CFLAGS += $(AM_FLAG_M3264_PRI)
+AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
threads_LDADD = -lpthread
Modified: branches/DARWIN/drd/tests/Makefile.am
===================================================================
--- branches/DARWIN/drd/tests/Makefile.am 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/Makefile.am 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,7 +1,4 @@
-# For AM_FLAG_M3264_PRI
-include $(top_srcdir)/Makefile.flags.am
-# For check-local and clean-local
include $(top_srcdir)/Makefile.tool-tests.am
SUBDIRS = .
@@ -195,24 +192,11 @@
trylock.stderr.exp \
trylock.vgtest
-AM_CFLAGS = $(WERROR) -Wall @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter\
- -g $(AM_FLAG_M3264_PRI) -DVGA_$(VGCONF_ARCH_PRI)=1 \
- -DVGO_$(VGCONF_OS)=1 -DVGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS)=1
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
- -I$(top_builddir)/include -I$(top_srcdir)/VEX/pub
-AM_CXXFLAGS = $(AM_CFLAGS)
-
check_PROGRAMS = \
atomic_var \
circular_buffer \
drd_bitmap_test \
fp_race \
- hg01_all_ok \
- hg02_deadlock \
- hg03_inherit \
- hg04_race \
- hg05_race2 \
- hg06_readshared \
hold_lock \
linuxthreads_det \
memory_allocation \
@@ -230,28 +214,6 @@
rwlock_test \
sem_as_mutex \
sigalrm \
- tc01_simple_race \
- tc02_simple_tls \
- tc03_re_excl \
- tc04_free_lock \
- tc05_simple_race \
- tc06_two_races \
- tc07_hbl1 \
- tc08_hbl2 \
- tc09_bad_unlock \
- tc10_rec_lock \
- tc11_XCHG \
- tc12_rwl_trivial \
- tc13_laog1 \
- tc15_laog_lockdel \
- tc16_byterace \
- tc17_sembar \
- tc18_semabuse \
- tc19_shadowmem \
- tc21_pthonce \
- tc22_exit_w_lock \
- tc23_bogus_condwait \
- tc24_nonzero_sem \
trylock
if HAVE_BOOST_1_35
@@ -263,13 +225,9 @@
endif
if HAVE_PTHREAD_BARRIER
-check_PROGRAMS += bar_bad bar_trivial matinv pth_barrier pth_barrier_reinit
+check_PROGRAMS += matinv pth_barrier pth_barrier_reinit
endif
-if HAVE_PTHREAD_MUTEX_TIMEDLOCK
-check_PROGRAMS += tc20_verifywrap
-endif
-
if HAVE_PTHREAD_SPINLOCK
check_PROGRAMS += pth_spinlock
endif
@@ -279,156 +237,20 @@
endif
-atomic_var_SOURCES = atomic_var.c
-atomic_var_LDADD = -lpthread
+AM_CFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter
+AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ -Wno-inline -Wno-unused-parameter
-circular_buffer_SOURCES = circular_buffer.c
-circular_buffer_LDADD = -lpthread
+LDADD = -lpthread
-drd_bitmap_test_SOURCES = drd_bitmap_test.c
+
drd_bitmap_test_CFLAGS = $(AM_CFLAGS) -O2 \
-DENABLE_DRD_CONSISTENCY_CHECKS\
@FLAG_UNLIMITED_INLINE_UNIT_GROWTH@
+drd_bitmap_test_LDADD = # nothing, ie. not -lpthread
-fp_race_SOURCES = fp_race.c
-fp_race_LDADD = -lpthread
-
-hg01_all_ok_SOURCES = ../../helgrind/tests/hg01_all_ok.c
-hg01_all_ok_LDADD = -lpthread
-
-hg02_deadlock_SOURCES = ../../helgrind/tests/hg02_deadlock.c
-hg02_deadlock_LDADD = -lpthread
-
-hg03_inherit_SOURCES = ../../helgrind/tests/hg03_inherit.c
-hg03_inherit_LDADD = -lpthread
-
-hg04_race_SOURCES = ../../helgrind/tests/hg04_race.c
-hg04_race_LDADD = -lpthread
-
-hg05_race2_SOURCES = ../../helgrind/tests/hg05_race2.c
-hg05_race2_LDADD = -lpthread
-
-hg06_readshared_SOURCES = ../../helgrind/tests/hg06_readshared.c
-hg06_readshared_LDADD = -lpthread
-
-hold_lock_SOURCES = hold_lock.c
-hold_lock_LDADD = -lpthread
-
-linuxthreads_det_SOURCES = linuxthreads_det.c
-linuxthreads_det_LDADD = -lpthread
-
-memory_allocation_SOURCES = memory_allocation.c
-
monitor_example_SOURCES = monitor_example.cpp
-monitor_example_LDADD = -lpthread
-
new_delete_SOURCES = new_delete.cpp
-pth_broadcast_SOURCES = pth_broadcast.c
-pth_broadcast_LDADD = -lpthread
-
-pth_cancel_locked_SOURCES = pth_cancel_locked.c
-pth_cancel_locked_LDADD = -lpthread
-
-pth_cond_race_SOURCES = pth_cond_race.c
-pth_cond_race_LDADD = -lpthread
-
-pth_create_chain_SOURCES = pth_create_chain.c
-pth_create_chain_LDADD = -lpthread
-
-pth_detached_SOURCES = pth_detached.c
-pth_detached_LDADD = -lpthread
-
-pth_detached_sem_SOURCES = pth_detached_sem.c
-pth_detached_sem_LDADD = -lpthread
-
-pth_inconsistent_cond_wait_SOURCES = pth_inconsistent_cond_wait.c
-pth_inconsistent_cond_wait_LDADD = -lpthread
-
-recursive_mutex_SOURCES = recursive_mutex.c
-recursive_mutex_LDADD = -lpthread
-
-rwlock_race_SOURCES = rwlock_race.c
-rwlock_race_LDADD = -lpthread
-
-rwlock_test_SOURCES = rwlock_test.c
-rwlock_test_LDADD = -lpthread
-
-sem_as_mutex_SOURCES = sem_as_mutex.c
-sem_as_mutex_LDADD = -lpthread
-
-sigalrm_SOURCES = sigalrm.c
-sigalrm_LDADD = -lpthread
-
-tc01_simple_race_SOURCES = ../../helgrind/tests/tc01_simple_race.c
-tc01_simple_race_LDADD = -lpthread
-
-tc02_simple_tls_SOURCES = ../../helgrind/tests/tc02_simple_tls.c
-tc02_simple_tls_LDADD = -lpthread
-
-tc03_re_excl_SOURCES = ../../helgrind/tests/tc03_re_excl.c
-tc03_re_excl_LDADD = -lpthread
-
-tc04_free_lock_SOURCES = ../../helgrind/tests/tc04_free_lock.c
-tc04_free_lock_LDADD = -lpthread
-
-tc05_simple_race_SOURCES = ../../helgrind/tests/tc05_simple_race.c
-tc05_simple_race_LDADD = -lpthread
-
-tc06_two_races_SOURCES = ../../helgrind/tests/tc06_two_races.c
-tc06_two_races_LDADD = -lpthread
-
-tc07_hbl1_SOURCES = ../../helgrind/tests/tc07_hbl1.c
-tc07_hbl1_LDADD = -lpthread
-
-tc08_hbl2_SOURCES = ../../helgrind/tests/tc08_hbl2.c
-tc08_hbl2_LDADD = -lpthread
-
-tc09_bad_unlock_SOURCES = ../../helgrind/tests/tc09_bad_unlock.c
-tc09_bad_unlock_LDADD = -lpthread
-
-tc10_rec_lock_SOURCES = ../../helgrind/tests/tc10_rec_lock.c
-tc10_rec_lock_LDADD = -lpthread
-
-tc11_XCHG_SOURCES = ../../helgrind/tests/tc11_XCHG.c
-tc11_XCHG_LDADD = -lpthread
-
-tc12_rwl_trivial_SOURCES = ../../helgrind/tests/tc12_rwl_trivial.c
-tc12_rwl_trivial_LDADD = -lpthread
-
-tc13_laog1_SOURCES = ../../helgrind/tests/tc13_laog1.c
-tc13_laog1_LDADD = -lpthread
-
-tc15_laog_lockdel_SOURCES = ../../helgrind/tests/tc15_laog_lockdel.c
-tc15_laog_lockdel_LDADD = -lpthread
-
-tc16_byterace_SOURCES = ../../helgrind/tests/tc16_byterace.c
-tc16_byterace_LDADD = -lpthread
-
-tc17_sembar_SOURCES = ../../helgrind/tests/tc17_sembar.c
-tc17_sembar_LDADD = -lpthread
-
-tc18_semabuse_SOURCES = ../../helgrind/tests/tc18_semabuse.c
-tc18_semabuse_LDADD = -lpthread
-
-tc19_shadowmem_SOURCES = ../../helgrind/tests/tc19_shadowmem.c
-tc19_shadowmem_LDADD = -lpthread
-
-tc21_pthonce_SOURCES = ../../helgrind/tests/tc21_pthonce.c
-tc21_pthonce_LDADD = -lpthread
-
-tc22_exit_w_lock_SOURCES = ../../helgrind/tests/tc22_exit_w_lock.c
-tc22_exit_w_lock_LDADD = -lpthread
-
-tc23_bogus_condwait_SOURCES = ../../helgrind/tests/tc23_bogus_condwait.c
-tc23_bogus_condwait_LDADD = -lpthread
-
-tc24_nonzero_sem_SOURCES = ../../helgrind/tests/tc24_nonzero_sem.c
-tc24_nonzero_sem_LDADD = -lpthread
-
-trylock_SOURCES = trylock.c
-trylock_LDADD = -lpthread
-
if HAVE_BOOST_1_35
boost_thread_SOURCES = boost_thread.cpp
boost_thread_CXXFLAGS = $(AM_CXXFLAGS) $(BOOST_CFLAGS)
@@ -436,59 +258,33 @@
endif
if HAVE_OPENMP
-omp_matinv_SOURCES = omp_matinv.c
omp_matinv_CFLAGS = $(AM_CFLAGS) -fopenmp
omp_matinv_LDFLAGS = -fopenmp
-omp_matinv_LDADD = -lm
+omp_matinv_LDADD = $(LDADD) -lm
-omp_prime_SOURCES = omp_prime.c
omp_prime_CFLAGS = $(AM_CFLAGS) -fopenmp
omp_prime_LDFLAGS = -fopenmp
-omp_prime_LDADD = -lm
+omp_prime_LDADD = $(LDADD) -lm
-omp_printf_SOURCES = omp_printf.c
omp_printf_CFLAGS = $(AM_CFLAGS) -fopenmp
omp_printf_LDFLAGS = -fopenmp
-omp_printf_LDADD = -lm
+omp_printf_LDADD = $(LDADD) -lm
endif
if HAVE_PTHREAD_BARRIER
-bar_bad_SOURCES = ../../helgrind/tests/bar_bad.c
-bar_bad_LDADD = -lpthread
-
-bar_trivial_SOURCES = ../../helgrind/tests/bar_trivial.c
-bar_trivial_LDADD = -lpthread
-
-matinv_SOURCES = matinv.c
-matinv_LDADD = -lpthread -lm
-
-pth_barrier_SOURCES = pth_barrier.c
-pth_barrier_LDADD = -lpthread
-
-pth_barrier_reinit_SOURCES = pth_barrier_reinit.c
-pth_barrier_reinit_LDADD = -lpthread
+matinv_LDADD = $(LDADD) -lm
endif
-if HAVE_PTHREAD_MUTEX_TIMEDLOCK
-tc20_verifywrap_SOURCES = ../../helgrind/tests/tc20_verifywrap.c
-tc20_verifywrap_LDADD = -lpthread
-endif
-
-if HAVE_PTHREAD_SPINLOCK
-pth_spinlock_SOURCES = pth_spinlock.c
-pth_spinlock_LDADD = -lpthread
-endif
-
if HAVE_QTCORE
qt4_mutex_SOURCES = qt4_mutex.cpp
qt4_mutex_CXXFLAGS = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
-qt4_mutex_LDADD = $(QTCORE_LIBS)
+qt4_mutex_LDADD = $(LDADD) $(QTCORE_LIBS)
qt4_rwlock_SOURCES = qt4_rwlock.cpp
qt4_rwlock_CXXFLAGS = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
-qt4_rwlock_LDADD = $(QTCORE_LIBS)
+qt4_rwlock_LDADD = $(LDADD) $(QTCORE_LIBS)
qt4_semaphore_SOURCES = qt4_semaphore.cpp
qt4_semaphore_CXXFLAGS = $(AM_CXXFLAGS) $(QTCORE_CFLAGS)
-qt4_semaphore_LDADD = $(QTCORE_LIBS)
+qt4_semaphore_LDADD = $(LDADD) $(QTCORE_LIBS)
endif
Modified: branches/DARWIN/drd/tests/bar_bad.vgtest
===================================================================
--- branches/DARWIN/drd/tests/bar_bad.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/bar_bad.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
-prereq: test -e bar_bad && ./supported_libpthread
-prog: bar_bad
+prereq: test -e ../../helgrind/tests/bar_bad && ./supported_libpthread
+prog: ../../helgrind/tests/bar_bad
vgopts: -q
Modified: branches/DARWIN/drd/tests/bar_trivial.vgtest
===================================================================
--- branches/DARWIN/drd/tests/bar_trivial.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/bar_trivial.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
-prereq: test -e bar_trivial && ./supported_libpthread
-prog: bar_trivial
+prereq: test -e ../../helgrind/tests/bar_trivial && ./supported_libpthread
+prog: ../../helgrind/tests/bar_trivial
vgopts: -q
Modified: branches/DARWIN/drd/tests/hg01_all_ok.vgtest
===================================================================
--- branches/DARWIN/drd/tests/hg01_all_ok.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/hg01_all_ok.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: hg01_all_ok
+prog: ../../helgrind/tests/hg01_all_ok
Modified: branches/DARWIN/drd/tests/hg02_deadlock.vgtest
===================================================================
--- branches/DARWIN/drd/tests/hg02_deadlock.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/hg02_deadlock.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: hg02_deadlock
+prog: ../../helgrind/tests/hg02_deadlock
Modified: branches/DARWIN/drd/tests/hg03_inherit.vgtest
===================================================================
--- branches/DARWIN/drd/tests/hg03_inherit.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/hg03_inherit.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
vgopts: --show-confl-seg=no --var-info=yes
-prog: hg03_inherit
+prog: ../../helgrind/tests/hg03_inherit
Modified: branches/DARWIN/drd/tests/hg04_race.vgtest
===================================================================
--- branches/DARWIN/drd/tests/hg04_race.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/hg04_race.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
vgopts: --var-info=yes
-prog: hg04_race
+prog: ../../helgrind/tests/hg04_race
Modified: branches/DARWIN/drd/tests/hg05_race2.vgtest
===================================================================
--- branches/DARWIN/drd/tests/hg05_race2.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/hg05_race2.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
vgopts: --var-info=yes --check-stack-var=yes
-prog: hg05_race2
+prog: ../../helgrind/tests/hg05_race2
Modified: branches/DARWIN/drd/tests/hg06_readshared.vgtest
===================================================================
--- branches/DARWIN/drd/tests/hg06_readshared.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/hg06_readshared.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: hg06_readshared
+prog: ../../helgrind/tests/hg06_readshared
Deleted: branches/DARWIN/drd/tests/pth_barrier.c
===================================================================
--- branches/DARWIN/drd/tests/pth_barrier.c 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/pth_barrier.c 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,110 +0,0 @@
-/* Test whether all data races are detected in a multithreaded program with
- * barriers.
- */
-
-
-#define _GNU_SOURCE
-
-/***********************/
-/* Include directives. */
-/***********************/
-
-#include <assert.h>
-#include <pthread.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-
-/*********************/
-/* Type definitions. */
-/*********************/
-
-struct threadinfo
-{
- pthread_barrier_t* b;
- pthread_t tid;
- int* array;
- int iterations;
-};
-
-
-/********************/
-/* Local variables. */
-/********************/
-
-static int s_silent;
-
-
-/*************************/
-/* Function definitions. */
-/*************************/
-
-/** Single thread, which touches p->iterations elements of array p->array.
- * Each modification of an element of p->array is a data race. */
-static void* threadfunc(struct threadinfo* p)
-{
- int i;
- int* const array = p->array;
- pthread_barrier_t* const b = p->b;
- if (! s_silent)
- printf("thread %lx iteration 0\n", pthread_self());
- pthread_barrier_wait(b);
- for (i = 0; i < p->iterations; i++)
- {
- if (! s_silent)
- printf("thread %lx iteration %d; writing to %p\n",
- pthread_self(), i + 1, &array[i]);
- array[i] = i;
- pthread_barrier_wait(b);
- }
- return 0;
-}
-
-/** Actual test, consisting of nthread threads. */
-static void barriers_and_races(const int nthread, const int iterations)
-{
- int i;
- struct threadinfo* t;
- pthread_barrier_t b;
- int* array;
-
- t = malloc(nthread * sizeof(struct threadinfo));
- array = malloc(iterations * sizeof(array[0]));
-
- if (! s_silent)
- printf("&array[0] = %p\n", array);
-
- pthread_barrier_init(&b, 0, nthread);
-
- for (i = 0; i < nthread; i++)
- {
- t[i].b = &b;
- t[i].array = array;
- t[i].iterations = iterations;
- pthread_create(&t[i].tid, 0, (void*(*)(void*))threadfunc, &t[i]);
- }
-
- for (i = 0; i < nthread; i++)
- {
- pthread_join(t[i].tid, 0);
- }
-
- pthread_barrier_destroy(&b);
-
- free(array);
- free(t);
-}
-
-int main(int argc, char** argv)
-{
- int nthread;
- int iterations;
-
- nthread = (argc > 1) ? atoi(argv[1]) : 2;
- iterations = (argc > 2) ? atoi(argv[2]) : 3;
- s_silent = (argc > 3) ? atoi(argv[3]) : 0;
-
- barriers_and_races(nthread, iterations);
-
- return 0;
-}
Copied: branches/DARWIN/drd/tests/pth_barrier.c (from rev 9206, trunk/drd/tests/pth_barrier.c)
===================================================================
--- branches/DARWIN/drd/tests/pth_barrier.c (rev 0)
+++ branches/DARWIN/drd/tests/pth_barrier.c 2009-02-23 01:57:26 UTC (rev 9229)
@@ -0,0 +1,110 @@
+/* Test whether all data races are detected in a multithreaded program with
+ * barriers.
+ */
+
+
+#define _GNU_SOURCE
+
+/***********************/
+/* Include directives. */
+/***********************/
+
+#include <assert.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+
+/*********************/
+/* Type definitions. */
+/*********************/
+
+struct threadinfo
+{
+ pthread_barrier_t* b;
+ pthread_t tid;
+ int* array;
+ int iterations;
+};
+
+
+/********************/
+/* Local variables. */
+/********************/
+
+static int s_silent;
+
+
+/*************************/
+/* Function definitions. */
+/*************************/
+
+/** Single thread, which touches p->iterations elements of array p->array.
+ * Each modification of an element of p->array is a data race. */
+static void* threadfunc(struct threadinfo* p)
+{
+ int i;
+ int* const array = p->array;
+ pthread_barrier_t* const b = p->b;
+ if (! s_silent)
+ printf("thread %lx iteration 0\n", pthread_self());
+ pthread_barrier_wait(b);
+ for (i = 0; i < p->iterations; i++)
+ {
+ if (! s_silent)
+ printf("thread %lx iteration %d; writing to %p\n",
+ pthread_self(), i + 1, &array[i]);
+ array[i] = i;
+ pthread_barrier_wait(b);
+ }
+ return 0;
+}
+
+/** Actual test, consisting of nthread threads. */
+static void barriers_and_races(const int nthread, const int iterations)
+{
+ int i;
+ struct threadinfo* t;
+ pthread_barrier_t b;
+ int* array;
+
+ t = malloc(nthread * sizeof(struct threadinfo));
+ array = malloc(iterations * sizeof(array[0]));
+
+ if (! s_silent)
+ printf("&array[0] = %p\n", array);
+
+ pthread_barrier_init(&b, 0, nthread);
+
+ for (i = 0; i < nthread; i++)
+ {
+ t[i].b = &b;
+ t[i].array = array;
+ t[i].iterations = iterations;
+ pthread_create(&t[i].tid, 0, (void*(*)(void*))threadfunc, &t[i]);
+ }
+
+ for (i = 0; i < nthread; i++)
+ {
+ pthread_join(t[i].tid, 0);
+ }
+
+ pthread_barrier_destroy(&b);
+
+ free(array);
+ free(t);
+}
+
+int main(int argc, char** argv)
+{
+ int nthread;
+ int iterations;
+
+ nthread = (argc > 1) ? atoi(argv[1]) : 2;
+ iterations = (argc > 2) ? atoi(argv[2]) : 3;
+ s_silent = (argc > 3) ? atoi(argv[3]) : 0;
+
+ barriers_and_races(nthread, iterations);
+
+ return 0;
+}
Deleted: branches/DARWIN/drd/tests/rwlock_race.c
===================================================================
--- branches/DARWIN/drd/tests/rwlock_race.c 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/rwlock_race.c 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,56 +0,0 @@
-/** Cause a race inside code protected by a reader lock.
- */
-
-
-/* Needed for older glibc's (2.3 and older, at least) who don't
- otherwise "know" about pthread_rwlock_anything or about
- PTHREAD_MUTEX_RECURSIVE (amongst things). */
-
-#define _GNU_SOURCE 1
-
-#include <pthread.h>
-#include <stdio.h>
-#include <unistd.h>
-
-
-
-static pthread_rwlock_t s_rwlock;
-static int s_racy;
-
-static void sleep_ms(const int ms)
-{
- struct timespec delay = { ms / 1000, (ms % 1000) * 1000 * 1000 };
- nanosleep(&delay, 0);
-}
-
-static void* thread_func(void* arg)
-{
- pthread_rwlock_rdlock(&s_rwlock);
- s_racy++;
- pthread_rwlock_unlock(&s_rwlock);
- sleep_ms(100);
- return 0;
-}
-
-int main(int argc, char** argv)
-{
- pthread_t thread1;
- pthread_t thread2;
-
-#if 0
- int res;
- VALGRIND_DO_CLIENT_REQUEST(res, 0, VG_USERREQ__DRD_TRACE_ADDR,
- &s_racy, 0, 0, 0, 0);
-#endif
-
- pthread_rwlock_init(&s_rwlock, 0);
- pthread_create(&thread1, 0, thread_func, 0);
- pthread_create(&thread2, 0, thread_func, 0);
- pthread_join(thread1, 0);
- pthread_join(thread2, 0);
- pthread_rwlock_destroy(&s_rwlock);
-
- fprintf(stderr, "Result: %d\n", s_racy);
-
- return 0;
-}
Copied: branches/DARWIN/drd/tests/rwlock_race.c (from rev 9206, trunk/drd/tests/rwlock_race.c)
===================================================================
--- branches/DARWIN/drd/tests/rwlock_race.c (rev 0)
+++ branches/DARWIN/drd/tests/rwlock_race.c 2009-02-23 01:57:26 UTC (rev 9229)
@@ -0,0 +1,56 @@
+/** Cause a race inside code protected by a reader lock.
+ */
+
+
+/* Needed for older glibc's (2.3 and older, at least) who don't
+ otherwise "know" about pthread_rwlock_anything or about
+ PTHREAD_MUTEX_RECURSIVE (amongst things). */
+
+#define _GNU_SOURCE 1
+
+#include <pthread.h>
+#include <stdio.h>
+#include <unistd.h>
+
+
+
+static pthread_rwlock_t s_rwlock;
+static int s_racy;
+
+static void sleep_ms(const int ms)
+{
+ struct timespec delay = { ms / 1000, (ms % 1000) * 1000 * 1000 };
+ nanosleep(&delay, 0);
+}
+
+static void* thread_func(void* arg)
+{
+ pthread_rwlock_rdlock(&s_rwlock);
+ s_racy++;
+ pthread_rwlock_unlock(&s_rwlock);
+ sleep_ms(100);
+ return 0;
+}
+
+int main(int argc, char** argv)
+{
+ pthread_t thread1;
+ pthread_t thread2;
+
+#if 0
+ int res;
+ VALGRIND_DO_CLIENT_REQUEST(res, 0, VG_USERREQ__DRD_TRACE_ADDR,
+ &s_racy, 0, 0, 0, 0);
+#endif
+
+ pthread_rwlock_init(&s_rwlock, 0);
+ pthread_create(&thread1, 0, thread_func, 0);
+ pthread_create(&thread2, 0, thread_func, 0);
+ pthread_join(thread1, 0);
+ pthread_join(thread2, 0);
+ pthread_rwlock_destroy(&s_rwlock);
+
+ fprintf(stderr, "Result: %d\n", s_racy);
+
+ return 0;
+}
Deleted: branches/DARWIN/drd/tests/rwlock_test.c
===================================================================
--- branches/DARWIN/drd/tests/rwlock_test.c 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/rwlock_test.c 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,52 +0,0 @@
-/** Multithreaded test program that triggers various access patterns without
- * triggering any race conditions.
- */
-
-
-#define _GNU_SOURCE 1
-
-#include <pthread.h>
-#include <stdio.h>
-
-
-static pthread_rwlock_t s_rwlock;
-static int s_counter;
-
-static void* thread_func(void* arg)
-{
- int i;
- int sum = 0;
-
- for (i = 0; i < 1000; i++)
- {
- pthread_rwlock_rdlock(&s_rwlock);
- sum += s_counter;
- pthread_rwlock_unlock(&s_rwlock);
- pthread_rwlock_wrlock(&s_rwlock);
- s_counter++;
- pthread_rwlock_unlock(&s_rwlock);
- }
-
- return 0;
-}
-
-int main(int argc, char** argv)
-{
- const int thread_count = 10;
- pthread_t tid[thread_count];
- int i;
-
- for (i = 0; i < thread_count; i++)
- {
- pthread_create(&tid[i], 0, thread_func, 0);
- }
-
- for (i = 0; i < thread_count; i++)
- {
- pthread_join(tid[i], 0);
- }
-
- fprintf(stderr, "Finished.\n");
-
- return 0;
-}
Copied: branches/DARWIN/drd/tests/rwlock_test.c (from rev 9206, trunk/drd/tests/rwlock_test.c)
===================================================================
--- branches/DARWIN/drd/tests/rwlock_test.c (rev 0)
+++ branches/DARWIN/drd/tests/rwlock_test.c 2009-02-23 01:57:26 UTC (rev 9229)
@@ -0,0 +1,52 @@
+/** Multithreaded test program that triggers various access patterns without
+ * triggering any race conditions.
+ */
+
+
+#define _GNU_SOURCE 1
+
+#include <pthread.h>
+#include <stdio.h>
+
+
+static pthread_rwlock_t s_rwlock;
+static int s_counter;
+
+static void* thread_func(void* arg)
+{
+ int i;
+ int sum = 0;
+
+ for (i = 0; i < 1000; i++)
+ {
+ pthread_rwlock_rdlock(&s_rwlock);
+ sum += s_counter;
+ pthread_rwlock_unlock(&s_rwlock);
+ pthread_rwlock_wrlock(&s_rwlock);
+ s_counter++;
+ pthread_rwlock_unlock(&s_rwlock);
+ }
+
+ return 0;
+}
+
+int main(int argc, char** argv)
+{
+ const int thread_count = 10;
+ pthread_t tid[thread_count];
+ int i;
+
+ for (i = 0; i < thread_count; i++)
+ {
+ pthread_create(&tid[i], 0, thread_func, 0);
+ }
+
+ for (i = 0; i < thread_count; i++)
+ {
+ pthread_join(tid[i], 0);
+ }
+
+ fprintf(stderr, "Finished.\n");
+
+ return 0;
+}
Modified: branches/DARWIN/drd/tests/rwlock_test.stderr.exp
===================================================================
--- branches/DARWIN/drd/tests/rwlock_test.stderr.exp 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/rwlock_test.stderr.exp 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1 +1,4 @@
-valgrind: ./rwlock_vgtest: No such file or directory
+
+Finished.
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
Modified: branches/DARWIN/drd/tests/rwlock_test.vgtest
===================================================================
--- branches/DARWIN/drd/tests/rwlock_test.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/rwlock_test.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1 +1 @@
-prog: rwlock_vgtest
+prog: rwlock_test
Modified: branches/DARWIN/drd/tests/tc01_simple_race.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc01_simple_race.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc01_simple_race.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
vgopts: --var-info=yes
-prog: tc01_simple_race
+prog: ../../helgrind/tests/tc01_simple_race
Modified: branches/DARWIN/drd/tests/tc02_simple_tls.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc02_simple_tls.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc02_simple_tls.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc02_simple_tls
+prog: ../../helgrind/tests/tc02_simple_tls
Modified: branches/DARWIN/drd/tests/tc03_re_excl.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc03_re_excl.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc03_re_excl.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc03_re_excl
+prog: ../../helgrind/tests/tc03_re_excl
Modified: branches/DARWIN/drd/tests/tc04_free_lock.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc04_free_lock.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc04_free_lock.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
vgopts: --check-stack-var=yes
-prog: tc04_free_lock
+prog: ../../helgrind/tests/tc04_free_lock
Modified: branches/DARWIN/drd/tests/tc05_simple_race.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc05_simple_race.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc05_simple_race.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
-prog: tc05_simple_race
+prog: ../../helgrind/tests/tc05_simple_race
stderr_filter: filter_error_summary
Modified: branches/DARWIN/drd/tests/tc06_two_races.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc06_two_races.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc06_two_races.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
-prog: tc06_two_races
+prog: ../../helgrind/tests/tc06_two_races
stderr_filter: filter_error_summary
Modified: branches/DARWIN/drd/tests/tc07_hbl1.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc07_hbl1.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc07_hbl1.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc07_hbl1
+prog: ../../helgrind/tests/tc07_hbl1
Modified: branches/DARWIN/drd/tests/tc08_hbl2.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc08_hbl2.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc08_hbl2.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc08_hbl2
+prog: ../../helgrind/tests/tc08_hbl2
Modified: branches/DARWIN/drd/tests/tc09_bad_unlock.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc09_bad_unlock.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc09_bad_unlock.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
vgopts: --check-stack-var=yes
-prog: tc09_bad_unlock
+prog: ../../helgrind/tests/tc09_bad_unlock
Modified: branches/DARWIN/drd/tests/tc10_rec_lock.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc10_rec_lock.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc10_rec_lock.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc10_rec_lock
+prog: ../../helgrind/tests/tc10_rec_lock
Modified: branches/DARWIN/drd/tests/tc11_XCHG.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc11_XCHG.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc11_XCHG.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc11_XCHG
+prog: ../../helgrind/tests/tc11_XCHG
Modified: branches/DARWIN/drd/tests/tc12_rwl_trivial.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc12_rwl_trivial.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc12_rwl_trivial.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc12_rwl_trivial
+prog: ../../helgrind/tests/tc12_rwl_trivial
Modified: branches/DARWIN/drd/tests/tc13_laog1.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc13_laog1.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc13_laog1.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc13_laog1
+prog: ../../helgrind/tests/tc13_laog1
Modified: branches/DARWIN/drd/tests/tc15_laog_lockdel.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc15_laog_lockdel.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc15_laog_lockdel.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc15_laog_lockdel
+prog: ../../helgrind/tests/tc15_laog_lockdel
Modified: branches/DARWIN/drd/tests/tc16_byterace.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc16_byterace.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc16_byterace.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
vgopts: --var-info=yes
-prog: tc16_byterace
+prog: ../../helgrind/tests/tc16_byterace
Modified: branches/DARWIN/drd/tests/tc17_sembar.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc17_sembar.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc17_sembar.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc17_sembar
+prog: ../../helgrind/tests/tc17_sembar
Modified: branches/DARWIN/drd/tests/tc18_semabuse.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc18_semabuse.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc18_semabuse.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc18_semabuse
+prog: ../../helgrind/tests/tc18_semabuse
Modified: branches/DARWIN/drd/tests/tc19_shadowmem.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc19_shadowmem.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc19_shadowmem.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
-prog: tc19_shadowmem
+prog: ../../helgrind/tests/tc19_shadowmem
vgopts: --cmp-race-err-addrs=yes --error-limit=no
Modified: branches/DARWIN/drd/tests/tc20_verifywrap.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc20_verifywrap.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc20_verifywrap.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
-prereq: test -e tc20_verifywrap && ./supported_libpthread
+prereq: test -e ../../helgrind/tests/tc20_verifywrap && ./supported_libpthread
vgopts: --var-info=yes --check-stack-var=yes
-prog: tc20_verifywrap
+prog: ../../helgrind/tests/tc20_verifywrap
Modified: branches/DARWIN/drd/tests/tc20_verifywrap2.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc20_verifywrap2.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc20_verifywrap2.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
vgopts: --trace-mutex=yes --trace-cond=yes --trace-semaphore=yes --var-info=yes --check-stack-var=yes
-prog: tc20_verifywrap
+prog: ../../helgrind/tests/tc20_verifywrap
Modified: branches/DARWIN/drd/tests/tc21_pthonce.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc21_pthonce.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc21_pthonce.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc21_pthonce
+prog: ../../helgrind/tests/tc21_pthonce
Modified: branches/DARWIN/drd/tests/tc22_exit_w_lock.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc22_exit_w_lock.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc22_exit_w_lock.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc22_exit_w_lock
+prog: ../../helgrind/tests/tc22_exit_w_lock
Modified: branches/DARWIN/drd/tests/tc23_bogus_condwait.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc23_bogus_condwait.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc23_bogus_condwait.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
prereq: ./supported_libpthread
-prog: tc23_bogus_condwait
+prog: ../../helgrind/tests/tc23_bogus_condwait
Modified: branches/DARWIN/drd/tests/tc24_nonzero_sem.vgtest
===================================================================
--- branches/DARWIN/drd/tests/tc24_nonzero_sem.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/drd/tests/tc24_nonzero_sem.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,3 +1,3 @@
prereq: ./supported_libpthread
-prog: tc24_nonzero_sem
+prog: ../../helgrind/tests/tc24_nonzero_sem
vgopts: --hg-sanity-flags=111111
Modified: branches/DARWIN/exp-ptrcheck/tests/Makefile.am
===================================================================
--- branches/DARWIN/exp-ptrcheck/tests/Makefile.am 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/exp-ptrcheck/tests/Makefile.am 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,8 +1,4 @@
-# For AM_FLAG_M3264_PRI
-include $(top_srcdir)/Makefile.flags.am
-
-# For check-local and clean-local
include $(top_srcdir)/Makefile.tool-tests.am
#SUBDIRS = .
@@ -87,57 +83,21 @@
endif
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
- -I$(top_srcdir)/coregrind -I$(top_builddir)/include \
- -I@VEX_DIR@/pub
-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
-AM_CXXFLAGS = $(AM_CFLAGS)
+AM_CFLAGS += $(AM_FLAG_M3264_PRI)
+AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
# To make it a bit more realistic, build hackedbz2.c with at
# least some optimisation.
-hackedbz2_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -g
+hackedbz2_CFLAGS = $(AM_CFLAGS) -O
# C ones
-add_SOURCES = add.c
-and_SOURCES = and.c
-arith_SOURCES = arith.c
-bad_percentify_SOURCES = bad_percentify.c
-base_SOURCES = base.c
-cmp_SOURCES = cmp.c
-fp_SOURCES = fp.c
-globalerr_SOURCE = globalerr.c
-hackedbz2_SOURCES = hackedbz2.c
-hp_bounds_SOURCES = hp_bounds.c
-hp_dangle_SOURCES = hp_dangle.c
-idiv_SOURCES = idiv.c
-imul_SOURCES = imul.c
-justify_SOURCES = justify.c
-mm_SOURCES = mm.c
-neg_SOURCES = neg.c
-not_SOURCES = not.c
-or_SOURCES = or.c
-partial_SOURCES = partial.c
-pth_create_SOURCES = pth_create.c
pth_create_LDADD = -lpthread
-pth_specific_SOURCES = pth_specific.c
pth_specific_LDADD = -lpthread
-realloc_SOURCES = realloc.c
-stackerr_SOURCES = stackerr.c
-strcpy_SOURCES = strcpy.c
-strlen_SOURCES = strlen.c
-sub_SOURCES = sub.c
-supp_SOURCES = supp.c
-syscall_SOURCES = syscall.c
-tricky_SOURCES = tricky.c
-unaligned_SOURCES = unaligned.c
-xor_SOURCES = xor.c
-zero_SOURCES = zero.c
# C++ ones
ccc_SOURCES = ccc.cpp
# Build shared object for preen_invars
-preen_invars_SOURCES = preen_invars.c
preen_invars_DEPENDENCIES = preen_invars_so.so
if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
preen_invars_LDADD = -ldl
@@ -158,10 +118,7 @@
endif
endif
-preen_invars_so_so_SOURCES = preen_invars_so.c
-preen_invars_so_so_LDADD =
-preen_invars_so_so_DEPENDENCIES =
-preen_invars_so_so_CFLAGS = -fpic $(AM_FLAG_M3264_PRI) -g
+preen_invars_so_so_CFLAGS = $(AM_CFLAGS) -fpic
if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
preen_invars_so_so_LDFLAGS = -fpic $(AM_FLAG_M3264_PRI) -shared
else
Modified: branches/DARWIN/exp-ptrcheck/tests/x86/Makefile.am
===================================================================
--- branches/DARWIN/exp-ptrcheck/tests/x86/Makefile.am 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/exp-ptrcheck/tests/x86/Makefile.am 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,4 +1,4 @@
-# For check-local and clean-local
+
include $(top_srcdir)/Makefile.tool-tests.am
noinst_SCRIPTS = filter_stderr
@@ -9,10 +9,9 @@
asm.vgtest-disabled asm.stderr.exp \
lea.vgtest-disabled lea.stderr.exp
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = $(WERROR) @FLAG_M32@ -Winline -Wall -Wshadow -g \
- $(FLAG_MMMX) $(FLAG_MSSE)
-AM_CXXFLAGS = $(AM_CFLAGS)
+
+AM_CFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
+AM_CXXFLAGS += @FLAG_M32@ $(FLAG_MMMX) $(FLAG_MSSE)
AM_CCASFLAGS = @FLAG_M32@
asm_SOURCES = asm.S
Modified: branches/DARWIN/helgrind/tests/Makefile.am
===================================================================
--- branches/DARWIN/helgrind/tests/Makefile.am 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/helgrind/tests/Makefile.am 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,8 +1,4 @@
-# For AM_FLAG_M3264_PRI
-include $(top_srcdir)/Makefile.flags.am
-
-# For check-local and clean-local
include $(top_srcdir)/Makefile.tool-tests.am
noinst_SCRIPTS = filter_stderr
@@ -130,8 +126,6 @@
hg04_race \
hg05_race2 \
hg06_readshared \
- rwlock_race \
- rwlock_test \
tc01_simple_race \
tc02_simple_tls \
tc03_re_excl \
@@ -151,26 +145,21 @@
tc17_sembar \
tc18_semabuse \
tc19_shadowmem \
- tc20_verifywrap \
tc21_pthonce \
tc22_exit_w_lock \
tc23_bogus_condwait \
tc24_nonzero_sem
if HAVE_PTHREAD_BARRIER
-check_PROGRAMS += bar_bad bar_trivial pth_barrier
+check_PROGRAMS += bar_bad bar_trivial
endif
+if HAVE_PTHREAD_MUTEX_TIMEDLOCK
+check_PROGRAMS += tc20_verifywrap
+endif
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
- -I$(top_srcdir)/coregrind -I$(top_builddir)/include \
- -I@VEX_DIR@/pub
+AM_CFLAGS += $(AM_FLAG_M3264_PRI)
+AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
-# are these necessary?
-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
-LDADD = -lpthread
+LDADD = -lpthread
-# only needed because of referencing sources in drd/tests
-pth_barrier_SOURCES = ../../drd/tests/pth_barrier.c
-rwlock_race_SOURCES = ../../drd/tests/rwlock_race.c
-rwlock_test_SOURCES = ../../drd/tests/rwlock_test.c
Copied: branches/DARWIN/helgrind/tests/pth_barrier.c (from rev 9202, trunk/helgrind/tests/pth_barrier.c)
===================================================================
--- branches/DARWIN/helgrind/tests/pth_barrier.c (rev 0)
+++ branches/DARWIN/helgrind/tests/pth_barrier.c 2009-02-23 01:57:26 UTC (rev 9229)
@@ -0,0 +1,110 @@
+/* Test whether all data races are detected in a multithreaded program with
+ * barriers.
+ */
+
+
+#define _GNU_SOURCE
+
+/***********************/
+/* Include directives. */
+/***********************/
+
+#include <assert.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+
+/*********************/
+/* Type definitions. */
+/*********************/
+
+struct threadinfo
+{
+ pthread_barrier_t* b;
+ pthread_t tid;
+ int* array;
+ int iterations;
+};
+
+
+/********************/
+/* Local variables. */
+/********************/
+
+static int s_silent;
+
+
+/*************************/
+/* Function definitions. */
+/*************************/
+
+/** Single thread, which touches p->iterations elements of array p->array.
+ * Each modification of an element of p->array is a data race. */
+static void* threadfunc(struct threadinfo* p)
+{
+ int i;
+ int* const array = p->array;
+ pthread_barrier_t* const b = p->b;
+ if (! s_silent)
+ printf("thread %lx iteration 0\n", pthread_self());
+ pthread_barrier_wait(b);
+ for (i = 0; i < p->iterations; i++)
+ {
+ if (! s_silent)
+ printf("thread %lx iteration %d; writing to %p\n",
+ pthread_self(), i + 1, &array[i]);
+ array[i] = i;
+ pthread_barrier_wait(b);
+ }
+ return 0;
+}
+
+/** Actual test, consisting of nthread threads. */
+static void barriers_and_races(const int nthread, const int iterations)
+{
+ int i;
+ struct threadinfo* t;
+ pthread_barrier_t b;
+ int* array;
+
+ t = malloc(nthread * sizeof(struct threadinfo));
+ array = malloc(iterations * sizeof(array[0]));
+
+ if (! s_silent)
+ printf("&array[0] = %p\n", array);
+
+ pthread_barrier_init(&b, 0, nthread);
+
+ for (i = 0; i < nthread; i++)
+ {
+ t[i].b = &b;
+ t[i].array = array;
+ t[i].iterations = iterations;
+ pthread_create(&t[i].tid, 0, (void*(*)(void*))threadfunc, &t[i]);
+ }
+
+ for (i = 0; i < nthread; i++)
+ {
+ pthread_join(t[i].tid, 0);
+ }
+
+ pthread_barrier_destroy(&b);
+
+ free(array);
+ free(t);
+}
+
+int main(int argc, char** argv)
+{
+ int nthread;
+ int iterations;
+
+ nthread = (argc > 1) ? atoi(argv[1]) : 2;
+ iterations = (argc > 2) ? atoi(argv[2]) : 3;
+ s_silent = (argc > 3) ? atoi(argv[3]) : 0;
+
+ barriers_and_races(nthread, iterations);
+
+ return 0;
+}
Modified: branches/DARWIN/helgrind/tests/pth_barrier1.vgtest
===================================================================
--- branches/DARWIN/helgrind/tests/pth_barrier1.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/helgrind/tests/pth_barrier1.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,4 +1,4 @@
prereq: test -e bar_trivial
-prog: pth_barrier
+prog: ../../drd/tests/pth_barrier
args: 2 1 1
vgopts: -q
Modified: branches/DARWIN/helgrind/tests/pth_barrier2.vgtest
===================================================================
--- branches/DARWIN/helgrind/tests/pth_barrier2.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/helgrind/tests/pth_barrier2.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,4 +1,4 @@
prereq: test -e bar_trivial
-prog: pth_barrier
+prog: ../../drd/tests/pth_barrier
args: 2 32 1
vgopts: -q --cmp-race-err-addrs=yes
Modified: branches/DARWIN/helgrind/tests/pth_barrier3.vgtest
===================================================================
--- branches/DARWIN/helgrind/tests/pth_barrier3.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/helgrind/tests/pth_barrier3.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,4 +1,4 @@
prereq: test -e bar_trivial
-prog: pth_barrier
+prog: ../../drd/tests/pth_barrier
args: 32 1 1
vgopts: -q
Copied: branches/DARWIN/helgrind/tests/rwlock_race.c (from rev 9202, trunk/helgrind/tests/rwlock_race.c)
===================================================================
--- branches/DARWIN/helgrind/tests/rwlock_race.c (rev 0)
+++ branches/DARWIN/helgrind/tests/rwlock_race.c 2009-02-23 01:57:26 UTC (rev 9229)
@@ -0,0 +1,56 @@
+/** Cause a race inside code protected by a reader lock.
+ */
+
+
+/* Needed for older glibc's (2.3 and older, at least) who don't
+ otherwise "know" about pthread_rwlock_anything or about
+ PTHREAD_MUTEX_RECURSIVE (amongst things). */
+
+#define _GNU_SOURCE 1
+
+#include <pthread.h>
+#include <stdio.h>
+#include <unistd.h>
+
+
+
+static pthread_rwlock_t s_rwlock;
+static int s_racy;
+
+static void sleep_ms(const int ms)
+{
+ struct timespec delay = { ms / 1000, (ms % 1000) * 1000 * 1000 };
+ nanosleep(&delay, 0);
+}
+
+static void* thread_func(void* arg)
+{
+ pthread_rwlock_rdlock(&s_rwlock);
+ s_racy++;
+ pthread_rwlock_unlock(&s_rwlock);
+ sleep_ms(100);
+ return 0;
+}
+
+int main(int argc, char** argv)
+{
+ pthread_t thread1;
+ pthread_t thread2;
+
+#if 0
+ int res;
+ VALGRIND_DO_CLIENT_REQUEST(res, 0, VG_USERREQ__DRD_TRACE_ADDR,
+ &s_racy, 0, 0, 0, 0);
+#endif
+
+ pthread_rwlock_init(&s_rwlock, 0);
+ pthread_create(&thread1, 0, thread_func, 0);
+ pthread_create(&thread2, 0, thread_func, 0);
+ pthread_join(thread1, 0);
+ pthread_join(thread2, 0);
+ pthread_rwlock_destroy(&s_rwlock);
+
+ fprintf(stderr, "Result: %d\n", s_racy);
+
+ return 0;
+}
Modified: branches/DARWIN/helgrind/tests/rwlock_race.vgtest
===================================================================
--- branches/DARWIN/helgrind/tests/rwlock_race.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/helgrind/tests/rwlock_race.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,2 +1,2 @@
-prog: rwlock_race
+prog: ../../drd/tests/rwlock_race
vgopts: --read-var-info=yes
Copied: branches/DARWIN/helgrind/tests/rwlock_test.c (from rev 9202, trunk/helgrind/tests/rwlock_test.c)
===================================================================
--- branches/DARWIN/helgrind/tests/rwlock_test.c (rev 0)
+++ branches/DARWIN/helgrind/tests/rwlock_test.c 2009-02-23 01:57:26 UTC (rev 9229)
@@ -0,0 +1,52 @@
+/** Multithreaded test program that triggers various access patterns without
+ * triggering any race conditions.
+ */
+
+
+#define _GNU_SOURCE 1
+
+#include <pthread.h>
+#include <stdio.h>
+
+
+static pthread_rwlock_t s_rwlock;
+static int s_counter;
+
+static void* thread_func(void* arg)
+{
+ int i;
+ int sum = 0;
+
+ for (i = 0; i < 1000; i++)
+ {
+ pthread_rwlock_rdlock(&s_rwlock);
+ sum += s_counter;
+ pthread_rwlock_unlock(&s_rwlock);
+ pthread_rwlock_wrlock(&s_rwlock);
+ s_counter++;
+ pthread_rwlock_unlock(&s_rwlock);
+ }
+
+ return 0;
+}
+
+int main(int argc, char** argv)
+{
+ const int thread_count = 10;
+ pthread_t tid[thread_count];
+ int i;
+
+ for (i = 0; i < thread_count; i++)
+ {
+ pthread_create(&tid[i], 0, thread_func, 0);
+ }
+
+ for (i = 0; i < thread_count; i++)
+ {
+ pthread_join(tid[i], 0);
+ }
+
+ fprintf(stderr, "Finished.\n");
+
+ return 0;
+}
Modified: branches/DARWIN/helgrind/tests/rwlock_test.vgtest
===================================================================
--- branches/DARWIN/helgrind/tests/rwlock_test.vgtest 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/helgrind/tests/rwlock_test.vgtest 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1 +1 @@
-prog: rwlock_test
+prog: ../../drd/tests/rwlock_test
Modified: branches/DARWIN/massif/tests/Makefile.am
===================================================================
--- branches/DARWIN/massif/tests/Makefile.am 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/massif/tests/Makefile.am 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,8 +1,4 @@
-# For AM_FLAG_M3264_PRI
-include $(top_srcdir)/Makefile.flags.am
-
-# For check-local and clean-local
include $(top_srcdir)/Makefile.tool-tests.am
noinst_SCRIPTS = filter_stderr filter_verbose
@@ -45,12 +41,6 @@
zero1.post.exp zero1.stderr.exp zero1.vgtest \
zero2.post.exp zero2.stderr.exp zero2.vgtest
-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
- -I$(top_srcdir)/coregrind -I$(top_builddir)/include \
- -I@VEX_DIR@/pub
-
check_PROGRAMS = \
alloc-fns \
basic \
@@ -73,6 +63,9 @@
thresholds \
zero
+AM_CFLAGS += $(AM_FLAG_M3264_PRI)
+AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
+
# C++ tests
new_cpp_SOURCES = new-cpp.cpp
overloaded_new_SOURCES = overloaded-new.cpp
Modified: branches/DARWIN/memcheck/tests/Makefile.am
===================================================================
--- branches/DARWIN/memcheck/tests/Makefile.am 2009-02-23 01:33:40 UTC (rev 9228)
+++ branches/DARWIN/memcheck/tests/Makefile.am 2009-02-23 01:57:26 UTC (rev 9229)
@@ -1,8 +1,4 @@
-# For AM_FLAG_M3264_PRI
-include $(top_srcdir)/Makefile.flags.am
-
-# For check-local and clean-local
include $(top_srcdir)/Makefile.tool-tests.am
SUBDIRS = .
@@ -193,7 +189,7 @@
describe-block \
doublefree error_counts errs1 exitprog execve execve2 erringfds \
file_locking \
- fprw fwrite hello inits inline \
+ fprw fwrite inits inline \
leak-0 leak-cycle leak-pool leak-tree leak-regroot leakotron \
linux-syslog-syscall \
linux-syscalls-2007 \
@@ -228,24 +224,16 @@
wrap1 wrap2 wrap3 wrap4 wrap5 wrap6 wrap7 wrap7so.so wrap8 \
writev zeropage
+AM_CFLAGS += $(AM_FLAG_M3264_PRI)
+AM_CXXFLAGS += $(AM_FLAG_M3264_PRI)
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/include \
- -I$(top_srcdir)/coregrind -I$(top_builddir)/include \
- -I@VEX_DIR@/pub
-AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -g $(AM_FLAG_M3264_PRI)
-AM_CXXFLAGS = $(AM_CFLAGS)
-
# Extra stuff for C tests
-memcmptest_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -fno-builtin-memcmp
-oset_test_CFLAGS = $(AM_FLAG_M3264_PRI) \
- -DVGA_$(VGCONF_ARCH_PRI)=1 \
- -DVGO_$(VGCONF_OS)=1 \
- -DVGP_$(VGCONF_ARCH_PRI)_$(VGCONF_OS)=1
-vcpu_bz2_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O2 -g
-vcpu_fbench_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O2 -g
-vcpu_fnfns_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O2 -g
+memcmptest_CFLAGS = $(AM_CFLAGS) -fno-builtin-memcmp
+vcpu_bz2_CFLAGS = $(AM_CFLAGS) -O2
+vcpu_fbench_CFLAGS = $(AM_CFLAGS) -O2
+vcpu_fnfns_CFLAGS = $(AM_CFLAGS) -O2
vcpu_fnfns_LDADD = -lm
-wrap6_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O2 -g
+wrap6_CFLAGS = $(AM_CFLAGS) -O2
# Don't allow GCC to inline memcpy(), because then we can't intercept it
overlap_CFLAGS = $(AM_CFLAGS) -fno-builtin-memcpy
@@ -255,17 +243,17 @@
supp2_SOURCES = supp.c
# To make it a bit more realistic, have some optimisation enabled
# for the varinfo tests. We still expect sane results.
-varinfo1_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -g
-varinfo2_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -g -Wno-shadow
-varinfo3_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -g
-varinfo4_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -g
-varinfo5_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -g
-varinfo6_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -g
-# This requires optimisation in order to get just one resulting error
-origin4_many_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -g
-# Apply -O so as to run in reasonable time
-origin5_bz2_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -g
-origin6_fp_CFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -g
+varinfo1_CFLAGS = $(AM_CFLAGS) -O
+varinfo2_CFLAGS = $(AM_CFLAGS) -O -Wno-shadow
+varinfo3_CFLAGS = $(AM_CFLAGS) -O
+varinfo4_CFLAGS = $(AM_CFLAGS) -O
+varinfo5_CFLAGS = $(AM_CFLAGS) -O
+varinfo6_CFLAGS = $(AM_CFLAGS) -O
+# This requires optimisation in order to get just one resulting error.
+origin4_many_CFLAGS = $(AM_CFLAGS) -O
+# Apply -O so as to run in reasonable time.
+origin5_bz2_CFLAGS = $(AM_CFLAGS) -O
+origin6_fp_CFLAGS = $(AM_CFLAGS) -O
# C++ tests
mismatches_SOURCES = mismatches.cpp
@@ -273,7 +261,7 @@
new_override_SOURCES = new_override.cpp
deep_templates_SOURCES = deep_templates.cpp
long_namespace_xml_SOURCES = long_namespace_xml.cpp
-deep_templates_CXXFLAGS = $(AM_FLAG_M3264_PRI) $(AM_CFLAGS) -O -gstabs
+deep_templates_CXXFLAGS = $(AM_CFLAGS) -O -gstabs
if VGCONF_PLATFORMS_INCLUDE_PPC32_AIX5
if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
@@ -282,13 +270,13 ...
[truncated message content] |