From: Simon Glass <sjg@chromium.org>
Date: Sat, 4 Apr 2026 14:03:06 +0000 (-0600)
Subject: test: fs_helper: Skip empty srcdir when creating a filesystem
X-Git-Tag: v2026.07-rc1~33^2~12
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4e1793b1fb21e3896cf018fc35fc2c9c3e202138;p=thirdparty%2Fu-boot.git

test: fs_helper: Skip empty srcdir when creating a filesystem

FsHelper.mk_fs() always creates a srcdir via setup(), then passes it
to the module-level mk_fs(). This fails for filesystem types like ext2
that do not support the -d flag, raising ValueError even when no files
need to be copied.

Pass None for src_dir when the srcdir is empty, so that creating an
empty filesystem works for all supported types.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/test/py/tests/fs_helper.py b/test/py/tests/fs_helper.py
index e323a97b220..ee779474ce6 100644
--- a/test/py/tests/fs_helper.py
+++ b/test/py/tests/fs_helper.py
@@ -66,8 +66,9 @@ class FsHelper:
         """Make a new filesystem and copy in the files"""
         self.setup()
         self._do_cleanup = True
+        src_dir = self.srcdir if os.listdir(self.srcdir) else None
         self.fs_img = mk_fs(self.config, self.fs_type, self.size_mb << 20,
-                            self.prefix, self.srcdir, quiet=self.quiet)
+                            self.prefix, src_dir, quiet=self.quiet)
 
     def setup(self):
         """Set up the srcdir ready to receive files"""