From 78c918c2c1a700be6b1e8f78e551b7632ab99e2c Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Wed, 25 May 2022 12:37:25 -0700 Subject: [PATCH] test-runner: mount testhome rather than assume location Usually the test home directory is a git repo somewhere e.g. under /home. But if the home directory is located under /tmp this poses a problem since UML remounts /tmp. To handle both cases mount the home directory explicity. --- tools/runner.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/runner.py b/tools/runner.py index 7c177f1f..5f837097 100644 --- a/tools/runner.py +++ b/tools/runner.py @@ -451,6 +451,9 @@ class QemuRunner(RunnerAbstract): def prepare_environment(self): mounts = [ MountInfo('debugfs', 'debugfs', '/sys/kernel/debug', '', 0) ] + mounts.append(MountInfo('hostfs', 'hostfs', self.args.testhome, + self.args.testhome, 0)) + if self.args.log: mounts.append(MountInfo('9p', 'logdir', self.args.log, 'trans=virtio,version=9p2000.L,msize=10240', 0)) @@ -513,6 +516,9 @@ class UmlRunner(RunnerAbstract): mounts.append(MountInfo('hostfs', 'hostfs', self.args.result_parent, self.args.result_parent, 0)) + mounts.append(MountInfo('hostfs', 'hostfs', self.args.testhome, + self.args.testhome, 0)) + self._prepare_mounts(extra=mounts) super().prepare_environment()