summaryrefslogtreecommitdiff
path: root/t/t1000-checkout-cache.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-14 07:24:27 (GMT)
committerPetr Baudis <xpasky@machine.sinus.cz>2005-05-14 16:06:21 (GMT)
commit886856aba21b5e6ee41e9e91c9e6fcebc7a5ad1c (patch)
tree7568d3c23e69cf196ba5ba8bba935fc68dbeeeaf /t/t1000-checkout-cache.sh
parent94e8afa28558786d1413645fd8aaadf157fb6eb4 (diff)
downloadgit-886856aba21b5e6ee41e9e91c9e6fcebc7a5ad1c.zip
git-886856aba21b5e6ee41e9e91c9e6fcebc7a5ad1c.tar.gz
git-886856aba21b5e6ee41e9e91c9e6fcebc7a5ad1c.tar.bz2
[PATCH 1/2] Test suite fixup.
Exposing test_expect_success and test_expect_failure turns out to be enough for the test scripts and there is no need for exposing test_ok or test_failure. This patch cleans it up and fixes the users of test_ok and test_failure. Also test scripts have acquired a new command line flag '--immediate' to cause them to exit upon the first failure. This is useful especially during the development of a new test. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Petr Baudis <pasky@ucw.cz>
Diffstat (limited to 't/t1000-checkout-cache.sh')
-rwxr-xr-xt/t1000-checkout-cache.sh9
1 files changed, 3 insertions, 6 deletions
diff --git a/t/t1000-checkout-cache.sh b/t/t1000-checkout-cache.sh
index c10b6be..a2c4260 100755
--- a/t/t1000-checkout-cache.sh
+++ b/t/t1000-checkout-cache.sh
@@ -44,12 +44,9 @@ test_expect_success \
'git-checkout-cache with -f should succeed.' \
'git-checkout-cache -f -a'
-if test -f path0 && test -d path1 && test -f path1/file1
-then
- test_ok "checkout successful"
-else
- test_failure "checkout failed"
-fi
+test_expect_success \
+ 'git-checkout-cache conflicting paths.' \
+ 'test -f path0 && test -d path1 && test -f path1/file1'
test_done