util-linux: fix tabfiles-tags case failure
PATCH 1/1 util-linux: fix tabfiles-tags case failure
From: Mingli Yu <[email protected]>
Pass "--use-system-commands" option when run tabfiles-tags case as we don't deploy the command under /usr/lib64/util-linux/ptest folder by default.
Fixes:
# cd /usr/lib64/util-linux/ptest/ # ./tests/ts/libmount/tabfiles-tags [snip] ./ts/libmount/../../functions.sh: line 652: /usr/lib64/util-linux/ptest/blkid: No such file or directory FAILED (libmount/tabfiles-tags)'
Signed-off-by Mingli Yu <[email protected]>
--- meta/recipes-core/util-linux/util-linux.inc | 1 + ...-tags-add-use-system-commands-option.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-tabfiles-tags-add-use-system-commands-option.patch
meta/recipes-core/util-linux/util-linux.inc +1 -0
@@ -35,6 +35,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ + file://0001-tabfiles-tags-add-use-system-commands-option.patch \ " SRC_URI[sha256sum] = "6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9"
meta/recipes-core/util-linux/util-linux/0001-tabfiles-tags-add-use-system-commands-option.patch new file +35 -0
@@ -0,0 +1,35 @@ +From be3ecff8b1bc1de4d29ca6381ee9ab42e6c15947 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <[email protected]> +Date: Fri, 12 Nov 2021 15:33:53 +0800 +Subject: [PATCH] tabfiles-tags: add use-system-commands option + +Pass --use-system-commands option to make blkid command available +Fixes: + # ./ts/libmount/tabfiles-tags + [snip] + ./ts/libmount/../../functions.sh: line 652: /usr/lib64/util-linux/ptest/blkid: No such file or directory + FAILED (libmount/tabfiles-tags)' + +Upstream-Status: Inappropriate [configuration specific] + +Signed-off-by: Mingli Yu <[email protected]> +--- + tests/ts/libmount/tabfiles-tags | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags +index 69b06a9..17176ef 100755 +--- a/tests/ts/libmount/tabfiles-tags ++++ b/tests/ts/libmount/tabfiles-tags +@@ -4,7 +4,7 @@ TS_TOPDIR="${0%/*}/../.." + TS_DESC="tags" + + . $TS_TOPDIR/functions.sh +-ts_init "$*" ++ts_init "$* --use-system-commands" + + ts_skip_nonroot + +-- +2.17.1 +
Signature · 1 line
2.17.1
Quoted 12 lines · Mingli
From: Mingli Yu <[email protected]>
Pass "--use-system-commands" option when run tabfiles-tags case as we don't deploy the command under
/usr/lib64/util-linux/ptestfolder by default.
Fixes:# cd /usr/lib64/util-linux/ptest/ # ./tests/ts/libmount/tabfiles-tags [snip] ./ts/libmount/../../functions.sh: line 652: /usr/lib64/util-linux/ptest/blkid: No such file or directory FAILED (libmount/tabfiles-tags)'
Quoted 6 lines
Signed-off-by Mingli Yu <[email protected]>--- meta/recipes-core/util-linux/util-linux.inc | 1 + ...-tags-add-use-system-commands-option.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-core/util-linux/util-linux/0001-tabfiles-tags-add-use-system-commands-option.patch
I don't really want to carry a patch for this forever. Could we create a symlink in do_install_ptest that handles this instead?
Also, why isn't isn't failure showing up on the autobuilder test runs?
Cheers,
Richard