diff options
| author | Yumei Huang <yuhuang@redhat.com> | 2025-09-30 14:29:52 +0800 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2025-10-06 21:23:07 +0200 |
| commit | 4d9c35b17589c5b50ed413860c9e5836a515170e (patch) | |
| tree | 608db06d6c9f0d6ea0981d3762972667c4b031f9 | |
| parent | a96a962d7e51582ea6aaf1f9180f1be7956f5d1f (diff) | |
| download | passt-4d9c35b17589c5b50ed413860c9e5836a515170e.tar passt-4d9c35b17589c5b50ed413860c9e5836a515170e.tar.gz passt-4d9c35b17589c5b50ed413860c9e5836a515170e.tar.bz2 passt-4d9c35b17589c5b50ed413860c9e5836a515170e.tar.lz passt-4d9c35b17589c5b50ed413860c9e5836a515170e.tar.xz passt-4d9c35b17589c5b50ed413860c9e5836a515170e.tar.zst passt-4d9c35b17589c5b50ed413860c9e5836a515170e.zip | |
test: Update passt.mbuto and passt.mem.mbuto
If /bin is in the PATH of host, /usr/bin may not exist in mbuto
guest, which causes some binaries failing to move to /usr/bin.
As a result, tests fail as binaries not found.
Fix it by adding /usr/bin to DIRS. Also create the same symlink
for mbuto.mem.img.
Link: https://bugs.passt.top/show_bug.cgi?id=158
Fixes: f4729be7a56b ("test: Update mbuto profile to fix the symlink of /bin")
Suggested-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Yumei Huang <yuhuang@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
| -rwxr-xr-x | test/passt.mbuto | 2 | ||||
| -rwxr-xr-x | test/passt.mem.mbuto | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/passt.mbuto b/test/passt.mbuto index 231b9c9..598c254 100755 --- a/test/passt.mbuto +++ b/test/passt.mbuto @@ -33,7 +33,7 @@ LINKS="${LINKS:- dhclient /usr/sbin/dhclient sysctl /usr/sbin/sysctl}" -DIRS="${DIRS} /tmp /usr/sbin /usr/share /var/log /var/lib /etc/ssh /run/sshd /root/.ssh" +DIRS="${DIRS} /tmp /usr/sbin /usr/bin /usr/share /var/log /var/lib /etc/ssh /run/sshd /root/.ssh" COPIES="${COPIES} small.bin,/root/small.bin medium.bin,/root/medium.bin big.bin,/root/big.bin rampstream,/bin/rampstream rampstream-check.sh,/bin/rampstream-check.sh" diff --git a/test/passt.mem.mbuto b/test/passt.mem.mbuto index 532eae0..7554a43 100755 --- a/test/passt.mem.mbuto +++ b/test/passt.mem.mbuto @@ -12,7 +12,7 @@ PROGS="${PROGS:-ash,dash,bash chmod ip mount insmod mkdir ln cat chmod modprobe grep mknod sed chown sleep bc ls ps mount unshare chroot cp kill diff - head tail sort tr tee cut nm which switch_root}" + head tail sort tr tee cut nm which switch_root mv rm}" KMODS="${KMODS:- dummy}" @@ -22,12 +22,14 @@ LINKS="${LINKS:- ash,dash,bash /init ash,dash,bash /bin/sh}" -DIRS="${DIRS} /tmp /sbin" +DIRS="${DIRS} /tmp /sbin /usr/bin" COPIES="${COPIES} ../passt.avx2,/bin/passt.avx2" FIXUP="${FIXUP}"' -ln -s /bin /usr/bin +mv /bin/* /usr/bin || : +rm -rf /bin +ln -s /usr/bin /bin chmod 777 /tmp sh +m ' |