From: Matt Kraai <kraai@ftbfs.org>
To: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
Cc: git discussion list <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/4] t0024, t5000: use test_lazy_prereq for UNZIP
Date: Sun, 6 Jan 2013 10:06:21 -0800 [thread overview]
Message-ID: <20130106180621.GA16494@ftbfs.org> (raw)
In-Reply-To: <50E9B90C.2060200@lsrfire.ath.cx>
On Sun, Jan 06, 2013 at 06:49:00PM +0100, René Scharfe wrote:
> This change makes the code smaller and we can put it at the top of
> the script, its rightful place as setup code.
Would it be better to add the setting of GIT_UNZIP and
test_lazy_prereq to test-lib.sh so they aren't duplicated in both
t0024-crlf-archive.sh and t5000-tar-tree.sh, something like the
following (modulo UNZIP/GIT_UNZIP)?
--
Matt Kraai
https://ftbfs.org/kraai
diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index ec6c1b3..084f33c 100755
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -3,7 +3,6 @@
test_description='respect crlf in git archive'
. ./test-lib.sh
-UNZIP=${UNZIP:-unzip}
test_expect_success setup '
@@ -26,13 +25,6 @@ test_expect_success 'tar archive' '
'
-"$UNZIP" -v >/dev/null 2>&1
-if [ $? -eq 127 ]; then
- say "Skipping ZIP test, because unzip was not found"
-else
- test_set_prereq UNZIP
-fi
-
test_expect_success UNZIP 'zip archive' '
git archive --format=zip HEAD >test.zip &&
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index ecf00ed..85b64ae 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -25,7 +25,6 @@ commit id embedding:
'
. ./test-lib.sh
-UNZIP=${UNZIP:-unzip}
GZIP=${GZIP:-gzip}
GUNZIP=${GUNZIP:-gzip -d}
@@ -201,13 +200,6 @@ test_expect_success \
test_cmp a/substfile2 g/prefix/a/substfile2
'
-$UNZIP -v >/dev/null 2>&1
-if [ $? -eq 127 ]; then
- say "Skipping ZIP tests, because unzip was not found"
-else
- test_set_prereq UNZIP
-fi
-
test_expect_success \
'git archive --format=zip' \
'git archive --format=zip HEAD >d.zip'
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8a12cbb..4ceabad 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -752,6 +752,13 @@ test_lazy_prereq AUTOIDENT '
git var GIT_AUTHOR_IDENT
'
+UNZIP=${UNZIP:-unzip}
+
+test_lazy_prereq UNZIP '
+ "$UNZIP" -v >/dev/null 2>&1
+ test $? -ne 127
+'
+
# When the tests are run as root, permission tests will report that
# things are writable when they shouldn't be.
test -w / || test_set_prereq SANITY
next prev parent reply other threads:[~2013-01-06 18:07 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-24 20:49 [LHF] making t5000 "tar xf" tests more lenient Junio C Hamano
2013-01-05 18:34 ` René Scharfe
2013-01-05 19:43 ` Junio C Hamano
2013-01-05 20:11 ` Junio C Hamano
2013-01-05 22:50 ` René Scharfe
2013-01-05 22:49 ` [PATCH] archive-tar: split long paths more carefully René Scharfe
2013-01-05 23:31 ` Jonathan Nieder
2013-01-06 6:54 ` Junio C Hamano
2013-01-06 15:20 ` [PATCH] archive-zip: write uncompressed size into header even with streaming René Scharfe
2013-01-06 17:45 ` [PATCH 0/4] ZIP test fixes René Scharfe
2013-01-06 17:47 ` [PATCH 1/4] t0024, t5000: clear variable UNZIP, use GIT_UNZIP instead René Scharfe
2013-01-07 5:16 ` Jonathan Nieder
2013-01-07 16:25 ` René Scharfe
2013-01-06 17:49 ` [PATCH 2/4] t0024, t5000: use test_lazy_prereq for UNZIP René Scharfe
2013-01-06 18:06 ` Matt Kraai [this message]
2013-01-06 21:59 ` René Scharfe
2013-01-07 8:45 ` Jonathan Nieder
2013-01-07 16:28 ` René Scharfe
2013-01-06 17:51 ` [PATCH 3/4] t5000, t5002: move ZIP tests into their own script René Scharfe
2013-01-06 17:59 ` [PATCH 4/4] t5002: check if unzip supports symlinks René Scharfe
2013-01-07 8:52 ` Jonathan Nieder
2013-01-07 16:50 ` René Scharfe
2013-01-10 7:36 ` Jonathan Nieder
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130106180621.GA16494@ftbfs.org \
--to=kraai@ftbfs.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rene.scharfe@lsrfire.ath.cx \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).