summaryrefslogtreecommitdiffstats
path: root/testsuites/automake
diff options
context:
space:
mode:
authorChris Johns <chrisj@rtems.org>2017-04-16 09:51:57 +1000
committerChris Johns <chrisj@rtems.org>2017-04-18 12:27:57 +1000
commit18f63c0004cc3348bc785a642da82d2a3d46db5d (patch)
tree2142a4617725586701c6ac08dd8e40cda9cab8b7 /testsuites/automake
parentlibdebugger: Work around assert when using _Thread_Executing. (diff)
downloadrtems-18f63c0004cc3348bc785a642da82d2a3d46db5d.tar.bz2
testsuite: Fix rtems-test-check not excluding tests.
The include file handling was broken. Add a test configuration data README. Closes #2981.
Diffstat (limited to 'testsuites/automake')
-rw-r--r--testsuites/automake/subdirs.am7
1 files changed, 4 insertions, 3 deletions
diff --git a/testsuites/automake/subdirs.am b/testsuites/automake/subdirs.am
index 70a7ecb78c..63b1da1049 100644
--- a/testsuites/automake/subdirs.am
+++ b/testsuites/automake/subdirs.am
@@ -15,7 +15,8 @@ all-local:
target="all"; \
fi; \
tcheck="$(top_srcdir)/../../tools/build/rtems-test-check-py"; \
- tdata="$(top_srcdir)/../../c/src/lib/libbsp/$(RTEMS_CPU)/$(RTEMS_BSP_FAMILY)/make/custom/$(RTEMS_BSP)-testsuite.tcfg"; \
+ 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 \
@@ -23,7 +24,7 @@ all-local:
fi; \
echo "BSP Testsuite Data: $$vtdata"; \
if test -f $$tcheck; then \
- list=`$$tcheck exclude $$tdata $(top_srcdir)/.. $(RTEMS_BSP) $(_SUBDIRS)`; \
+ list=`$$tcheck exclude $(RTEMS_BSP) $$tdata $$tincludes $(_SUBDIRS)`; \
else \
list=$(_SUBDIRS); \
fi; \
@@ -31,7 +32,7 @@ all-local:
echo "Making $$target in $$subdir"; \
if test "$$subdir" != "."; then \
if test -f $$tcheck; then \
- test_FLAGS=`$$tcheck flags $$tdata $(top_srcdir)/.. $(RTEMS_BSP) $$subdir`; \
+ test_FLAGS=`$$tcheck flags $(RTEMS_BSP) $$tdata $$tincludes $$subdir`; \
fi; \
local_target="$$target"; \
if test -z "$$test_FLAGS"; then \