aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2010-08-11 19:04:05 +0000
committerJunio C Hamano <gitster@pobox.com>2010-08-18 12:42:45 -0700
commit2c7e134cfe6fa10665b2545d5f6e2fb5d160618e (patch)
treee770ca556f435b68be10ebc873cb6fe7efecfe9e
parent063b7e0cd4a9017045fc6323a526e82b670dc740 (diff)
downloadgit-2c7e134cfe6fa10665b2545d5f6e2fb5d160618e.tar.gz
git-2c7e134cfe6fa10665b2545d5f6e2fb5d160618e.tar.xz
t/t5705-clone-2gb: change from skip_all=* to prereq skip
Change this test to skip test with test prerequisites, and to do setup work in tests. This improves the skipped statistics on platforms where the test isn't run. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5705-clone-2gb.sh16
1 files changed, 9 insertions, 7 deletions
diff --git a/t/t5705-clone-2gb.sh b/t/t5705-clone-2gb.sh
index e4d1b6a0f..e9783c341 100755
--- a/t/t5705-clone-2gb.sh
+++ b/t/t5705-clone-2gb.sh
@@ -3,12 +3,14 @@
test_description='Test cloning a repository larger than 2 gigabyte'
. ./test-lib.sh
-test -z "$GIT_TEST_CLONE_2GB" &&
-skip_all="Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t" &&
-test_done &&
-exit
+if test -z "$GIT_TEST_CLONE_2GB"
+then
+ say 'Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t'
+else
+ test_set_prereq CLONE_2GB
+fi
-test_expect_success 'setup' '
+test_expect_success CLONE_2GB 'setup' '
git config pack.compression 0 &&
git config pack.depth 0 &&
@@ -36,13 +38,13 @@ test_expect_success 'setup' '
'
-test_expect_success 'clone - bare' '
+test_expect_success CLONE_2GB 'clone - bare' '
git clone --bare --no-hardlinks . clone-bare
'
-test_expect_success 'clone - with worktree, file:// protocol' '
+test_expect_success CLONE_2GB 'clone - with worktree, file:// protocol' '
git clone file://. clone-wt