diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:39:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:39:02 -0700 |
| commit | 6f79d6689193dad107b9424e9bd699d20c7d5c33 (patch) | |
| tree | d3906f9884c541f3b9d492cbe254df07bca9ffaf /t | |
| parent | Merge branch 'rs/diff-no-minimal' into maint (diff) | |
| parent | Turn setup code in t2007-checkout-symlink.sh into a test (diff) | |
| download | tgif-6f79d6689193dad107b9424e9bd699d20c7d5c33.tar.xz | |
Merge branch 'ab/test-cleanup' into maint
* ab/test-cleanup:
Turn setup code in t2007-checkout-symlink.sh into a test
Move t6000lib.sh to lib-*
Diffstat (limited to 't')
| -rw-r--r-- | t/lib-t6000.sh (renamed from t/t6000lib.sh) | 0 | ||||
| -rwxr-xr-x | t/t2007-checkout-symlink.sh | 6 | ||||
| -rwxr-xr-x | t/t6002-rev-list-bisect.sh | 2 | ||||
| -rwxr-xr-x | t/t6003-rev-list-topo-order.sh | 2 | ||||
| -rwxr-xr-x | t/t6101-rev-parse-parents.sh | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/t/t6000lib.sh b/t/lib-t6000.sh index 985d517a1c..985d517a1c 100644 --- a/t/t6000lib.sh +++ b/t/lib-t6000.sh diff --git a/t/t2007-checkout-symlink.sh b/t/t2007-checkout-symlink.sh index 20f33436d0..27e2127afe 100755 --- a/t/t2007-checkout-symlink.sh +++ b/t/t2007-checkout-symlink.sh @@ -44,8 +44,10 @@ test_expect_success 'switch from symlink to dir' ' ' -rm -fr frotz xyzzy nitfol && -git checkout -f master || exit +test_expect_success 'Remove temporary directories & switch to master' ' + rm -fr frotz xyzzy nitfol && + git checkout -f master +' test_expect_success 'switch from dir to symlink' ' diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh index b4e8fbaa5e..fb07536a0f 100755 --- a/t/t6002-rev-list-bisect.sh +++ b/t/t6002-rev-list-bisect.sh @@ -5,7 +5,7 @@ test_description='Tests git rev-list --bisect functionality' . ./test-lib.sh -. "$TEST_DIRECTORY"/t6000lib.sh # t6xxx specific functions +. "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions # usage: test_bisection max-diff bisect-option head ^prune... # diff --git a/t/t6003-rev-list-topo-order.sh b/t/t6003-rev-list-topo-order.sh index 2c73f2da7b..e4c52b0214 100755 --- a/t/t6003-rev-list-topo-order.sh +++ b/t/t6003-rev-list-topo-order.sh @@ -6,7 +6,7 @@ test_description='Tests git rev-list --topo-order functionality' . ./test-lib.sh -. "$TEST_DIRECTORY"/t6000lib.sh # t6xxx specific functions +. "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions list_duplicates() { diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh index f105fab98e..e673c25e94 100755 --- a/t/t6101-rev-parse-parents.sh +++ b/t/t6101-rev-parse-parents.sh @@ -6,7 +6,7 @@ test_description='Test git rev-parse with different parent options' . ./test-lib.sh -. "$TEST_DIRECTORY"/t6000lib.sh # t6xxx specific functions +. "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions date >path0 git update-index --add path0 |