Changeset eb73320 in rtems


Ignore:
Timestamp:
03/09/17 05:14:16 (7 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
5, master
Children:
17d1aa7
Parents:
68929dca
git-author:
Chris Johns <chrisj@…> (03/09/17 05:14:16)
git-committer:
Chris Johns <chrisj@…> (03/14/17 02:54:21)
Message:

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.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • testsuites/automake/test-subdirs.am

    r68929dca reb73320  
    1717        tdata="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \
    1818        if test -f "$$tdata"; then \
    19           vtdata="$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.cfg"; \
     19          vtdata="$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \
    2020         else \
    2121          vtdata="all tests"; \
  • tools/build/rtems-test-check

    r68929dca reb73320  
    11#! /bin/sh
    22#
    3 # Copyright 2014, 2016 Chris Johns <chrisj@rtems.org>
     3# Copyright 2014, 2016, 2017 Chris Johns <chrisj@rtems.org>
    44# All rights reserved
    55#
     
    7575          case $state in
    7676            include)
    77               inf=$(echo $line | sed -e "s/include://g" -e 's/^[ \t]//;s/[ \t]$//')
     77              inf=$(echo $line | sed -e 's/include://g;s/[[:blank:]]//g')
    7878              if test -f $includepath/$inf; then
    7979                ntd="$includepath/$inf $ntd"
     
    8181              ;;
    8282            exclude)
    83               line=$(echo $line | sed -e "s/exclude://g" -e 's/^[ \t]//;s/[ \t]$//')
     83              line=$(echo $line | sed -e 's/exclude://g;s/[[:blank:]]//g')
    8484              excluded_tests="${excluded_tests} $line"
    8585              ;;
    8686            expected-fail)
    87               line=$(echo $line | sed -e "s/expected-fail://g" -e 's/^[ \t]//;s/[ \t]$//')
     87              line=$(echo $line | sed -e 's/expected-fail://g;s/[[:blank:]]//g')
    8888              expected_fails="${expected_fails} $line"
    8989              ;;
    9090            indeterminate)
    91               line=$(echo $line | sed -e "s/indeterminate://g" -e 's/^[ \t]//;s/[ \t]$//')
     91              line=$(echo $line | sed -e 's/indeterminate://g;s/[[:blank:]]//g')
    9292              indeterminates="${indeterminates} $line"
    9393              ;;
Note: See TracChangeset for help on using the changeset viewer.