Remove TEST_TOOLS and TEXT_EXP_TOOLS as they are no longer needed.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12262 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/Makefile.am b/Makefile.am
index fadc32a..fc6b7bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,16 +16,6 @@
exp-bbv \
exp-dhat
-# DDD: once all tools work on Darwin, TEST_TOOLS and TEST_EXP_TOOLS can be
-# replaced with TOOLS and EXP_TOOLS.
-TEST_TOOLS = $(TOOLS)
-if !VGCONF_OS_IS_DARWIN
- TEST_EXP_TOOLS = $(EXP_TOOLS)
-else
- TEST_EXP_TOOLS = exp-bbv
-endif
-
-
# Put docs last because building the HTML is slow and we want to get
# everything else working before we try it.
SUBDIRS = \
@@ -76,13 +66,13 @@
## Preprend @PERL@ because tests/vg_regtest isn't executable
regtest: check
- -tests/check_makefile_consistency gdbserver_tests $(TEST_TOOLS) $(TEST_EXP_TOOLS)
+ -tests/check_makefile_consistency gdbserver_tests $(TOOLS) $(EXP_TOOLS)
gdbserver_tests/make_local_links $(GDB)
- @PERL@ tests/vg_regtest gdbserver_tests $(TEST_TOOLS) $(TEST_EXP_TOOLS)
+ @PERL@ tests/vg_regtest gdbserver_tests $(TOOLS) $(EXP_TOOLS)
nonexp-regtest: check
- @PERL@ tests/vg_regtest $(TEST_TOOLS)
+ @PERL@ tests/vg_regtest $(TOOLS)
exp-regtest: check
- @PERL@ tests/vg_regtest gdbserver_tests $(TEST_EXP_TOOLS)
+ @PERL@ tests/vg_regtest gdbserver_tests $(EXP_TOOLS)
# Nb: gdbserver_tests are put in exp-regtest rather than nonexp-regtest
# because they are tested with various valgrind tools, so might be using
# an experimental tool.