Changeset 7396e39 in rtems


Ignore:
Timestamp:
May 23, 2017, 11:22:28 PM (18 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
86ae03c
Parents:
9935c23
git-author:
Chris Johns <chrisj@…> (05/23/17 23:22:28)
git-committer:
Chris Johns <chrisj@…> (05/23/17 23:26:42)
Message:

testusite: Fix the parallel build test excludes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • testsuites/automake/subdirs.am

    r9935c23 r7396e39  
    1010        @+set fnord $(MAKEFLAGS); \
    1111        subdir=$(1); \
    12         target=`echo $(MAKECMDGOALS) | sed s/-recursive//`; \
    13         if test "$$$$target" = "all-local-am"; then \
    14           target="all-am"; \
    15         fi; \
    16         if test "$$$$target" = "all-local"; then \
    17           target="all"; \
    18         fi; \
    19         tcheck="$(top_srcdir)/../../tools/build/rtems-test-check-py"; \
    20         tdata="$(RTEMS_BSP)-testsuite.tcfg"; \
    21         tincludes="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom:$(top_srcdir)/.."; \
    22         if test -f "$$$$tdata"; then \
    23           vtdata="$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \
    24         else \
    25           vtdata="all tests"; \
    26         fi; \
    27         echo "BSP Testsuite Data: $$$$vtdata"; \
    28         if test -f $$$$tcheck; then \
    29           list=`$$$$tcheck exclude $(RTEMS_BSP) $$tdata $$$$tincludes $(_SUBDIRS)`; \
    30         else \
    31           list=$(_SUBDIRS); \
    32         fi; \
    33         if test "$$$${list#*$$$$subdir}" != "$$$${list}"; then \
    34           echo "Making $$$$target in $$$$subdir"; \
    35           if test "$$$$subdir" != "."; then \
     12        if test "$$$$subdir" != "."; then \
     13          target=`echo $(MAKECMDGOALS) | sed s/-recursive//`; \
     14          if test "$$$$target" = "all-local-am"; then \
     15            target="all-am"; \
     16          fi; \
     17          if test "$$$$target" = "all-local"; then \
     18            target="all"; \
     19          fi; \
     20          tcheck="$(top_srcdir)/../../tools/build/rtems-test-check-py"; \
     21          tdata="$(RTEMS_BSP)-testsuite.tcfg"; \
     22          tincludes="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom:$(top_srcdir)/.."; \
     23          if test -f $$$$tcheck; then \
     24            list=`$$$$tcheck exclude $(RTEMS_BSP) $$$$tdata $$$$tincludes $(_SUBDIRS)`; \
     25          else \
     26            list=; \
     27          fi; \
     28          if test "$$$${list#*$$$$subdir}" != "$$$$list"; then \
    3629            if test -f $$$$tcheck; then \
    3730              test_FLAGS=`$$$$tcheck flags $(RTEMS_BSP) $$$$tdata $$$$tincludes $$$$subdir`; \
     
    3932            local_target="$$$$target"; \
    4033            if test -z "$$$$test_FLAGS"; then \
    41               echo "BSP Testsuite Flags: $$$$subdir: PASS"; \
     34              echo "BSP Testsuite: $$$$subdir: PASS"; \
    4235            else \
    43               echo "BSP Testsuite Flags: $$$$subdir: $$$$test_FLAGS"; \
     36              echo "BSP Testsuite: $$$$subdir: $$$$test_FLAGS"; \
    4437            fi; \
     38            echo "Making $$$$target in $$$$subdir"; \
    4539            cd $$$$subdir; \
    4640            $(MAKE) $(AM_MAKEFLAGS) TEST_FLAGS="$$$$test_FLAGS" $$$$local_target; \
     41          else \
     42            echo "BSP Testsuite: $$$$subdir: EXCLUDED"; \
    4743          fi; \
    4844        fi;
Note: See TracChangeset for help on using the changeset viewer.