From 7396e398cde578fb37a3499ba75fa4121b055e69 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Wed, 24 May 2017 09:22:28 +1000
Subject: testusite: Fix the parallel build test excludes.

---
 testsuites/automake/subdirs.am | 48 +++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

(limited to 'testsuites/automake')

diff --git a/testsuites/automake/subdirs.am b/testsuites/automake/subdirs.am
index d03122c037..56e1ec560f 100644
--- a/testsuites/automake/subdirs.am
+++ b/testsuites/automake/subdirs.am
@@ -9,41 +9,37 @@ define TESTDIR
 $1:
 	@+set fnord $(MAKEFLAGS); \
 	subdir=$(1); \
-	target=`echo $(MAKECMDGOALS) | sed s/-recursive//`; \
-	if test "$$$$target" = "all-local-am"; then \
-	  target="all-am"; \
-	fi; \
-	if test "$$$$target" = "all-local"; then \
-	  target="all"; \
-	fi; \
-	tcheck="$(top_srcdir)/../../tools/build/rtems-test-check-py"; \
-	tdata="$(RTEMS_BSP)-testsuite.tcfg"; \
-	tincludes="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom:$(top_srcdir)/.."; \
-	if test -f "$$$$tdata"; then \
-	  vtdata="$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \
-	else \
-	  vtdata="all tests"; \
-	fi; \
-	echo "BSP Testsuite Data: $$$$vtdata"; \
-	if test -f $$$$tcheck; then \
-	  list=`$$$$tcheck exclude $(RTEMS_BSP) $$tdata $$$$tincludes $(_SUBDIRS)`; \
-	else \
-	  list=$(_SUBDIRS); \
-	fi; \
-	if test "$$$${list#*$$$$subdir}" != "$$$${list}"; then \
-	  echo "Making $$$$target in $$$$subdir"; \
-	  if test "$$$$subdir" != "."; then \
+	if test "$$$$subdir" != "."; then \
+	  target=`echo $(MAKECMDGOALS) | sed s/-recursive//`; \
+	  if test "$$$$target" = "all-local-am"; then \
+	    target="all-am"; \
+	  fi; \
+	  if test "$$$$target" = "all-local"; then \
+	    target="all"; \
+	  fi; \
+	  tcheck="$(top_srcdir)/../../tools/build/rtems-test-check-py"; \
+	  tdata="$(RTEMS_BSP)-testsuite.tcfg"; \
+	  tincludes="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom:$(top_srcdir)/.."; \
+	  if test -f $$$$tcheck; then \
+	    list=`$$$$tcheck exclude $(RTEMS_BSP) $$$$tdata $$$$tincludes $(_SUBDIRS)`; \
+	  else \
+	    list=; \
+	  fi; \
+	  if test "$$$${list#*$$$$subdir}" != "$$$$list"; then \
 	    if test -f $$$$tcheck; then \
 	      test_FLAGS=`$$$$tcheck flags $(RTEMS_BSP) $$$$tdata $$$$tincludes $$$$subdir`; \
 	    fi; \
 	    local_target="$$$$target"; \
 	    if test -z "$$$$test_FLAGS"; then \
-	      echo "BSP Testsuite Flags: $$$$subdir: PASS"; \
+	      echo "BSP Testsuite: $$$$subdir: PASS"; \
 	    else \
-	      echo "BSP Testsuite Flags: $$$$subdir: $$$$test_FLAGS"; \
+	      echo "BSP Testsuite: $$$$subdir: $$$$test_FLAGS"; \
 	    fi; \
+	    echo "Making $$$$target in $$$$subdir"; \
 	    cd $$$$subdir; \
 	    $(MAKE) $(AM_MAKEFLAGS) TEST_FLAGS="$$$$test_FLAGS" $$$$local_target; \
+	  else \
+	    echo "BSP Testsuite: $$$$subdir: EXCLUDED"; \
 	  fi; \
 	fi;
 endef
-- 
cgit v1.2.3