git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 2/3] perf: make the tests work in worktrees

From
Junio C Hamano <gitster@pobox.com>
Date
May 30, 2016, 18:03 UTC
Message-ID
<xmqqr3cjo23d.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<alpine.DEB.2.20.1605301026430.4449@virtualbox>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 39 quoted lines
>> This breaks perf for the non-worktree case:
>
> Oh drats!
>
>> 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" &&
>
> I fear that interacts badly with the `cd "$repo"` I introduced later
> (replacing a `cd ..`)...

What do you want to do then? For now before -rc1 we can revert the whole thing so that we can get a tested thing that works in both layouts.

Previous: Johannes SchindelinNext: René Scharfe
Message 22 of 26 in “Introduce a perf test for interactive rebase”
  1. 0/3 Introduce a perf test for interactive rebaseJohannes Schindelin, May 10, 2016
  2. 1/3 perf: let's disable symlinks on WindowsJohannes Schindelin, May 10, 2016
  3. Junio C HamanoMay 10, 2016
  4. Johannes SchindelinMay 11, 2016
  5. 2/3 perf: make the tests work in worktreesJohannes Schindelin, May 10, 2016
  6. Junio C HamanoMay 10, 2016
  7. Johannes SchindelinMay 11, 2016
  8. 3/3 Add a perf test for rebase -iJohannes Schindelin, May 10, 2016
  9. 0/3 Introduce a perf test for interactive rebaseJohannes Schindelin, May 11, 2016
  10. 3/3 Add a perf test for rebase -iJohannes Schindelin, May 11, 2016
  11. Junio C HamanoMay 11, 2016
  12. Johannes SchindelinMay 13, 2016
  13. 2/3 perf: make the tests work in worktreesJohannes Schindelin, May 11, 2016
  14. Eric SunshineMay 11, 2016
  15. Johannes SchindelinMay 13, 2016
  16. 1/3 perf: let's disable symlinks when they are not availableJohannes Schindelin, May 11, 2016
  17. 0/3 Introduce a perf test for interactive rebaseJohannes Schindelin, May 13, 2016
  18. 1/3 perf: let's disable symlinks when they are not availableJohannes Schindelin, May 13, 2016
  19. 2/3 perf: make the tests work in worktreesJohannes Schindelin, May 13, 2016
  20. René ScharfeMay 29, 2016
  21. Johannes SchindelinMay 30, 2016
  22. Junio C HamanoMay 30, 2016
  23. René ScharfeMay 30, 2016
  24. Junio C HamanoMay 31, 2016
  25. Jeff KingJun 21, 2016
  26. 3/3 Add a perf test for rebase -iJohannes Schindelin, May 13, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.