From 87bb9a42b5152dc037bd99306ff9898b888c2781 Mon Sep 17 00:00:00 2001
From: James Prestwood <prestwoj@gmail.com>
Date: Wed, 25 May 2022 12:37:27 -0700
Subject: [PATCH] test-runner: skip mounting duplicate folders

If the user specifies the same parent directory for several outfiles
skip mounting since it already exists. For example:

--monitor /outfiles/monitor.txt --result /outfiles/result.txt
---
 tools/runner.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/runner.py b/tools/runner.py
index 90818ef1..bf28d9ad 100644
--- a/tools/runner.py
+++ b/tools/runner.py
@@ -289,7 +289,13 @@ class RunnerAbstract:
 
 	# For QEMU/UML runners
 	def _prepare_mounts(self, extra=[]):
+		mounted = []
+
 		for entry in mounts_common + extra:
+			if entry.target in mounted:
+				print("%s already mounted, skipping" % entry.target)
+				continue
+
 			try:
 				os.lstat(entry.target)
 			except:
@@ -298,6 +304,8 @@ class RunnerAbstract:
 			mount(entry.source, entry.target, entry.fstype, entry.flags,
 				entry.options)
 
+			mounted.append(entry.target)
+
 		for entry in dev_table:
 			os.symlink(entry.target, entry.linkpath)