RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

Fix rtems-test-check with a BSD sed.

Browse Source 
BSD sed does not support '\t' and treated '[ \t]' as 3 characters. This patch
uses a standard method of supporting blank spaces.
This commit is contained in:
Chris Johns
2017-03-09 16:14:16 +11:00
parent 68929dcaa1
commit eb733202ad
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testsuites/automake/test-subdirs.am
View File

@@ -16,7 +16,7 @@ all-local:
fi; \ fi; \
tdata="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \ tdata="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \
if test -f "$$tdata"; then \ 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 \ else \
vtdata="all tests"; \ vtdata="all tests"; \
fi; \ fi; \

10
tools/build/rtems-test-check
View File

@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# #
# Copyright 2014, 2016 Chris Johns <chrisj@rtems.org> # Copyright 2014, 2016, 2017 Chris Johns <chrisj@rtems.org>
# All rights reserved # All rights reserved
# #
@@ -74,21 +74,21 @@ if test -f $testdata; then
state=$(echo $line | sed -e "s/:.*//g") state=$(echo $line | sed -e "s/:.*//g")
case $state in case $state in
include) 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 if test -f $includepath/$inf; then
ntd="$includepath/$inf $ntd" ntd="$includepath/$inf $ntd"
fi fi
;; ;;
exclude) 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" excluded_tests="${excluded_tests} $line"
;; ;;
expected-fail) 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" expected_fails="${expected_fails} $line"
;; ;;
indeterminate) 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" indeterminates="${indeterminates} $line"
;; ;;
*) *)