mirror of
https://github.com/git/git.git
synced 2024-11-25 02:44:48 +08:00
bfdbee9810
Many test scripts assumed that they will start in a 'trash' subdirectory
that is a single level down from the t/ directory, and referred to their
test vector files by asking for files like "../t9999/expect". This will
break if we move the 'trash' subdirectory elsewhere.
To solve this, we earlier introduced "$TEST_DIRECTORY" so that they can
refer to t/ directory reliably. This finally makes all the tests use
it to refer to the outside environment.
With this patch, and a one-liner not included here (because it would
contradict with what Dscho really wants to do):
| diff --git a/t/test-lib.sh b/t/test-lib.sh
| index 70ea7e0..60e69e4 100644
| --- a/t/test-lib.sh
| +++ b/t/test-lib.sh
| @@ -485,7 +485,7 @@ fi
| . ../GIT-BUILD-OPTIONS
|
| # Test repository
| -test="trash directory"
| +test="trash directory/another level/yet another"
| rm -fr "$test" || {
| trap - exit
| echo >&5 "FATAL: Cannot prepare test area"
all the tests still pass, but we would want extra sets of eyeballs on this
type of change to really make sure.
[jc: with help from Stephan Beyer on http-push tests I do not run myself;
credits for locating silly quoting errors go to Olivier Marin.]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
45 lines
2.2 KiB
Bash
Executable File
45 lines
2.2 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
#
|
|
|
|
test_description='Test git rev-parse with different parent options'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/t6000lib.sh # t6xxx specific functions
|
|
|
|
date >path0
|
|
git update-index --add path0
|
|
save_tag tree git write-tree
|
|
hide_error save_tag start unique_commit "start" tree
|
|
save_tag second unique_commit "second" tree -p start
|
|
hide_error save_tag start2 unique_commit "start2" tree
|
|
save_tag two_parents unique_commit "next" tree -p second -p start2
|
|
save_tag final unique_commit "final" tree -p two_parents
|
|
|
|
test_expect_success 'start is valid' 'git rev-parse start | grep "^[0-9a-f]\{40\}$"'
|
|
test_expect_success 'start^0' "test $(cat .git/refs/tags/start) = $(git rev-parse start^0)"
|
|
test_expect_success 'start^1 not valid' "if git rev-parse --verify start^1; then false; else :; fi"
|
|
test_expect_success 'second^1 = second^' "test $(git rev-parse second^1) = $(git rev-parse second^)"
|
|
test_expect_success 'final^1^1^1' "test $(git rev-parse start) = $(git rev-parse final^1^1^1)"
|
|
test_expect_success 'final^1^1^1 = final^^^' "test $(git rev-parse final^1^1^1) = $(git rev-parse final^^^)"
|
|
test_expect_success 'final^1^2' "test $(git rev-parse start2) = $(git rev-parse final^1^2)"
|
|
test_expect_success 'final^1^2 != final^1^1' "test $(git rev-parse final^1^2) != $(git rev-parse final^1^1)"
|
|
test_expect_success 'final^1^3 not valid' "if git rev-parse --verify final^1^3; then false; else :; fi"
|
|
test_expect_success '--verify start2^1' 'test_must_fail git rev-parse --verify start2^1'
|
|
test_expect_success '--verify start2^0' 'git rev-parse --verify start2^0'
|
|
test_expect_success 'final^1^@ = final^1^1 final^1^2' "test \"$(git rev-parse final^1^@)\" = \"$(git rev-parse final^1^1 final^1^2)\""
|
|
test_expect_success 'final^1^! = final^1 ^final^1^1 ^final^1^2' "test \"$(git rev-parse final^1^\!)\" = \"$(git rev-parse final^1 ^final^1^1 ^final^1^2)\""
|
|
|
|
test_expect_success 'repack for next test' 'git repack -a -d'
|
|
test_expect_success 'short SHA-1 works' '
|
|
start=`git rev-parse --verify start` &&
|
|
echo $start &&
|
|
abbrv=`echo $start | sed s/.\$//` &&
|
|
echo $abbrv &&
|
|
abbrv=`git rev-parse --verify $abbrv` &&
|
|
echo $abbrv &&
|
|
test $start = $abbrv'
|
|
|
|
test_done
|