From 2a3a67a56b96e32b09e50e8ca9f29416fe42eff7 Mon Sep 17 00:00:00 2001
From: Chris Koeritz <fred@gruntose.com>
Date: Wed, 24 Jul 2013 17:39:28 -0500
Subject: [PATCH] added NO_TEST_RUNS flag to skip running any tests.

---
 production/feisty_meow_config.ini | 3 +++
 scripts/clam/cpp/rules.def        | 9 ---------
 scripts/clam/target_runner.sh     | 3 ++-
 scripts/clam/variables.def        | 2 ++
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/production/feisty_meow_config.ini b/production/feisty_meow_config.ini
index 367c7203..74f999ce 100755
--- a/production/feisty_meow_config.ini
+++ b/production/feisty_meow_config.ini
@@ -24,6 +24,9 @@ DEBUG=t
 # considered errors.
 #STRICT_WARNINGS=t
 
+# enable this if you want to disable the RUN_TARGETS for test execution.
+NO_TEST_RUNS=t
+
 # if this is enabled, then the source dependencies are only generated if
 # they're missing or if this file has changed.  non-lax dependencies get
 # rebuilt whenever a header involved changes, or dependent libraries have
diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def
index 6e4338cb..aea2b4a0 100644
--- a/scripts/clam/cpp/rules.def
+++ b/scripts/clam/cpp/rules.def
@@ -15,15 +15,6 @@
 # This section manipulates variable values to prepare them for their use
 # in the standard CLAM support.
 
-# special actions for projects that are tests.
-ifneq "$(findstring test, $(TYPE))" ""
-  # add the clean task at the end, so that we will always rebuild the tests
-  # and run them again.
-#hmmm: this is a kludge to make sure we always run the tests.  there has got
-#      to be a better way.
-#  LAST_TARGETS += clean
-endif
-
 # see if they have got the clean flag set.  if so, we will not build anything.
 ifneq "$(CLEAN)" ""
   NO_COMPILE = t
diff --git a/scripts/clam/target_runner.sh b/scripts/clam/target_runner.sh
index d915a9aa..67f96cb8 100755
--- a/scripts/clam/target_runner.sh
+++ b/scripts/clam/target_runner.sh
@@ -16,8 +16,9 @@
 #echo -e "\tDIRTY_FILE=${DIRTY_FILE}"
 #echo -e "\tSUBMAKE_FLAG=${SUBMAKE_FLAG}"
 #echo -e "\tFAILURE_FILE=${FAILURE_FILE}"
+#echo -e "\tNO_TEST_RUNS=${NO_TEST_RUNS}"
 
-if [ ! -z "${RUN_TARGETS}" ]; then
+if [ ! -z "${RUN_TARGETS}" -a -z "${NO_TEST_RUNS}" ]; then
   if [ -f "${DIRTY_FILE}" -o -f "${SUBMAKE_FLAG}" ]; then
     total_exitval=0;
     for program_name in ${RUN_TARGETS}; do
diff --git a/scripts/clam/variables.def b/scripts/clam/variables.def
index 594b57f3..3a214258 100644
--- a/scripts/clam/variables.def
+++ b/scripts/clam/variables.def
@@ -155,6 +155,8 @@ ACTUAL_LAST_TARGETS = $(LAST_TARGETS)
 
 # "RUN_TARGETS" is a list of programs that should be executed as part of a make.
 export RUN_TARGETS
+# "NO_TEST_RUNS" turns off execution of the RUN_TARGETS.
+export NO_TEST_RUNS
 
 # "MAKEFILE_NAME" works with BUILD_BEFORE and BUILD_AFTER.  This allows
 # the name of the makefile in the subdirectory to be changed to something other
-- 
2.34.1