Improved testing procedures for RT. Improved simulator port for RT.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7879 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 44 insertions, 37 deletions

diff --git a/test/rt/testbuild/Makefile b/test/rt/testbuild/Makefile
index 7d10e9667..143ccbe01 100644
--- a/test/rt/testbuild/Makefile
+++ b/test/rt/testbuild/Makefile
@@ -136,7 +136,7 @@ clean:
 	-rm -fR .dep

 

 misra:

-	@lint-nt -v -w3 $(DEFS) pclint/co-gcc.lnt pclint/au-misra3.lnt pclint/waivers.lnt $(INCDIR) $(KERNSRC) &> misra.txt

+	@lint-nt -v -w3 $(DEFS) pclint/co-gcc.lnt pclint/au-misra3.lnt pclint/waivers.lnt $(INCDIR) $(KERNSRC)

 

 #

 # Include the dependency files, should be the last of the makefile

diff --git a/test/rt/testbuild/chconf.h b/test/rt/testbuild/chconf.h
index b6b58e6bf..5b21d70b8 100644
--- a/test/rt/testbuild/chconf.h
+++ b/test/rt/testbuild/chconf.h
@@ -153,7 +153,7 @@
  * @note    The default is @p TRUE.

  */

 #if !defined(CH_CFG_USE_TM) || defined(__DOXIGEN__)

-#define CH_CFG_USE_TM                       FALSE

+#define CH_CFG_USE_TM                       TRUE

 #endif

 

 /**

diff --git a/test/rt/testbuild/go.sh b/test/rt/testbuild/go.sh
index b09fcd4c3..ac73b7883 100644
--- a/test/rt/testbuild/go.sh
+++ b/test/rt/testbuild/go.sh
@@ -18,6 +18,7 @@ function compile() {
     clean
     exit
   fi
+  mv -f buildlog.txt ./reports/${1}_build.txt
   echo "OK"
 }
 
@@ -29,28 +30,29 @@ function execute_test() {
     clean
     exit
   fi
+  mv -f testlog.txt ./reports/${1}_test.txt
   echo "OK"
 }
 
 function coverage() {
   echo -n "  * Coverage..."
-  mkdir coverage    2> /dev/null
-  mkdir coverage/$1 2> /dev/null
-  echo "Configuration $2" > coverage/$1.txt
-  echo "----------------------------------------------------------------" >> coverage/$1.txt
-  if ! make gcov >> coverage/$1.txt 2> /dev/null
+  mkdir reports/${1}_gcov 2> /dev/null
+  echo "Configuration $2" > gcovlog.txt
+  echo "----------------------------------------------------------------" >> reports/gcovlog.txt
+  if ! make gcov >> gcovlog.txt 2> /dev/null
   then
     echo "failed"
     clean
     exit
   fi
-  mv -f *.gcov ./coverage/$1
+  mv -f gcovlog.txt ./reports/${1}_gcov.txt
+  mv -f *.gcov ./reports/${1}_gcov
   echo "OK"
 }
 
 function misra() {
   echo -n "  * Analysing..."
-  if ! make misra > misralog.txt
+  if ! make misra > misralog.txt 2> misraerrlog.txt
   then
     echo "failed"
     clean
@@ -69,8 +71,8 @@ function test() {
     XDEFS=$2
   fi
   echo $msg
-  compile
-  execute_test
+  compile $1
+  execute_test $1
   coverage $1 "$msg"
   misra
   clean
@@ -83,34 +85,39 @@ function partial() {
   clean
 }
 
+mkdir reports 2> /dev/null
+
 test cfg1 ""
 test cfg2 "-DCH_CFG_OPTIMIZE_SPEED=FALSE"
 test cfg3 "-DCH_CFG_TIME_QUANTUM=0"
 test cfg4 "-DCH_CFG_USE_REGISTRY=FALSE"
-test cfg5 "-DCH_CFG_USE_SEMAPHORES=FALSE -DCH_CFG_USE_MAILBOXES=FALSE"
-test cfg6 "-DCH_CFG_USE_SEMAPHORES_PRIORITY=TRUE"
-test cfg7 "-DCH_CFG_USE_MUTEXES=FALSE -DCH_CFG_USE_CONDVARS=FALSE"
-test cfg8 "-DCH_CFG_USE_MUTEXES_RECURSIVE=TRUE"
-test cfg9 "-DCH_CFG_USE_CONDVARS=FALSE"
-test cfg10 "-DCH_CFG_USE_CONDVARS_TIMEOUT=FALSE"
-test cfg11 "-DCH_CFG_USE_EVENTS=FALSE"
-test cfg12 "-DCH_CFG_USE_EVENTS_TIMEOUT=FALSE"
-test cfg13 "-DCH_CFG_USE_MESSAGES=FALSE"
-test cfg14 "-DCH_CFG_USE_MESSAGES_PRIORITY=TRUE"
-test cfg15 "-DCH_CFG_USE_MAILBOXES=FALSE"
-test cfg16 "-DCH_CFG_USE_MEMCORE=FALSE -DCH_CFG_USE_MEMPOOLS=FALSE -DCH_CFG_USE_HEAP=FALSE -DCH_CFG_USE_DYNAMIC=FALSE"
-test cfg17 "-DCH_CFG_USE_MEMPOOLS=FALSE -DCH_CFG_USE_HEAP=FALSE -DCH_CFG_USE_DYNAMIC=FALSE"
-test cfg18 "-DCH_CFG_USE_MEMPOOLS=FALSE"
-test cfg19 "-DCH_CFG_USE_HEAP=FALSE"
-test cfg20 "-DCH_CFG_USE_DYNAMIC=FALSE"
-#test cfg21 "-DCH_DBG_STATISTICS=TRUE"
-test cfg22 "-DCH_DBG_SYSTEM_STATE_CHECK=TRUE"
-test cfg23 "-DCH_DBG_ENABLE_CHECKS=TRUE"
-test cfg24 "-DCH_DBG_ENABLE_ASSERTS=TRUE"
-test cfg25 "-DCH_DBG_ENABLE_TRACE=TRUE"
-#test cfg26 "-DCH_DBG_ENABLE_STACK_CHECK=TRUE"
-test cfg27 "-DCH_DBG_FILL_THREADS=TRUE"
-test cfg28 "-DCH_DBG_THREADS_PROFILING=FALSE"
-test cfg29 "-DCH_DBG_SYSTEM_STATE_CHECK=TRUE -DCH_DBG_ENABLE_CHECKS=TRUE -DCH_DBG_ENABLE_ASSERTS=TRUE -DCH_DBG_ENABLE_TRACE=TRUE -DCH_DBG_FILL_THREADS=TRUE"
+test cfg5 "-DCH_CFG_USE_TM=FALSE"
+test cfg6 "-DCH_CFG_USE_SEMAPHORES=FALSE -DCH_CFG_USE_MAILBOXES=FALSE"
+test cfg7 "-DCH_CFG_USE_SEMAPHORES_PRIORITY=TRUE"
+test cfg8 "-DCH_CFG_USE_MUTEXES=FALSE -DCH_CFG_USE_CONDVARS=FALSE"
+test cfg9 "-DCH_CFG_USE_MUTEXES_RECURSIVE=TRUE"
+test cfg10 "-DCH_CFG_USE_CONDVARS=FALSE"
+test cfg11 "-DCH_CFG_USE_CONDVARS_TIMEOUT=FALSE"
+test cfg12 "-DCH_CFG_USE_EVENTS=FALSE"
+test cfg13 "-DCH_CFG_USE_EVENTS_TIMEOUT=FALSE"
+test cfg14 "-DCH_CFG_USE_MESSAGES=FALSE"
+test cfg15 "-DCH_CFG_USE_MESSAGES_PRIORITY=TRUE"
+test cfg16 "-DCH_CFG_USE_MAILBOXES=FALSE"
+test cfg17 "-DCH_CFG_USE_MEMCORE=FALSE -DCH_CFG_USE_MEMPOOLS=FALSE -DCH_CFG_USE_HEAP=FALSE -DCH_CFG_USE_DYNAMIC=FALSE"
+test cfg18 "-DCH_CFG_USE_MEMPOOLS=FALSE -DCH_CFG_USE_HEAP=FALSE -DCH_CFG_USE_DYNAMIC=FALSE"
+test cfg19 "-DCH_CFG_USE_MEMPOOLS=FALSE"
+test cfg20 "-DCH_CFG_USE_HEAP=FALSE"
+test cfg21 "-DCH_CFG_USE_DYNAMIC=FALSE"
+test cfg22 "-DCH_DBG_STATISTICS=TRUE"
+test cfg23 "-DCH_DBG_SYSTEM_STATE_CHECK=TRUE"
+test cfg24 "-DCH_DBG_ENABLE_CHECKS=TRUE"
+test cfg25 "-DCH_DBG_ENABLE_ASSERTS=TRUE"
+test cfg26 "-DCH_DBG_ENABLE_TRACE=TRUE"
+#test cfg27 "-DCH_DBG_ENABLE_STACK_CHECK=TRUE"
+test cfg28 "-DCH_DBG_FILL_THREADS=TRUE"
+test cfg29 "-DCH_DBG_THREADS_PROFILING=FALSE"
+test cfg30 "-DCH_DBG_SYSTEM_STATE_CHECK=TRUE -DCH_DBG_ENABLE_CHECKS=TRUE -DCH_DBG_ENABLE_ASSERTS=TRUE -DCH_DBG_ENABLE_TRACE=TRUE -DCH_DBG_FILL_THREADS=TRUE"
 
 rm *log.txt 2> /dev/null
+echo
+echo "Done"
diff --git a/test/rt/testbuild/readme.txt b/test/rt/testbuild/readme.txt
index aff565702..5e8b8543e 100644
--- a/test/rt/testbuild/readme.txt
+++ b/test/rt/testbuild/readme.txt
@@ -15,7 +15,7 @@ Coverage data is collected during the execution for use by step 3.
 Step 3: Coverage

 

 The utility gcov is ran on the generate data and the coverage information is

-stored in reports under ./coverage.

+stored in reports under ./reports.

 

 Step 4: Analysis