Changeset 30eeb0d in rtems


Ignore:
Timestamp:
May 25, 2017, 5:11:45 AM (18 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
7ec982bf
Parents:
ff781cc
Message:

testsuite: Fix excluding tests that a substring of another test.

Fix excluding math when there is a test mathl. The shell test
used fails in this case. This patch's approach is much simpler.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • testsuites/automake/subdirs.am

    rff781cc r30eeb0d  
    99$1:
    1010        @+set fnord $(MAKEFLAGS); \
    11         subdir=$(1); \
    12         if test "$$$$subdir" != "."; then \
     11        if test "$(1)" != "."; then \
    1312          target=`echo $(MAKECMDGOALS) | sed s/-recursive//`; \
    1413          if test "$$$$target" = "all-local-am"; then \
     
    2221          tincludes="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom:$(top_srcdir)/.."; \
    2322          if test -f $$$$tcheck; then \
    24             list=`$$$$tcheck exclude $(RTEMS_BSP) $$$$tdata $$$$tincludes $(_SUBDIRS)`; \
     23            check_result=`$$$$tcheck exclude $(RTEMS_BSP) $$$$tdata $$$$tincludes $(1)`; \
    2524          else \
    26             list=; \
     25            check_result="$(1)"; \
    2726          fi; \
    28           if test "$$$${list#*$$$$subdir}" != "$$$$list"; then \
     27          if test "$(1)" = "$$$$check_result"; then \
    2928            if test -f $$$$tcheck; then \
    30               test_FLAGS=`$$$$tcheck flags $(RTEMS_BSP) $$$$tdata $$$$tincludes $$$$subdir`; \
     29              test_FLAGS=`$$$$tcheck flags $(RTEMS_BSP) $$$$tdata $$$$tincludes $(1)`; \
    3130            fi; \
    3231            local_target="$$$$target"; \
    3332            if test -z "$$$$test_FLAGS"; then \
    34               echo "BSP Testsuite: $$$$subdir: PASS"; \
     33              echo "BSP Testsuite: $(1): PASS"; \
    3534            else \
    36               echo "BSP Testsuite: $$$$subdir: $$$$test_FLAGS"; \
     35              echo "BSP Testsuite: $(1): $$$$test_FLAGS"; \
    3736            fi; \
    38             echo "Making $$$$target in $$$$subdir"; \
    39             cd $$$$subdir; \
     37            echo "Making $$$$target in $(1)"; \
     38            cd $(1); \
    4039            $(MAKE) $(AM_MAKEFLAGS) TEST_FLAGS="$$$$test_FLAGS" $$$$local_target; \
    4140          else \
    42             echo "BSP Testsuite: $$$$subdir: EXCLUDED"; \
     41            echo "BSP Testsuite: $(1): EXCLUDED"; \
    4342          fi; \
    4443        fi;
Note: See TracChangeset for help on using the changeset viewer.