Merge the DARWIN branch onto the trunk.
I tried using 'svn merge' to do the merge but it did a terrible job and
there were bazillions of conflicts. So instead I just took the diff between
the branch and trunk at r10155, applied the diff to the trunk, 'svn add'ed
the added files (no files needed to be 'svn remove'd) and committed.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10156 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index 57ab3e2..0106209 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,22 @@
EXP_TOOLS = exp-omega \
exp-ptrcheck
+# DDD: once all tools work on Darwin, TEST_TOOLS and TEST_EXP_TOOLS can be
+# replaced with TOOLS and EXP_TOOLS.
+if !VGCONF_OS_IS_DARWIN
+ TEST_TOOLS = $(TOOLS)
+ TEST_EXP_TOOLS = $(EXP_TOOLS)
+else
+ TEST_TOOLS = memcheck \
+ cachegrind \
+ callgrind \
+ massif \
+ lackey \
+ none
+
+ TEST_EXP_TOOLS = exp-omega
+endif
+
# Put docs last because building the HTML is slow and we want to get
# everything else working before we try it.
SUBDIRS = include coregrind . tests perf auxprogs $(TOOLS) $(EXP_TOOLS) docs
@@ -27,7 +43,8 @@
glibc-2.34567-NPTL-helgrind.supp \
glibc-2.2-LinuxThreads-helgrind.supp \
glibc-2.X-drd.supp \
- exp-ptrcheck.supp
+ exp-ptrcheck.supp \
+ darwin9.supp
DEFAULT_SUPP_FILES = @DEFAULT_SUPP@
# We include all the base .supp files in the distribution, but not
@@ -78,6 +95,9 @@
if VGCONF_PLATFORMS_INCLUDE_PPC64_AIX5
# Ditto
endif
+if VGCONF_OS_IS_DARWIN
+# GrP untested, possibly hopeless
+endif
default.supp: $(DEFAULT_SUPP_FILES)
echo "# This is a generated file, composed of the following suppression rules:" > default.supp
@@ -86,11 +106,11 @@
## Preprend @PERL@ because tests/vg_regtest isn't executable
regtest: check
- @PERL@ tests/vg_regtest $(TOOLS) $(EXP_TOOLS)
+ @PERL@ tests/vg_regtest $(TEST_TOOLS) $(TEST_EXP_TOOLS)
nonexp-regtest: check
- @PERL@ tests/vg_regtest $(TOOLS)
+ @PERL@ tests/vg_regtest $(TEST_TOOLS)
exp-regtest: check
- @PERL@ tests/vg_regtest $(EXP_TOOLS)
+ @PERL@ tests/vg_regtest $(TEST_EXP_TOOLS)
## Preprend @PERL@ because tests/vg_perf isn't executable
perf: check