projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
89e21b5
)
added NO_TEST_RUNS flag to skip running any tests.
author
Chris Koeritz
<fred@gruntose.com>
Wed, 24 Jul 2013 22:39:28 +0000
(17:39 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Wed, 24 Jul 2013 22:39:28 +0000
(17:39 -0500)
production/feisty_meow_config.ini
patch
|
blob
|
history
scripts/clam/cpp/rules.def
patch
|
blob
|
history
scripts/clam/target_runner.sh
patch
|
blob
|
history
scripts/clam/variables.def
patch
|
blob
|
history
diff --git
a/production/feisty_meow_config.ini
b/production/feisty_meow_config.ini
index 367c7203303d6a25043618fb9486c7441e617b5f..74f999ce816c522543c998f931ab85f87370553e 100755
(executable)
--- a/
production/feisty_meow_config.ini
+++ b/
production/feisty_meow_config.ini
@@
-24,6
+24,9
@@
DEBUG=t
# considered errors.
#STRICT_WARNINGS=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
# 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 6e4338cb3ebd210c8f57571571f1ce72233c97c1..aea2b4a056dbc6996ce9e298e04e6dd1e750b803 100644
(file)
--- 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.
# 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
# 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 d915a9aa9e0e32b2806cd4673603a2c1f3eca014..67f96cb8228025feaaf3da288438ceef39afc65e 100755
(executable)
--- 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 "\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
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 594b57f34c3212f2b55443264dcd9c064f60b672..3a21425892ec677ce7fd82a1ffc428c2bca4ac35 100644
(file)
--- 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
# "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
# "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