From: zhanglianjie <zhanglianjie@uniontech.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH] bugfix for iso9660/isofs.sh
Date: Wed, 7 Apr 2021 13:24:24 +0800 [thread overview]
Message-ID: <20210407052424.5795-1-zhanglianjie@uniontech.com> (raw)
Hi,
...
>Well, bullseye is stable. But ok, some people might care about oldstable (we
>test it built LTP in Travis) and even oldoldstable.
>
>Actually, this depends on which (take look on tst_cmd_available(), it also uses
>command and trying to use which only if missing). And also it's misleading to
>suggest to use only genisoimage.
>
>Although for our documentation ("docparse"), it'd be better to use
>TST_NEEDS_CMDS, until (if ever) shell API supports logical OR (e.g.
>TST_NEEDS_CMDS="mkisofs|genisoimage") it'd be better to avoid TST_NEEDS_CMDS and
>decide in the setup. Thus if you don't mind I'll merge this fix with you as an author:
>
>setup()
>{
>if ! tst_cmd_available mkisofs && ! tst_cmd_available genisoimage; then
>tst_brk TCONF "please install mkisofs or genisoimage"
>fi
>}
Thank you very much for your guidance, but I want to submit it myself.
Because this is the first time I submit a patch in the community.
---
testcases/kernel/fs/iso9660/isofs.sh | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/testcases/kernel/fs/iso9660/isofs.sh b/testcases/kernel/fs/iso9660/isofs.sh
index 9de3f7cdc..c0e2d1ff8 100755
--- a/testcases/kernel/fs/iso9660/isofs.sh
+++ b/testcases/kernel/fs/iso9660/isofs.sh
@@ -9,14 +9,26 @@
# It makes ISO9660 file system with different options and also
# mounts ISO9660 file system with different mount options.
-TST_NEEDS_CMDS="mkisofs"
TST_NEEDS_TMPDIR=1
TST_TESTFUNC=do_test
+TST_SETUP=setup
+
. tst_test.sh
MAX_DEPTH=3
MAX_DIRS=4
+setup()
+{
+ if tst_cmd_available mkisofs; then
+ MKISOFS_CMD="mkisofs"
+ elif tst_cmd_available genisoimage; then
+ MKISOFS_CMD="genisoimage"
+ else
+ tst_brk TCONF "please install mkisofs or genisoimage"
+ fi
+}
+
gen_fs_tree()
{
local cur_path="$1"
@@ -56,7 +68,7 @@ do_test() {
"-allow-lowercase -allow-multidot -iso-level 3 -f -l -D -J -allow-leading-dots -R"
do
rm -f isofs.iso
- EXPECT_PASS mkisofs -o isofs.iso -quiet $mkisofs_opt $make_file_sys_dir 2\> /dev/null \
+ EXPECT_PASS $MKISOFS_CMD -o isofs.iso -quiet $mkisofs_opt $make_file_sys_dir 2\> /dev/null \
|| continue
for mount_opt in \
--
2.20.1
next reply other threads:[~2021-04-07 5:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 5:24 zhanglianjie [this message]
2021-04-13 20:27 ` [LTP] [PATCH] bugfix for iso9660/isofs.sh Petr Vorel
-- strict thread matches above, loose matches on Subject: below --
2021-04-07 2:31 zhanglianjie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210407052424.5795-1-zhanglianjie@uniontech.com \
--to=zhanglianjie@uniontech.com \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.