diff options
author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2018-04-26 15:39:22 +0200 |
---|---|---|
committer | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2018-04-27 13:15:57 +0100 |
commit | a83d41d708a870a055216d430a2eaa5d7a4573d2 (patch) | |
tree | 015327c1077da885ba32c34ad9504ab11d3af8d2 | |
parent | ff8fc0b49b5eaf5ab3050e741935cf41dab1f3ca (diff) |
Build: Move TESTS_FILE definition in tests.mk
It seems more logical to choose the tests manifest inside the tests
makefile rather than in the top Makefile.
Change-Id: I25993550cc5c10b9e3e7b1ef841b616712a234fb
Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
-rw-r--r-- | Makefile | 9 | ||||
-rw-r--r-- | tests/tests.mk | 9 |
2 files changed, 9 insertions, 9 deletions
@@ -123,15 +123,6 @@ ifeq ($(wildcard ${PLAT_MAKEFILE_FULL}),) $(error "Error: Invalid platform. The following platforms are available: ${PLATFORMS}") endif -# Path to the XML file listing the tests to run. If there is a platform-specific -# test file, use it. If not, use the common one. If the user specified another -# one, use that one instead. -ifneq ($(wildcard ${PLAT_PATH}/tests.xml),) - TESTS_FILE := ${PLAT_PATH}/tests.xml -else - TESTS_FILE := tests/tests-common.xml -endif - ifeq (tests/tests-fwu.xml,$(wildcard ${TESTS_FILE})) # Enable test cases and/or helper functions in NS_BL1U and NS_BL2U images FWU_BL_TEST := 1 diff --git a/tests/tests.mk b/tests/tests.mk index 3c84454..0cd6ab2 100644 --- a/tests/tests.mk +++ b/tests/tests.mk @@ -4,6 +4,15 @@ # SPDX-License-Identifier: BSD-3-Clause # +# Path to the XML file listing the tests to run. If there is a platform-specific +# test file, use it. If not, use the common one. If the user specified another +# one, use that one instead. +ifneq ($(wildcard ${PLAT_PATH}/tests.xml),) + TESTS_FILE := ${PLAT_PATH}/tests.xml +else + TESTS_FILE := tests/tests-common.xml +endif + ifeq (${TESTS_FILE},tests/tests-spm-legacy.xml) SPM_TESTS_SOURCES := \ tests/runtime_services/secure_service/secure_service_helpers.c \ |