Re: [PATCH v3 2/3] perf: make the tests work in worktrees
- From
René Scharfe <l.s.r@web.de>
- Date
- May 29, 2016, 16:43 UTC
- Message-ID
- <574B1C3D.3000706@web.de>
- In-Reply-To
- <0f0bc7ac7b6eebed22b05c277cf7352122d164d2.1463145936.git.johannes.schindelin@gmx.de>
Am 13.05.2016 um 15:25 schrieb Johannes Schindelin:
Show 50 quoted lines
> This patch makes perf-lib.sh more robust so that it can run correctly
> even inside a worktree. For example, it assumed that $GIT_DIR/objects is
> the objects directory (which is not the case for worktrees) and it used
> the commondir file verbatim, even if it contained a relative path.
>
> Furthermore, the setup code expected `git rev-parse --git-dir` to spit
> out a relative path, which is also not true for worktrees. Let's just
> change the code to accept both relative and absolute paths, by avoiding
> the `cd` into the copied working directory.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> t/perf/perf-lib.sh | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
> index 9fa0706..5ef1744 100644
> --- a/t/perf/perf-lib.sh
> +++ b/t/perf/perf-lib.sh
> @@ -80,22 +80,22 @@ test_perf_create_repo_from () {
> error "bug in the test script: not 2 parameters to test-create-repo"
> repo="$1"
> source="$2"
> - source_git=$source/$(cd "$source" && git rev-parse --git-dir)
> + source_git="$(git -C "$source" rev-parse --git-dir)"
> + objects_dir="$(git -C "$source" rev-parse --git-path objects)"
> mkdir -p "$repo/.git"
> (
> - cd "$repo/.git" &&
> - { cp -Rl "$source_git/objects" . 2>/dev/null ||
> - cp -R "$source_git/objects" .; } &&
> + { cp -Rl "$objects_dir" "$repo/.git/" 2>/dev/null ||
> + cp -R "$objects_dir" "$repo/.git/"; } &&
> for stuff in "$source_git"/*; do
> case "$stuff" in
> - */objects|*/hooks|*/config)
> + */objects|*/hooks|*/config|*/commondir)
> ;;
> *)
> - cp -R "$stuff" . || exit 1
> + cp -R "$stuff" "$repo/.git/" || exit 1
> ;;
> esac
> done &&
> - cd .. &&
> + cd "$repo" &&
> git init -q && {
> test_have_prereq SYMLINKS ||
> git config core.symlinks false
> This breaks perf for the non-worktree case:
lsr@debian:~/src/git/t/perf$ make rm -rf test-results ./run === Running 12 tests in this tree === cp: cannot stat '.git/objects': No such file or directory error: failed to copy repository '/home/lsr/src/git/t/..' to '/tmp/trash directory.p0000-perf-lib-sanity' cp: cannot stat '.git/objects': No such file or directory error: failed to copy repository '/home/lsr/src/git/t/..' to '/tmp/trash directory.p0001-rev-list' ...
Here's a fix:
-- >8 -- Subject: perf: make the tests work without a worktree
In regular repositories $source_git and $objects_dir contain relative paths based on $source. Go there to allow cp to resolve them.
Signed-off-by: Rene Scharfe <l.s.r@web.de> --- t/perf/perf-lib.sh | 1 + 1 file changed, 1 insertion(+)
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 5ef1744..1888790 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -84,6 +84,7 @@ test_perf_create_repo_from () { objects_dir="$(git -C "$source" rev-parse --git-path objects)" mkdir -p "$repo/.git" ( + cd "$source" && { cp -Rl "$objects_dir" "$repo/.git/" 2>/dev/null || cp -R "$objects_dir" "$repo/.git/"; } && for stuff in "$source_git"/*; do
-- 2.8.3