[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/8] tests/vm: expose --source-path to scripts to find extra files
From: |
Alex Bennée |
Subject: |
[PULL 7/8] tests/vm: expose --source-path to scripts to find extra files |
Date: |
Mon, 7 Jun 2021 15:33:02 +0100 |
Currently the centos8 image expects to run an in-src build to find the
kick starter file. Fix this.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20210602103527.32021-1-alex.bennee@linaro.org>
diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include
index e94d95ec54..f3a3a1c751 100644
--- a/tests/vm/Makefile.include
+++ b/tests/vm/Makefile.include
@@ -84,6 +84,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \
$(if $(QEMU_LOCAL),--build-path $(BUILD_DIR)) \
$(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \
$(if $(LOG_CONSOLE),--log-console) \
+ --source-path $(SRC_PATH) \
--image "$@" \
--force \
--build-image $@, \
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 0f2e436ed3..254e11c932 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -96,6 +96,7 @@ def __init__(self, args, config=None):
self._genisoimage = args.genisoimage
self._build_path = args.build_path
self._efi_aarch64 = args.efi_aarch64
+ self._source_path = args.source_path
# Allow input config to override defaults.
self._config = DEFAULT_CONFIG.copy()
if config != None:
@@ -591,6 +592,9 @@ def get_default_jobs():
parser.add_argument("--build-path", default=None,
help="Path of build directory, "\
"for using build tree QEMU binary. ")
+ parser.add_argument("--source-path", default=None,
+ help="Path of source directory, "\
+ "for finding additional files. ")
parser.add_argument("--interactive", "-I", action="store_true",
help="Interactively run command")
parser.add_argument("--snapshot", "-s", action="store_true",
diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64
index e687b93e52..81c3004c3c 100755
--- a/tests/vm/centos.aarch64
+++ b/tests/vm/centos.aarch64
@@ -64,7 +64,7 @@ class CentosAarch64VM(basevm.BaseVM):
def create_kickstart(self):
"""Generate the kickstart file used to generate the centos image."""
# Start with the template for the kickstart.
- ks_file = "../tests/vm/centos-8-aarch64.ks"
+ ks_file = self._source_path + "/tests/vm/centos-8-aarch64.ks"
subprocess.check_call("cp {} ./ks.cfg".format(ks_file), shell=True)
# Append the ssh keys to the kickstart file
# as the post processing phase of installation.
--
2.20.1
- [PULL 1/8] tests/tcg: add a multiarch signals test to stress test signal delivery, (continued)
- [PULL 1/8] tests/tcg: add a multiarch signals test to stress test signal delivery, Alex Bennée, 2021/06/07
- [PULL 2/8] meson.build: fix cosmetics of compiler display, Alex Bennée, 2021/06/07
- [PULL 4/8] tests/acceptance: tag various arm tests as TCG only, Alex Bennée, 2021/06/07
- [PULL 3/8] tests/tcg/configure.sh: tweak quoting of target_compiler, Alex Bennée, 2021/06/07
- [PULL 5/8] gitlab: work harder to avoid false positives in checkpatch, Alex Bennée, 2021/06/07
- [PULL 6/8] gitlab-ci: Split gprof-gcov job, Alex Bennée, 2021/06/07
- [PULL 8/8] scripts/checkpatch.pl: process .c.inc and .h.inc files as C source, Alex Bennée, 2021/06/07
- [PULL 7/8] tests/vm: expose --source-path to scripts to find extra files,
Alex Bennée <=
- Re: [PULL 0/8] testing and misc updates, Peter Maydell, 2021/06/07