[kvm-unit-tests,PULL,07/11] scripts: add support for architecture dependent functions

Commit Message

Thomas Huth Sept. 28, 2020, 5:49 p.m. UTC

From: Marc Hartmayer <[e-mail]>

This is necessary to keep architecture dependent code separate from
common code.

Reviewed-by: Andrew Jones <[e-mail]>
Reviewed-by: Cornelia Huck <[e-mail]>
Reviewed-by: David Hildenbrand <[e-mail]>
Signed-off-by: Marc Hartmayer <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Thomas Huth <[e-mail]>
---
 README.md           | 3 ++-
 scripts/common.bash | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

Patch

diff --git a/README.md b/README.md
index 48be206..24d4bda 100644
--- a/README.md
+++ b/README.md
@@ -134,7 +134,8 @@  all unit tests.
 ## Directory structure
 
     .:                  configure script, top-level Makefile, and run_tests.sh
-    ./scripts:          helper scripts for building and running tests
+    ./scripts:          general architecture neutral helper scripts for building and running tests
+    ./scripts/<ARCH>:   architecture dependent helper scripts for building and running tests
     ./lib:              general architecture neutral services for the tests
     ./lib/<ARCH>:       architecture dependent services for the tests
     ./<ARCH>:           the sources of the tests and the created objects/images
diff --git a/scripts/common.bash b/scripts/common.bash
index 96655c9..c7acdf1 100644
--- a/scripts/common.bash
+++ b/scripts/common.bash
@@ -1,3 +1,4 @@ 
+source config.mak
 
 function for_each_unittest()
 {
@@ -52,3 +53,10 @@  function for_each_unittest()
 	fi
 	exec {fd}<&-
 }
+
+# The current file has to be the only file sourcing the arch helper
+# file
+ARCH_FUNC=scripts/${ARCH}/func.bash
+if [ -f "${ARCH_FUNC}" ]; then
+	source "${ARCH_FUNC}"
+fi