From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001 From: takeshi_hoshina Date: Mon, 2 Nov 2020 11:07:33 +0900 Subject: basesystem-jj recipes --- ...test.py-not-use-hard-coded-path-.-obj-hugeadm.patch | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch') diff --git a/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch b/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch index 53f35abb..83934abe 100644 --- a/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch +++ b/external/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch @@ -10,15 +10,20 @@ Upstream-Status: Submitted Signed-off-by: Ting Liu +Update for 2.22. +Signed-off-by: Zheng Ruoqin + +Update to work for python3 +Signed-off-by: Changqing Li --- tests/run_tests.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/run_tests.py b/tests/run_tests.py -index 3c95a03..560df6b 100755 +index 018264d..0aabcd1 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py -@@ -234,9 +234,19 @@ def get_pagesizes(): +@@ -245,9 +245,19 @@ def get_pagesizes(): Use libhugetlbfs' hugeadm utility to get a list of page sizes that have active mount points and at least one huge page allocated to the pool. """ @@ -34,8 +39,11 @@ index 3c95a03..560df6b 100755 + return sizes + except OSError: + return sizes -+ out = p.stdout.read().strip() ++ out = p.stdout.read().decode().strip() + - if rc != 0 or out == "": return sizes + if rc != 0 or out == "": + return sizes - for size in out.split("\n"): sizes.add(int(size)) +-- +2.7.4 + -- cgit 1.2.3-korg