2 files changed, 8 insertions, 8 deletions
diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch
index 83c29a651f..03bcc451df 100644
--- a/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch
+++ b/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch
@@ -1,6 +1,6 @@
-From 139177715a2d66ccd3e099be5d9d4dc86db30055 Mon Sep 17 00:00:00 2001
+From 3765b3a4cabf76f55c1c126ac64780a8c117d1d9 Mon Sep 17 00:00:00 2001
 From: Mingli Yu <mingli.yu@windriver.com>
-Date: Tue, 12 Jan 2021 03:05:38 +0000
+Date: Tue, 12 Jan 2021 10:30:13 +0800
 Subject: [PATCH] test: avoid the pfa test hang
 Per [1], the pfa test needs to install page-types and the pfa test
@@ -18,13 +18,13 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
 1 file changed, 3 insertions(+)
 diff --git a/tests/test b/tests/test
-index 9623f4a..7c552a9 100755
+index 020ae2b..320f57f 100755
 --- a/tests/test
 +++ b/tests/test
-@@ -45,6 +45,9 @@ for conf in `ls *.conf`
+@@ -47,6 +47,9 @@ do
- do
+        # Inject mce records and run mcelog in parallel.
-        log=`echo $conf | sed "s/conf/log/g"`
+        # So that the mce records can be consumed by mcelog in time (avoid mce record overflow).
-        ./inject $conf
+        ./inject $conf &
 +       if [ "$1" = "pfa" ] ; then
 +               which page-types > /dev/null 2>&1 || continue
 +       fi
diff --git a/meta-oe/recipes-support/mcelog/mcelog_170.bb b/meta-oe/recipes-support/mcelog/mcelog_175.bb
index f3e018d4a8..ae810eff8e 100644
--- a/meta-oe/recipes-support/mcelog/mcelog_170.bb
+++ b/meta-oe/recipes-support/mcelog/mcelog_175.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;
    file://run-ptest \
 "
-SRCREV = "391abaac9bdff385934b18134789bcc98b0adeb7"
+SRCREV = "7b776a8c005b60572f49797e81287540f99fff1f"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6"

diff --git a/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch b/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch index 83c29a651f..03bcc451df 100644 --- a/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch +++ b/meta-oe/recipes-support/mcelog/mcelog/0001-test-avoid-the-pfa-test-hang.patch
@@ -1,6 +1,6 @@
1	From 139177715a2d66ccd3e099be5d9d4dc86db30055 Mon Sep 17 00:00:00 2001	1	From 3765b3a4cabf76f55c1c126ac64780a8c117d1d9 Mon Sep 17 00:00:00 2001
2	From: Mingli Yu <mingli.yu@windriver.com>	2	From: Mingli Yu <mingli.yu@windriver.com>
3	Date: Tue, 12 Jan 2021 03:05:38 +0000	3	Date: Tue, 12 Jan 2021 10:30:13 +0800
4	Subject: [PATCH] test: avoid the pfa test hang	4	Subject: [PATCH] test: avoid the pfa test hang
5		5
6	Per [1], the pfa test needs to install page-types and the pfa test	6	Per [1], the pfa test needs to install page-types and the pfa test
@@ -18,13 +18,13 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
18	1 file changed, 3 insertions(+)	18	1 file changed, 3 insertions(+)
19		19
20	diff --git a/tests/test b/tests/test	20	diff --git a/tests/test b/tests/test
21	index 9623f4a..7c552a9 100755	21	index 020ae2b..320f57f 100755
22	--- a/tests/test	22	--- a/tests/test
23	+++ b/tests/test	23	+++ b/tests/test
24	@@ -45,6 +45,9 @@ for conf in `ls *.conf`	24	@@ -47,6 +47,9 @@ do
25	do	25	# Inject mce records and run mcelog in parallel.
26	log=`echo $conf \| sed "s/conf/log/g"`	26	# So that the mce records can be consumed by mcelog in time (avoid mce record overflow).
27	./inject $conf	27	./inject $conf &
28	+ if [ "$1" = "pfa" ] ; then	28	+ if [ "$1" = "pfa" ] ; then
29	+ which page-types > /dev/null 2>&1 \|\| continue	29	+ which page-types > /dev/null 2>&1 \|\| continue
30	+ fi	30	+ fi


diff --git a/meta-oe/recipes-support/mcelog/mcelog_170.bb b/meta-oe/recipes-support/mcelog/mcelog_175.bb index f3e018d4a8..ae810eff8e 100644 --- a/meta-oe/recipes-support/mcelog/mcelog_170.bb +++ b/meta-oe/recipes-support/mcelog/mcelog_175.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;
10	file://run-ptest \	10	file://run-ptest \
11	"	11	"
12		12
13	SRCREV = "391abaac9bdff385934b18134789bcc98b0adeb7"	13	SRCREV = "7b776a8c005b60572f49797e81287540f99fff1f"
14		14
15	LICENSE = "GPLv2"	15	LICENSE = "GPLv2"
16	LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6"	16	LIC_FILES_CHKSUM = "file://README.md;md5=74bb47b9a68850cb398665cf78b31de6"