* [LTP] [PATCH] fs/iso9660: bugfix for iso9660/isofs.sh
@ 2021-03-26 1:41 zhanglianjie
2021-04-01 11:15 ` Petr Vorel
0 siblings, 1 reply; 4+ messages in thread
From: zhanglianjie @ 2021-03-26 1:41 UTC (permalink / raw)
To: ltp
Debian uses genisoimage to replace mkisofs, the prompt of genisoimage
is the same as that of mkisofs.
Signed-off-by: zhanglianjie <zhanglianjie@uniontech.com>
---
testcases/kernel/fs/iso9660/isofs.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/fs/iso9660/isofs.sh b/testcases/kernel/fs/iso9660/isofs.sh
index 9de3f7cdc..69ab6e357 100755
--- a/testcases/kernel/fs/iso9660/isofs.sh
+++ b/testcases/kernel/fs/iso9660/isofs.sh
@@ -12,6 +12,12 @@
TST_NEEDS_CMDS="mkisofs"
TST_NEEDS_TMPDIR=1
TST_TESTFUNC=do_test
+which mkisofs >/dev/null 2>&1
+if [ $? -ne 0 ]; then
+ TST_NEEDS_CMDS="genisoimage"
+fi
+MKISOFS_CMD=$TST_NEEDS_CMDS
+
. tst_test.sh
MAX_DEPTH=3
@@ -56,7 +62,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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [LTP] [PATCH] fs/iso9660: bugfix for iso9660/isofs.sh
@ 2021-04-02 3:19 zhanglianjie
2021-04-06 10:35 ` Petr Vorel
0 siblings, 1 reply; 4+ messages in thread
From: zhanglianjie @ 2021-04-02 3:19 UTC (permalink / raw)
To: ltp
Hi,
>Hi,
>
>> Debian uses genisoimage to replace mkisofs, the prompt of genisoimage
>> is the same as that of mkisofs.
>
>...
>> +++ b/testcases/kernel/fs/iso9660/isofs.sh
>> @@ -12,6 +12,12 @@
>> TST_NEEDS_CMDS="mkisofs"
>> TST_NEEDS_TMPDIR=1
>> TST_TESTFUNC=do_test
>> +which mkisofs >/dev/null 2>&1
>> +if [ $? -ne 0 ]; then
>> + TST_NEEDS_CMDS="genisoimage"
>> +fi
>
>You can omit whole $? check:
>
>if ! which mkisofs >/dev/null 2>&1; then
>TST_NEEDS_CMDS="genisoimage"
>fi
>
>Also IMHO mkisofs is not dead [1], it just moved to schilytools [2] and some
>distros use it (at least openSUSE [3]).
>Thus asking for genisoimage (from cdrkit) can be a bit misleading.
>
>But, is it really needed? Both Debian [4] and Fedora [5] creates
>mkisofs symlink to genisoimage, Debian installs automatically genisoimage when
>installing mkisofs.
>
>Kind regards,
>Petr
>
>[1] https://wiki.osdev.org/Mkisofs
>[2] http://sf.net/projects/schilytools/files/
>[3] https://build.opensuse.org/package/show/utilities/schily
>[4] https://tracker.debian.org/media/packages/c/cdrkit/changelog-91.1.11-3.2
>[5] https://src.fedoraproject.org/rpms/cdrkit/blob/rawhide/f/cdrkit.spec
>
>> +MKISOFS_CMD=$TST_NEEDS_CMDS
Currently in Debian, only the package genisoimage in sid and bullseye contains mkisofs,
and there is no deb package of mkisofs in architectures such as mips. In addition,
this patch increases compatibility and is better than the previous one.
It is necessary to modify it.
Reference: https://packages.debian.org/search?suite=sid&searchon=contents&keywords=mkisofs
According to your suggestion, the revised patch:
---
testcases/kernel/fs/iso9660/isofs.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/testcases/kernel/fs/iso9660/isofs.sh b/testcases/kernel/fs/iso9660/isofs.sh
index 9de3f7cdc..1da3a398f 100755
--- a/testcases/kernel/fs/iso9660/isofs.sh
+++ b/testcases/kernel/fs/iso9660/isofs.sh
@@ -12,6 +12,11 @@
TST_NEEDS_CMDS="mkisofs"
TST_NEEDS_TMPDIR=1
TST_TESTFUNC=do_test
+if ! which mkisofs >/dev/null 2>&1; then
+ TST_NEEDS_CMDS="genisoimage"
+fi
+MKISOFS_CMD=$TST_NEEDS_CMDS
+
. tst_test.sh
MAX_DEPTH=3
@@ -56,7 +61,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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [LTP] [PATCH] fs/iso9660: bugfix for iso9660/isofs.sh
2021-04-02 3:19 zhanglianjie
@ 2021-04-06 10:35 ` Petr Vorel
0 siblings, 0 replies; 4+ messages in thread
From: Petr Vorel @ 2021-04-06 10:35 UTC (permalink / raw)
To: ltp
Hi,
...
> Currently in Debian, only the package genisoimage in sid and bullseye contains mkisofs,
> and there is no deb package of mkisofs in architectures such as mips. In addition,
> this patch increases compatibility and is better than the previous one.
Well, bullseye is stable. But ok, some people might care about oldstable (we
test it built LTP in Travis) and even oldoldstable.
> It is necessary to modify it.
> Reference: https://packages.debian.org/search?suite=sid&searchon=contents&keywords=mkisofs
> According to your suggestion, the revised patch:
> ---
> testcases/kernel/fs/iso9660/isofs.sh | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
> diff --git a/testcases/kernel/fs/iso9660/isofs.sh b/testcases/kernel/fs/iso9660/isofs.sh
> index 9de3f7cdc..1da3a398f 100755
> --- a/testcases/kernel/fs/iso9660/isofs.sh
> +++ b/testcases/kernel/fs/iso9660/isofs.sh
> @@ -12,6 +12,11 @@
> TST_NEEDS_CMDS="mkisofs"
> TST_NEEDS_TMPDIR=1
> TST_TESTFUNC=do_test
> +if ! which mkisofs >/dev/null 2>&1; then
> + TST_NEEDS_CMDS="genisoimage"
> +fi
> +MKISOFS_CMD=$TST_NEEDS_CMDS
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
}
> @@ -56,7 +61,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 \
Kind regards,
Petr
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-06 10:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-26 1:41 [LTP] [PATCH] fs/iso9660: bugfix for iso9660/isofs.sh zhanglianjie
2021-04-01 11:15 ` Petr Vorel
-- strict thread matches above, loose matches on Subject: below --
2021-04-02 3:19 zhanglianjie
2021-04-06 10:35 ` Petr Vorel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox