diff mbox series

bugfix for cpio/cpio_tests.sh

Message ID 20210330130115.26575-1-sujiaxun@uniontech.com
State Rejected
Headers show
Series bugfix for cpio/cpio_tests.sh | expand

Commit Message

sujiaxun March 30, 2021, 1:01 p.m. UTC
In cpio version 2.12 and 2.13,'cpio --help' create is lowercase

Signed-off-by: sujiaxun <sujiaxun@uniontech.com>
---
 testcases/commands/cpio/cpio_tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.20.1

Comments

Petr Vorel March 31, 2021, 10:31 a.m. UTC | #1
Hi,

> In cpio version 2.12 and 2.13,'cpio --help' create is lowercase

> -	if ! cpio --help 2>&1 | grep -q -- '-o.*Create'; then
> +	if ! cpio --help 2>&1 | grep -qi -- '-o.*Create'; then

First, are you talking about cpio implementation [1]
or busybox implementation [2] ?

I suppose cpio, but also busybox had in the past 2.12 and 2.13.
There is no lower case in cpio 2.12 [3] neither in 2.13 [4].

Looking at busybox, I'm not sure how help was printed ([5] [6]), as I'm not able
to install this version (1_13_4 tag is from 2009 - I guess you're not talking about it).

Kind regards,
Petr

[1] https://git.savannah.gnu.org/cgit/cpio.git
[2] https://git.busybox.net/busybox/
[3] https://git.savannah.gnu.org/cgit/cpio.git/tree/src/main.c?h=release_2_12#n101
[4] https://git.savannah.gnu.org/cgit/cpio.git/tree/src/main.c?h=release_2_13#n100
[5] https://git.busybox.net/busybox/tree/archival/cpio.c?h=1_12_stable#n185
[6] https://git.busybox.net/busybox/tree/archival/cpio.c?h=1_13_stable
Petr Vorel March 31, 2021, 1:18 p.m. UTC | #2
Hi,

> > In cpio version 2.12 and 2.13,'cpio --help' create is lowercase  
>  
> > - if ! cpio --help 2>&1 | grep -q -- '-o.*Create'; then  
> > + if ! cpio --help 2>&1 | grep -qi -- '-o.*Create'; then  

> Sorry, I thought the search was ‘--create’ after ‘-o’. In the English
> environment, there is indeed ‘Create’ in the description.

>   -i, --extract              Extract files from an archive
>   -o, --create              Create the archive

Thanks for clarification.  No, long option --create does not exist in busybox
implementation, there is only short option -o. I mean it wouldn't harm to have
'grep -i', but until needed, I prefer to not adding it.

cpio implementation:
  -o, --create               Create the archive (run in copy-out mode)

busybox implementation:
	-o	Create (requires -H newc)

Kind regards,
Petr
diff mbox series

Patch

diff --git a/testcases/commands/cpio/cpio_tests.sh b/testcases/commands/cpio/cpio_tests.sh
index a98b7eca7..5f3a13e85 100755
--- a/testcases/commands/cpio/cpio_tests.sh
+++ b/testcases/commands/cpio/cpio_tests.sh
@@ -13,7 +13,7 @@  TST_SETUP="setup"

 setup()
 {
-	if ! cpio --help 2>&1 | grep -q -- '-o.*Create'; then
+	if ! cpio --help 2>&1 | grep -qi -- '-o.*Create'; then
 		tst_brk TCONF "-o flag not supported"
 	fi