From: Radoslav Kolev <radoslav.kolev@suse.com>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH] unzip01.sh: Fix failure with BusyBox unzip
Date: Mon, 21 Dec 2020 13:22:50 +0200 [thread overview]
Message-ID: <20201221112250.27944-1-radoslav.kolev@suse.com> (raw)
BusyBox unzip uses the word 'inflating' instead of 'extracting'.
Detect it and check for the correct match in the output.
Signed-off-by: Radoslav Kolev <radoslav.kolev@suse.com>
---
testcases/commands/unzip/unzip01.sh | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/testcases/commands/unzip/unzip01.sh b/testcases/commands/unzip/unzip01.sh
index 750718de4..1b9a1665f 100755
--- a/testcases/commands/unzip/unzip01.sh
+++ b/testcases/commands/unzip/unzip01.sh
@@ -12,6 +12,14 @@ TST_NEEDS_TMPDIR=1
TST_NEEDS_CMDS="unzip"
. tst_test.sh
+EXTRACT_MATCH=""
+
+if unzip 2>&1 | grep -q 'BusyBox'; then
+ EXTRACT_MATCH="inflating"
+else
+ EXTRACT_MATCH="extracting"
+fi
+
setup()
{
cat > unzip_exp.out <<EOF
@@ -21,15 +29,15 @@ Archive: $TST_DATAROOT/test.zip
creating: dir/d2/
creating: dir/d3/
creating: dir/d4/
- extracting: dir/d1/f1
- extracting: dir/d1/f2
- extracting: dir/d1/f3
+ $EXTRACT_MATCH: dir/d1/f1
+ $EXTRACT_MATCH: dir/d1/f2
+ $EXTRACT_MATCH: dir/d1/f3
creating: dir/d2/d1/
creating: dir/d2/d2/
creating: dir/d2/d3/
- extracting: dir/d2/f1
- extracting: dir/d2/f2
- extracting: dir/d2/f3
+ $EXTRACT_MATCH: dir/d2/f1
+ $EXTRACT_MATCH: dir/d2/f2
+ $EXTRACT_MATCH: dir/d2/f3
creating: dir/d3/d1/
creating: dir/d3/d2/
creating: dir/d3/d3/
--
2.26.2
next reply other threads:[~2020-12-21 11:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-21 11:22 Radoslav Kolev [this message]
2021-01-05 9:26 ` [LTP] [PATCH] unzip01.sh: Fix failure with BusyBox unzip Petr Vorel
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=20201221112250.27944-1-radoslav.kolev@suse.com \
--to=radoslav.kolev@suse.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox