mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-04 23:02:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

ltp: Add "udevadm trigger" before swap verification in mkswap01.sh

Browse Source 
Swap verification sometimes fails due to race condition with udev.
This is a known issue: https://github.com/linux-test-project/ltp/issues/458.
"udevadm trigger" forces udev to sync up device events with kernel.

(From OE-Core rev: 9d0bfa64d491c9bbef38c1530dc56386add12485)

Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yongxin Liu
2019-11-13 14:48:55 +08:00
committed by Richard Purdie
parent 8195cff911
commit bf12fa8a48
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-extended/ltp/ltp/0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch Normal file
View File

@@ -0,0 +1,35 @@
From fae8852a63d9fa6e56fb8b24eaf10560bd13757f Mon Sep 17 00:00:00 2001
From: Yongxin Liu <yongxin.liu@windriver.com>
Date: Tue, 12 Nov 2019 11:33:50 +0800
Subject: [PATCH] mkswap01.sh: Add "udevadm trigger" before swap verification
Fix: https://github.com/linux-test-project/ltp/issues/458
Sometimes the swap device cannot show up in /dev/disk/by-uuid/
or /dev/disk/by-lable/ due to the issue #458. When this issue
happens, "blkid -c /dev/null" and "ls /dev/disk/by-uuid/" show
different UUID of the device.
Upstream-Status: Submitted [https://patchwork.ozlabs.org/patch/1193414]
Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
---
testcases/commands/mkswap/mkswap01.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/testcases/commands/mkswap/mkswap01.sh b/testcases/commands/mkswap/mkswap01.sh
index 3a348c6e6..9437c4a4e 100755
--- a/testcases/commands/mkswap/mkswap01.sh
+++ b/testcases/commands/mkswap/mkswap01.sh
@@ -129,6 +129,8 @@ mkswap_test()
return
fi
+ udevadm trigger --name-match=$TST_DEVICE
+
if [ -n "$device" ]; then
mkswap_verify "$mkswap_op" "$op_arg" "$device" "$size" "$dev_file"
if [ $? -ne 0 ]; then
--
2.14.4

1
meta/recipes-extended/ltp/ltp_20190517.bb
View File

@@ -50,6 +50,7 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0001-syscall-rt_sigtimedwait01-Fix-wrong-sigset-length-fo.patch \
file://0001-cve-2017-17052-Avoid-unsafe-exits-in-threads.patch \
file://0001-overcommit_memory-update-for-mm-fix-false-positive-O.patch \
file://0001-mkswap01.sh-Add-udevadm-trigger-before-swap-verifica.patch \
"
S = "${WORKDIR}/git"