[Libguestfs] [PATCH 1/4] test-9p: fix the base directory that's exported to the guest

Laszlo Ersek lersek at redhat.com
Mon Sep 20 05:23:32 UTC 2021


In commit 6d32773e8118 ("tests: Run the tests in parallel.", 2021-03-18),
the "abs_srcdir" macro value that the 9p test would see changed from
".../tests/9p" to just ".../tests" -- the last component got dropped.

(Said commit updated some "abs_srcdir"-based references accordingly, for
example under "tests/disks", but "tests/9p/test-9p.sh" was missed.)

Therefore, the guest-visible location of the "/test-9p.sh" file changed to
"/9p/test-9p.sh", and a non-recursive listing of the guest-visible root
directory would not return the file. Thus, the test fails now.

Restore the host-side base directory to ".../tests/9p".

Fixes: 6d32773e811882f78dbd8c2a39a2b7a9c3cfca7c
Signed-off-by: Laszlo Ersek <lersek at redhat.com>
---
 tests/9p/test-9p.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/9p/test-9p.sh b/tests/9p/test-9p.sh
index b4bdbe56e077..4fd5de7fdafe 100755
--- a/tests/9p/test-9p.sh
+++ b/tests/9p/test-9p.sh
@@ -45,7 +45,7 @@ guestfish <<EOF
 sparse test-9p.img 1M
 
 config -device '$virtio_9p,fsdev=test9p,mount_tag=test9p'
-config -fsdev 'local,id=test9p,path=${abs_srcdir},security_model=passthrough'
+config -fsdev 'local,id=test9p,path=${abs_srcdir}/9p,security_model=passthrough'
 
 run
 
-- 
2.19.1.3.g30247aa5d201




More information about the Libguestfs mailing list