From ddfcce9db7128e07c09539505d31daf8eb1baae6 Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Tue, 1 Jul 2025 17:13:27 +0100 Subject: [PATCH] disk-image-minimal: use a glob for run-many Add any files in usr/share/examples/cheribsdtest to that builds without purecap successfully add all zero of them rather than failing to add usr/share/examples/cheribsdtest/run-many. --- pycheribuild/projects/disk_image.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pycheribuild/projects/disk_image.py b/pycheribuild/projects/disk_image.py index 95bf17189..a77dfdd10 100644 --- a/pycheribuild/projects/disk_image.py +++ b/pycheribuild/projects/disk_image.py @@ -1209,7 +1209,8 @@ def add_unlisted_files_to_metalog(self): self.add_from_mtree(self.ref_mtree, test_binary) for test_binary in self.ref_mtree.glob("usr/libexec/malloc_early_constructor-*"): self.add_from_mtree(self.ref_mtree, test_binary) - self.add_from_mtree(self.ref_mtree, "usr/share/examples/cheribsdtest/run-many") + for test_script in self.ref_mtree.glob("usr/share/examples/cheribsdtest/*"): + self.add_from_mtree(self.ref_mtree, test_script) if self.include_pmc: self.add_from_mtree(self.ref_mtree, "sbin/kldload")