diff options
author | Chris Johns <chrisj@rtems.org> | 2017-03-09 16:14:16 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2017-03-14 13:54:21 +1100 |
commit | eb733202ad13afd06d340422fcb67fbcf1533be0 (patch) | |
tree | c642e1cfa0388e82e3ed05a6494004afe54df9e2 | |
parent | libbsp/mips/shared/irq/i8259.c: Add include of rtems/bspIo.h (diff) | |
download | rtems-eb733202ad13afd06d340422fcb67fbcf1533be0.tar.bz2 |
Fix rtems-test-check with a BSD sed.
BSD sed does not support '\t' and treated '[ \t]' as 3 characters. This patch
uses a standard method of supporting blank spaces.
-rw-r--r-- | testsuites/automake/test-subdirs.am | 2 | ||||
-rwxr-xr-x | tools/build/rtems-test-check | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/testsuites/automake/test-subdirs.am b/testsuites/automake/test-subdirs.am index 380aae1619..f83f03541f 100644 --- a/testsuites/automake/test-subdirs.am +++ b/testsuites/automake/test-subdirs.am @@ -16,7 +16,7 @@ all-local: fi; \ tdata="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \ if test -f "$$tdata"; then \ - vtdata="$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.cfg"; \ + vtdata="$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \ else \ vtdata="all tests"; \ fi; \ diff --git a/tools/build/rtems-test-check b/tools/build/rtems-test-check index 108b7881c2..923af49306 100755 --- a/tools/build/rtems-test-check +++ b/tools/build/rtems-test-check @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright 2014, 2016 Chris Johns <chrisj@rtems.org> +# Copyright 2014, 2016, 2017 Chris Johns <chrisj@rtems.org> # All rights reserved # @@ -74,21 +74,21 @@ if test -f $testdata; then state=$(echo $line | sed -e "s/:.*//g") case $state in include) - inf=$(echo $line | sed -e "s/include://g" -e 's/^[ \t]//;s/[ \t]$//') + inf=$(echo $line | sed -e 's/include://g;s/[[:blank:]]//g') if test -f $includepath/$inf; then ntd="$includepath/$inf $ntd" fi ;; exclude) - line=$(echo $line | sed -e "s/exclude://g" -e 's/^[ \t]//;s/[ \t]$//') + line=$(echo $line | sed -e 's/exclude://g;s/[[:blank:]]//g') excluded_tests="${excluded_tests} $line" ;; expected-fail) - line=$(echo $line | sed -e "s/expected-fail://g" -e 's/^[ \t]//;s/[ \t]$//') + line=$(echo $line | sed -e 's/expected-fail://g;s/[[:blank:]]//g') expected_fails="${expected_fails} $line" ;; indeterminate) - line=$(echo $line | sed -e "s/indeterminate://g" -e 's/^[ \t]//;s/[ \t]$//') + line=$(echo $line | sed -e 's/indeterminate://g;s/[[:blank:]]//g') indeterminates="${indeterminates} $line" ;; *) |