fix testsuite: make sure they use templates freshly built from the source
The initial t/trash repository for testing was created properly but over time we gained many tests that create secondary test repositories with init-db or clone and they were not careful enough. This fixes it. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
8336afa563
commit
74d20040ca
@ -50,12 +50,12 @@ test_expect_success 'setup separate repository lacking postimage' '
|
||||
|
||||
git tar-tree initial initial | tar xf - &&
|
||||
(
|
||||
cd initial && git init-db && git add .
|
||||
cd initial && git_init_db && git add .
|
||||
) &&
|
||||
|
||||
git tar-tree second second | tar xf - &&
|
||||
(
|
||||
cd second && git init-db && git add .
|
||||
cd second && git_init_db && git add .
|
||||
)
|
||||
|
||||
'
|
||||
|
@ -44,7 +44,7 @@ test_expect_success \
|
||||
'unpack without delta' \
|
||||
"GIT_OBJECT_DIRECTORY=.git2/objects &&
|
||||
export GIT_OBJECT_DIRECTORY &&
|
||||
git-init-db &&
|
||||
git_init_db &&
|
||||
git-unpack-objects -n <test-1-${packname_1}.pack &&
|
||||
git-unpack-objects <test-1-${packname_1}.pack"
|
||||
|
||||
@ -75,7 +75,7 @@ test_expect_success \
|
||||
'unpack with delta' \
|
||||
'GIT_OBJECT_DIRECTORY=.git2/objects &&
|
||||
export GIT_OBJECT_DIRECTORY &&
|
||||
git-init-db &&
|
||||
git_init_db &&
|
||||
git-unpack-objects -n <test-2-${packname_2}.pack &&
|
||||
git-unpack-objects <test-2-${packname_2}.pack'
|
||||
|
||||
@ -100,7 +100,7 @@ test_expect_success \
|
||||
'use packed objects' \
|
||||
'GIT_OBJECT_DIRECTORY=.git2/objects &&
|
||||
export GIT_OBJECT_DIRECTORY &&
|
||||
git-init-db &&
|
||||
git_init_db &&
|
||||
cp test-1-${packname_1}.pack test-1-${packname_1}.idx .git2/objects/pack && {
|
||||
git-diff-tree --root -p $commit &&
|
||||
while read object
|
||||
|
@ -24,7 +24,7 @@ test_expect_success setup '
|
||||
parent=$commit || return 1
|
||||
done &&
|
||||
git-update-ref HEAD "$commit" &&
|
||||
git-clone -l ./. victim &&
|
||||
git_clone -l ./. victim &&
|
||||
cd victim &&
|
||||
git-log &&
|
||||
cd .. &&
|
||||
|
@ -97,7 +97,7 @@ pull_to_client () {
|
||||
(
|
||||
mkdir client &&
|
||||
cd client &&
|
||||
git-init-db 2>> log2.txt
|
||||
git_init_db 2>> log2.txt
|
||||
)
|
||||
|
||||
add A1
|
||||
|
@ -15,12 +15,12 @@ test_expect_success setup '
|
||||
git commit -a -m original'
|
||||
|
||||
test_expect_success "clone and setup child repos" '
|
||||
git clone . one &&
|
||||
git_clone . one &&
|
||||
cd one &&
|
||||
echo >file updated by one &&
|
||||
git commit -a -m "updated by one" &&
|
||||
cd .. &&
|
||||
git clone . two &&
|
||||
git_clone . two &&
|
||||
cd two &&
|
||||
git repo-config branch.master.remote one &&
|
||||
{
|
||||
@ -28,7 +28,7 @@ test_expect_success "clone and setup child repos" '
|
||||
echo "Pull: refs/heads/master:refs/heads/one"
|
||||
} >.git/remotes/one
|
||||
cd .. &&
|
||||
git clone . three &&
|
||||
git_clone . three &&
|
||||
cd three &&
|
||||
git repo-config branch.master.remote two &&
|
||||
git repo-config branch.master.merge refs/heads/one &&
|
||||
@ -74,7 +74,7 @@ test_expect_success 'fetch following tags' '
|
||||
|
||||
mkdir four &&
|
||||
cd four &&
|
||||
git init-db &&
|
||||
git_init_db &&
|
||||
|
||||
git fetch .. :track &&
|
||||
git show-ref --verify refs/tags/anno &&
|
||||
|
@ -17,7 +17,7 @@ test_expect_success setup '
|
||||
test_expect_success 'pulling into void' '
|
||||
mkdir cloned &&
|
||||
cd cloned &&
|
||||
git init-db &&
|
||||
git_init_db &&
|
||||
git pull ..
|
||||
'
|
||||
|
||||
|
@ -13,7 +13,7 @@ remove the directory before attempting a clone again.'
|
||||
|
||||
test_expect_failure \
|
||||
'clone of non-existent source should fail' \
|
||||
'git-clone foo bar'
|
||||
'git_clone foo bar'
|
||||
|
||||
test_expect_failure \
|
||||
'failed clone should not leave a directory' \
|
||||
@ -29,11 +29,11 @@ test_create_repo foo
|
||||
# current path not to the target dir
|
||||
test_expect_failure \
|
||||
'clone of non-existent (relative to $PWD) source should fail' \
|
||||
'git-clone ../foo baz'
|
||||
'git_clone ../foo baz'
|
||||
|
||||
test_expect_success \
|
||||
'clone should work now that source exists' \
|
||||
'git-clone foo bar'
|
||||
'git_clone foo bar'
|
||||
|
||||
test_expect_success \
|
||||
'successfull clone must leave the directory' \
|
||||
|
@ -17,7 +17,7 @@ git commit -m initial'
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'preparing second repository' \
|
||||
'git clone A B && cd B &&
|
||||
'git_clone A B && cd B &&
|
||||
echo second > file2 &&
|
||||
git add file2 &&
|
||||
git commit -m addition &&
|
||||
@ -27,7 +27,7 @@ git prune'
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'cloning with reference' \
|
||||
'git clone -l -s --reference B A C'
|
||||
'git_clone -l -s --reference B A C'
|
||||
|
||||
cd "$base_dir"
|
||||
|
||||
|
@ -34,7 +34,7 @@ git prune'
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'preparing second repository' \
|
||||
'git clone -l -s A B && cd B &&
|
||||
'git_clone -l -s A B && cd B &&
|
||||
echo "foo bar" > file2 &&
|
||||
git add file2 &&
|
||||
git commit -m "next commit" file2 &&
|
||||
@ -44,7 +44,7 @@ git prune'
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_success 'preparing third repository' \
|
||||
'git clone -l -s B C && cd C &&
|
||||
'git_clone -l -s B C && cd C &&
|
||||
echo "Goodbye, cruel world" > file3 &&
|
||||
git add file3 &&
|
||||
git commit -m "one more" file3 &&
|
||||
@ -54,11 +54,11 @@ git prune'
|
||||
cd "$base_dir"
|
||||
|
||||
test_expect_failure 'creating too deep nesting' \
|
||||
'git clone -l -s C D &&
|
||||
git clone -l -s D E &&
|
||||
git clone -l -s E F &&
|
||||
git clone -l -s F G &&
|
||||
git clone -l -s G H &&
|
||||
'git_clone -l -s C D &&
|
||||
git_clone -l -s D E &&
|
||||
git_clone -l -s E F &&
|
||||
git_clone -l -s F G &&
|
||||
git_clone -l -s G H &&
|
||||
cd H &&
|
||||
test_valid_repo'
|
||||
|
||||
|
@ -88,7 +88,7 @@ test_expect_success \
|
||||
|
||||
test_expect_success "Michael Cassar's test case" '
|
||||
rm -fr .git papers partA &&
|
||||
git init-db &&
|
||||
git_init_db &&
|
||||
mkdir -p papers/unsorted papers/all-papers partA &&
|
||||
echo a > papers/unsorted/Thesis.pdf &&
|
||||
echo b > partA/outline.txt &&
|
||||
@ -109,7 +109,7 @@ rm -fr papers partA path?
|
||||
|
||||
test_expect_success "Sergey Vlasov's test case" '
|
||||
rm -fr .git &&
|
||||
git init-db &&
|
||||
git_init_db &&
|
||||
mkdir ab &&
|
||||
date >ab.c &&
|
||||
date >ab/d &&
|
||||
|
@ -182,6 +182,16 @@ test_create_repo () {
|
||||
cd "$owd"
|
||||
}
|
||||
|
||||
# Many tests do init-db and clone but they must be told about the freshly
|
||||
# built templates.
|
||||
git_init_db () {
|
||||
git init-db --template="$GIT_EXEC_PATH/templates/blt/" "$@"
|
||||
}
|
||||
|
||||
git_clone () {
|
||||
git clone --template="$GIT_EXEC_PATH/templates/blt/" "$@"
|
||||
}
|
||||
|
||||
test_done () {
|
||||
trap - exit
|
||||
case "$test_failure" in
|
||||
|
Loading…
Reference in New Issue
Block a user