Changeset 431bb85d in rtems

Timestamp:

05/19/14 13:07:22 (10 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.11, 5, master

Children:

5b45d51

Parents:

dac5696

git-author:

Chris Johns <chrisj@…> (05/19/14 13:07:22)

git-committer:

Chris Johns <chrisj@…> (05/28/14 13:44:26)

Message:

rtems-test-check: Ignore tests which require real ISR based clock tick

BSPs for simulators which do not include a clock tick interrupt source
are incapable of running some tests successfully. This is a common
characteristic of some BSPs and a fixed set of tests. There is no point
in duplicating this list of tests in those BSPs test configuration.

Read testsuites/testdata/require-tick-isr.tcfg for details.

Files:

• testsuites/automake/test-subdirs.am (modified) (1 diff)
• testsuites/testdata/require-tick-isr.tcfg (added)
• tools/build/rtems-test-check (modified) (3 diffs)

testsuites/automake/test-subdirs.am

@@ -23 +23 @@
         echo "BSP Testsuite Data: $$vtdata"; \
         list=`$(top_srcdir)/../../tools/build/rtems-test-check \
-                 $$tdata $(RTEMS_BSP) $(_SUBDIRS)`; \
+                 $$tdata $(top_srcdir)/.. $(RTEMS_BSP) $(_SUBDIRS)`; \
         for subdir in $$list; do \
           echo "Making $$target in $$subdir"; \

tools/build/rtems-test-check

@@ -6 +6 @@
 
 #
-# usage: rtems-test-check <bsp-test-database> <bsp> <tests..>
+# usage: rtems-test-check <bsp-test-database> <includes> <bsp> <tests..>
 #
 
@@ -16 +16 @@
 testdata="$1"
 shift
+includepath="$1"
+shift
 bsp="$1"
 shift
@@ -24 +26 @@
 # If there is no testdata all tests are valid.
 #
+
 if test -f $testdata; then
   disabled_tests=""
-  for t in $(cat $testdata | sed -e 's/#.*$//' -e '/^$/d');
+  while [ ! -z $testdata ];
   do
-   disabled_tests="${disabled_tests} ${t}"
+    for td in $testdata;
+    do
+      ntd=""
+      exec 3<& 0
+      exec 0<$td
+      while read line
+      do
+        line=$(echo $line | sed -e 's/#.*$//' -e '/^$/d')
+        if [ ! -z "$line" ]; then
+          include=$(echo $line | sed -e "s/include:.*/yes/g")
+          if [ "$include" = "yes" ]; then
+            inf=$(echo $line | sed -e "s/include://g" -e 's/^[ \t]//;s/[ \t]$//')
+            if test -f $includepath/$inf; then
+              ntd="$includepath/$inf $ntd"
+            fi
+          else
+            disabled_tests="${disabled_tests} $line"
+          fi
+        fi
+      done
+    done
+    testdata=$ntd
   done