From 8367d388d4d581f12d33e882aef21af6977a2ef9 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Wed, 5 Jul 2017 14:09:48 +0200 Subject: [PATCH] support/testing: remove references to host/usr The tools are now installed in host/bin instead of host/usr/bin. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- support/testing/tests/fs/test_ext.py | 2 +- support/testing/tests/fs/test_jffs2.py | 2 +- support/testing/tests/fs/test_squashfs.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/support/testing/tests/fs/test_ext.py b/support/testing/tests/fs/test_ext.py index ea3d3f11d7..34321a3995 100644 --- a/support/testing/tests/fs/test_ext.py +++ b/support/testing/tests/fs/test_ext.py @@ -13,7 +13,7 @@ RESBLKCNT_PROP = "Reserved block count" CHECK_FS_TYPE_CMD = "mount | grep '/dev/root on / type {}'" def dumpe2fs_run(builddir, image): - cmd = ["host/usr/sbin/dumpe2fs", os.path.join("images", image)] + cmd = ["host/sbin/dumpe2fs", os.path.join("images", image)] ret = subprocess.check_output(cmd, stderr=open(os.devnull, "w"), cwd=builddir, diff --git a/support/testing/tests/fs/test_jffs2.py b/support/testing/tests/fs/test_jffs2.py index 0d45af209b..7185df7899 100644 --- a/support/testing/tests/fs/test_jffs2.py +++ b/support/testing/tests/fs/test_jffs2.py @@ -28,7 +28,7 @@ BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x4000000 def test_run(self): img = os.path.join(self.builddir, "images", "rootfs.jffs2") - out = subprocess.check_output(["host/usr/sbin/jffs2dump", "-c", img], + out = subprocess.check_output(["host/sbin/jffs2dump", "-c", img], cwd=self.builddir, env={"LANG": "C"}) out = out.splitlines() diff --git a/support/testing/tests/fs/test_squashfs.py b/support/testing/tests/fs/test_squashfs.py index edaa087106..b205b6a55a 100644 --- a/support/testing/tests/fs/test_squashfs.py +++ b/support/testing/tests/fs/test_squashfs.py @@ -13,7 +13,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y """ def test_run(self): - unsquashfs_cmd = ["host/usr/bin/unsquashfs", "-s", "images/rootfs.squashfs"] + unsquashfs_cmd = ["host/bin/unsquashfs", "-s", "images/rootfs.squashfs"] out = subprocess.check_output(unsquashfs_cmd, cwd=self.builddir, env={"LANG": "C"}) -- 2.30.2