Add a way to easily exclude a file from nightly test.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1732 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/arm/drv/pwm_arm.c b/bertos/cpu/arm/drv/pwm_arm.c
index 9eb019b5fb6d03921faebe42034f4afe835bebdd..d643739ce9b4df752a254fea1b390ecfb1bf5d6d 100644 (file)
--- a/bertos/cpu/arm/drv/pwm_arm.c
+++ b/bertos/cpu/arm/drv/pwm_arm.c
@@ -36,6 +36,10 @@
  *
  * \author Daniele Basile <asterix@develer.com>
  *
+ * This module is automatically included so no need to include 
+ * in test list.
+ * notest: arm
+ *
  */
 
 #include <cpu/detect.h>

diff --git a/bertos/cpu/arm/drv/ser_arm.c b/bertos/cpu/arm/drv/ser_arm.c
index 5ae158687f249139983aa9452ec148e2ca65e036..a2e2e8c427a6ad0f2c8f39f4e813ff0fff07f047 100644 (file)
--- a/bertos/cpu/arm/drv/ser_arm.c
+++ b/bertos/cpu/arm/drv/ser_arm.c
@@ -36,6 +36,10 @@
  *
  * \author Daniele Basile <asterix@develer.com>
  *
+ * This module is automatically included so no need to include 
+ * in test list.
+ * notest: arm
+ *
  */
 
 #include <cpu/detect.h>

diff --git a/bertos/cpu/arm/drv/stepper_arm.c b/bertos/cpu/arm/drv/stepper_arm.c
index d27402c07751b8db93a37226a408663897bd772a..a51abf842e6b120cd59a8161fc5344303bd45036 100644 (file)
--- a/bertos/cpu/arm/drv/stepper_arm.c
+++ b/bertos/cpu/arm/drv/stepper_arm.c
@@ -36,6 +36,9 @@
  *
  * \author Daniele Basile <asterix@develer.com>
  *
+ * This module is automatically included so no need to include 
+ * in test list.
+ * notest: arm
  */
 
 #include <cpu/detect.h>

diff --git a/bertos/cpu/arm/drv/twi_arm.c b/bertos/cpu/arm/drv/twi_arm.c
index 4b67aea8407bf182ad1350d997d532397ef7aa93..5a3cbe1ca2125cdf08f1957cdb554e51aabfba95 100644 (file)
--- a/bertos/cpu/arm/drv/twi_arm.c
+++ b/bertos/cpu/arm/drv/twi_arm.c
@@ -36,6 +36,10 @@
  *
  * \author Daniele Basile <asterix@develer.com>
  *
+ * This module is automatically included so no need to include 
+ * in test list.
+ * notest: arm
+ *
  */
 
 #include <cpu/detect.h>

diff --git a/bertos/kern/irq.c b/bertos/kern/irq.c
index dba432ef890a2d8af77a5257f9d1fc35db35b113..9a1ff514cef875e2aa426cd31134ffd7274e7df0 100644 (file)
--- a/bertos/kern/irq.c
+++ b/bertos/kern/irq.c
@@ -33,6 +33,10 @@
  *
  * \version $Id: proc.h 1646 2008-08-17 13:49:48Z bernie $
  * \author Bernie Innocenti <bernie@codewiz.org>
+ *
+ * Still in development, disable nightly test for now
+ * notest: avr
+ * notest: arm
  */
 #include "irq.h"
 

diff --git a/test/gen_mk_src.sh b/test/gen_mk_src.sh
index ac642824e25cc2c19e8652ec0477f6ff844c196b..fd487f3edda464141823c37aa797421afbbf64bb 100755 (executable)
--- a/test/gen_mk_src.sh
+++ b/test/gen_mk_src.sh
@@ -39,10 +39,6 @@ TEST_SCRIPT_DIR="test"
 #Test directory, where are the test makefile
 TEST_APP_DIR="app/test/"
 
-#Dir list for ARM, write with escape char for sed regrepx
-ARM_DRV="${BERTOS_DIR_RE}\\/cpu\\/arm\\/drv"
-ARM_DRV_C_EXCLUDE_LIST="ser_arm pwm_arm twi_arm stepper_arm"
-
 if [ $# \< 1 ] ; then
        printf "You must specify a cpu target!\n\n"
        printf "EXAMPLE:\n $0 <cpu target>\n\n"
@@ -58,17 +54,6 @@ ASRC=`${TEST_SCRIPT_DIR}/get_source_list.sh $1 S`
 #kdebug  must added to skip list because it is compiled two times and the linker fail.
 CSRC=`echo $CSRC | sed -e "s/${BERTOS_DIR_RE}\\/drv\\/kdebug\\.c//g"`
 
-#Source to skip:
-
-if [ $1 = 'arm' ] ; then
-       for i in $ARM_DRV_C_EXCLUDE_LIST ;
-               do
-                       CSRC=`echo $CSRC | sed -e "s/${ARM_DRV}\\/$i\\.c//g"`
-               done
-fi
-
-
-
 printf "#This makefile was generate automatically.\n\n" > ${TEST_APP_DIR}/$1_src.mk
 printf "${1}_CSRC = $CSRC\n\n" >> ${TEST_APP_DIR}/$1_src.mk
 printf "${1}_ASRC = $ASRC\n\n" >> ${TEST_APP_DIR}/$1_src.mk

diff --git a/test/get_source_list.sh b/test/get_source_list.sh
index b58f682450cba73fe3c09270c79bbe4cf70e16eb..ef6bd50ae57a625de8b62796ebe8fc943b5f887f 100755 (executable)
--- a/test/get_source_list.sh
+++ b/test/get_source_list.sh
@@ -45,16 +45,34 @@ if [ $# \< 2 ] ; then
 
        exit 1
 fi
-
+CPU_TARGET=$1
 #Create a list of source file whitout a cpu specific source
 GEN_SRC=`find . \( -name \.svn -prune -o -path $CPU_DIR -prune -o -path $APP_DIR  -prune -o -path $OS_DIR -prune -o -path $EMUL_DIR -prune \) -o -name *.${2} -print | xargs`
 
 #Select c and asm sources for selected cpu target
-TRG_SRC=`find ${CPU_DIR}/${1} -name \.svn -prune -o -name *.${2} -print | xargs`
+TRG_SRC=`find ${CPU_DIR}/$CPU_TARGET -name \.svn -prune -o -name *.${2} -print | xargs`
 
 #Generate a list of all source for each cpu
 SRC_ALL=${GEN_SRC}" "${TRG_SRC}
 
+# Find the files that contain the string
+# NOTEST <cpu target> and put it in a list
+
+NOTEST="notest:"
+for src in $SRC_ALL ;
+do
+       grep "$NOTEST\s*$CPU_TARGET" $src 2>&1 > /dev/null
+       if [ $? = 0 ] ; then
+               EXCLUDE_LIST+=$src
+       fi      
+done
+
+# Remove the exclude list files from the sources to be
+# compiled
+for src in $EXCLUDE_LIST ;
+do
+       SRC_ALL=`echo $SRC_ALL | sed -e "s;$src;;g"`
+done
 
 printf "${SRC_ALL}"