mirror of
https://github.com/git/git.git
synced 2024-12-13 20:06:31 +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>
62 lines
1.8 KiB
Bash
Executable File
62 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Eric Wong
|
|
#
|
|
|
|
test_description='git-svn useSvmProps test'
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
test_expect_success 'load svm repo' '
|
|
svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9110/svm.dump &&
|
|
git-svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
|
|
git-svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
|
|
git-svn init --minimize-url -R argh -i e \
|
|
"$svnrepo"/mirror/argh/a/b/c/d/e &&
|
|
git config svn.useSvmProps true &&
|
|
git-svn fetch --all
|
|
'
|
|
|
|
uuid=161ce429-a9dd-4828-af4a-52023f968c89
|
|
|
|
bar_url=http://mayonaise/svnrepo/bar
|
|
test_expect_success 'verify metadata for /bar' "
|
|
git cat-file commit refs/remotes/bar | \
|
|
grep '^git-svn-id: $bar_url@12 $uuid$' &&
|
|
git cat-file commit refs/remotes/bar~1 | \
|
|
grep '^git-svn-id: $bar_url@11 $uuid$' &&
|
|
git cat-file commit refs/remotes/bar~2 | \
|
|
grep '^git-svn-id: $bar_url@10 $uuid$' &&
|
|
git cat-file commit refs/remotes/bar~3 | \
|
|
grep '^git-svn-id: $bar_url@9 $uuid$' &&
|
|
git cat-file commit refs/remotes/bar~4 | \
|
|
grep '^git-svn-id: $bar_url@6 $uuid$' &&
|
|
git cat-file commit refs/remotes/bar~5 | \
|
|
grep '^git-svn-id: $bar_url@1 $uuid$'
|
|
"
|
|
|
|
e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e
|
|
test_expect_success 'verify metadata for /dir/a/b/c/d/e' "
|
|
git cat-file commit refs/remotes/e | \
|
|
grep '^git-svn-id: $e_url@1 $uuid$'
|
|
"
|
|
|
|
dir_url=http://mayonaise/svnrepo/dir
|
|
test_expect_success 'verify metadata for /dir' "
|
|
git cat-file commit refs/remotes/dir | \
|
|
grep '^git-svn-id: $dir_url@2 $uuid$' &&
|
|
git cat-file commit refs/remotes/dir~1 | \
|
|
grep '^git-svn-id: $dir_url@1 $uuid$'
|
|
"
|
|
|
|
test_expect_success 'find commit based on SVN revision number' "
|
|
git-svn find-rev r12 |
|
|
grep `git rev-parse HEAD`
|
|
"
|
|
|
|
test_expect_success 'empty rebase' "
|
|
git-svn rebase
|
|
"
|
|
|
|
test_done
|