[PATCH] tests: Introduce test_seq
- From
Michał Kiedrowicz <michal.kiedrowicz@gmail.com>
- Date
- Aug 3, 2012, 20:04 UTC
- Message-ID
- <1344024290-9197-1-git-send-email-michal.kiedrowicz@gmail.com>
- In-Reply-To
- <20120803160229.GA13094@sigill.intra.peff.net>
Jeff King wrote:
The seq command is GNU-ism, and is missing at least in older BSD releases and their derivatives, not to mention antique commercial Unixes.
We already purged it in b3431bc (Don't use seq in tests, not everyone has it, 2007-05-02), but a few new instances have crept in. They went unnoticed because they are in scripts that are not run by default.
This commit replaces them with test_seq that is implemented with a Perl snippet (proposed by Jeff). This is better than inlining this snippet everywhere it's needed because it's easier to read and it's easier to change the implementation (e.g. to C) if we ever decide to remove Perl from the test suite.
Note that test_seq is not a complete replacement for seq(1). It just has what we need now.
There are also many places that do `for i in 1 2 3 ...` but I'm not sure if it's worth converting them to test_seq. That would introduce running more processes of Perl.
Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> --- Previous patch didn't support `test_seq 1 50` (I removed it accidentally).
t/perf/perf-lib.sh | 2 +- t/t5551-http-fetch.sh | 2 +- t/test-lib-functions.sh | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 5580c22..a1361e5 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -163,7 +163,7 @@ test_perf () { else echo "perf $test_count - $1:" fi - for i in $(seq 1 $GIT_PERF_REPEAT_COUNT); do + for i in $(test_seq 1 $GIT_PERF_REPEAT_COUNT); do say >&3 "running: $2" if test_run_perf_ "$2" then diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index fadf2f2..91eaf53 100755 --- a/t/t5551-http-fetch.sh +++ b/t/t5551-http-fetch.sh @@ -114,7 +114,7 @@ test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE test_expect_success EXPENSIVE 'create 50,000 tags in the repo' ' ( cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && - for i in `seq 50000` + for i in `test_seq 50000` do echo "commit refs/heads/too-many-refs" echo "mark :$i" diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 80daaca..9456e65 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -530,6 +530,21 @@ test_cmp() { $GIT_TEST_CMP "$@" } +# test_seq is a portable replacement for seq(1). +# It may be used like: +# +# for i in `test_seq 100`; do +# echo $i +# done + +test_seq () { + test $# = 2 && { first=$1; shift; } || first=1 + test $# = 1 || + error "bug in the test script: not 1 or 2 parameters to test_seq" + last=$1 + "$PERL_PATH" -le "print for $first..$last" +} + # This function can be used to schedule some commands to be run # unconditionally at the end of the test to restore sanity: #
-- 1.7.11.rc0.212.g37218b0.dirty