From: Michal Orzel <michal.orzel@arm.com>
Date: Wed, 18 Aug 2021 11:58:29 +0000 (+0100)
Subject: build: Trivial cleanup ahead supporting new architectures
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=91d215a4ed1463ab14d1f68e497117ac1255e05e;p=xtf.git

build: Trivial cleanup ahead supporting new architectures

Signed-off-by: Michal Orzel <michal.orzel@arm.com>
[Broken out of series]
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/.gitignore b/.gitignore
index 5e458a3..dcacdf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 *.pyc
 *.pyo
 *.swp
-/arch/x86/*.lds
+/arch/*/*.lds
 /cscope.*
 /dist/
 /docs/autogenerated/
diff --git a/Makefile b/Makefile
index 8d8277e..b6e0dd8 100644
--- a/Makefile
+++ b/Makefile
@@ -56,9 +56,12 @@ PYTHON             ?= $(PYTHON_INTERPRETER)
 
 export CC LD CPP INSTALL INSTALL_DATA INSTALL_DIR INSTALL_PROGRAM OBJCOPY PYTHON
 
+# By default enable all the tests
+TESTS ?= $(wildcard $(ROOT)/tests/*)
+
 .PHONY: all
 all:
-	@set -e; for D in $(wildcard tests/*); do \
+	@set -e; for D in $(TESTS); do \
 		[ ! -e $$D/Makefile ] && continue; \
 		$(MAKE) -C $$D build; \
 	done
@@ -67,7 +70,7 @@ all:
 install:
 	@$(INSTALL_DIR) $(DESTDIR)$(xtfdir)
 	$(INSTALL_PROGRAM) xtf-runner $(DESTDIR)$(xtfdir)
-	@set -e; for D in $(wildcard tests/*); do \
+	@set -e; for D in $(TESTS); do \
 		[ ! -e $$D/Makefile ] && continue; \
 		$(MAKE) -C $$D install; \
 	done
diff --git a/build/common.mk b/build/common.mk
index 886f190..594952d 100644
--- a/build/common.mk
+++ b/build/common.mk
@@ -63,7 +63,7 @@ DEPS-$(1) = $$(head-$(1)) \
 	$$(obj-perarch:%.o=%-$($(1)_arch).o) \
 	$$(obj-$(1):%.o=%-$(1).o) $$(obj-perenv:%.o=%-$(1).o)
 
-# Generate .lds with approprate flags
+# Generate .lds with appropriate flags
 %/link-$(1).lds: %/link.lds.S
 	$$(CPP) $$(AFLAGS_$(1)) -P -C $$< -o $$@