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

Re: [PATCH v2 08/22] t4013: make test hash independent

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 26, 2020, 22:08 UTC
Message-ID
<nycvar.QRO.7.76.6.2001262303530.46@tvgsbejvaqbjf.bet>
In-Reply-To
<20200125230035.136348-9-sandals@crustytoothpaste.net>
Hi brian,
On Sat, 25 Jan 2020, brian m. carlson wrote:
Show 23 quoted lines
> This test produces a large number of diff formats and compares the
> output with test files that have content specific to SHA-1. Since we are
> more interested in the format of the diffs, and not their specific
> values, which are tested elsewhere, add a function which uses sed to
> transform these specific object IDs into generic ones of the right size,
> which we can then compare.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
>  t/t4013-diff-various.sh | 44 +++++++++++++++++++++++++++++++++++------
>  1 file changed, 38 insertions(+), 6 deletions(-)
>
> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
> index 5ac94b390d..6f5f05c3a8 100755
> --- a/t/t4013-diff-various.sh
> +++ b/t/t4013-diff-various.sh
> @@ -120,6 +120,30 @@ test_expect_success setup '
>  +*++ [initial] Initial
>  EOF
>
> +process_diffs () {
> +	x04="[0-9a-f][0-9a-f][0-9a-f][0-9a-f]" &&
> +	x07="$_x05[0-9a-f][0-9a-f]" &&

Any reason not to stay with the convention, i.e. using `_x04` and `_x07` here (with leading underscores)?

Show 50 quoted lines
> +	sed -e "s/$OID_REGEX/$ZERO_OID/g" \
> +	    -e "s/From $_x40 /From $ZERO_OID /" \
> +	    -e "s/from $_x40)/from $ZERO_OID)/" \
> +	    -e "s/commit $_x40\$/commit $ZERO_OID/" \
> +	    -e "s/commit $_x40 (/commit $ZERO_OID (/" \
> +	    -e "s/$_x40 $_x40 $_x40/$ZERO_OID $ZERO_OID $ZERO_OID/" \
> +	    -e "s/$_x40 $_x40 /$ZERO_OID $ZERO_OID /" \
> +	    -e "s/^$_x40 $_x40$/$ZERO_OID $ZERO_OID/" \
> +	    -e "s/^$_x40 /$ZERO_OID /" \
> +	    -e "s/^$_x40$/$ZERO_OID/" \
> +	    -e "s/$x07\.\.$x07/fffffff..fffffff/g" \
> +	    -e "s/$x07,$x07\.\.$x07/fffffff,fffffff..fffffff/g" \
> +	    -e "s/$x07 $x07 $x07/fffffff fffffff fffffff/g" \
> +	    -e "s/$x07 $x07 /fffffff fffffff /g" \
> +	    -e "s/Merge: $x07 $x07/Merge: fffffff fffffff/g" \
> +	    -e "s/$x07\.\.\./fffffff.../g" \
> +	    -e "s/ $x04\.\.\./ ffff.../g" \
> +	    -e "s/ $x04/ ffff/g" \
> +	    "$1"
> +}
> +
>  V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
>  while read magic cmd
>  do
> @@ -158,13 +182,15 @@ do
>  		} >"$actual" &&
>  		if test -f "$expect"
>  		then
> +			process_diffs "$actual" >actual &&
> +			process_diffs "$expect" >expect &&
>  			case $cmd in
>  			*format-patch* | *-stat*)
> -				test_i18ncmp "$expect" "$actual";;
> +				test_i18ncmp expect actual;;
>  			*)
> -				test_cmp "$expect" "$actual";;
> +				test_cmp expect actual;;
>  			esac &&
> -			rm -f "$actual"
> +			rm -f "$actual" actual expect
>  		else
>  			# this is to help developing new tests.
>  			cp "$actual" "$expect"
> @@ -383,16 +409,22 @@ test_expect_success 'log -S requires an argument' '
>  test_expect_success 'diff --cached on unborn branch' '
>  	echo ref: refs/heads/unborn >.git/HEAD &&
>  	git diff --cached >result &&
> -	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached" result
> +	process_diffs result >actual &&
> +	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected &&

I was about to suggest letting `process_diffs` work in-place, but this line makes that idea moot.

Another idea I had was to implement a `test_cmp_diff` that processes the diffs and then compares them, but I guess that would be _less_ concise than this patch.

Looks good, Dscho

Show 20 quoted lines
> +	test_cmp expected actual
>  '
>
>  test_expect_success 'diff --cached -- file on unborn branch' '
>  	git diff --cached -- file0 >result &&
> -	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
> +	process_diffs result >actual &&
> +	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected &&
> +	test_cmp expected actual
>  '
>  test_expect_success 'diff --line-prefix with spaces' '
>  	git diff --line-prefix="| | | " --cached -- file0 >result &&
> -	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" result
> +	process_diffs result >actual &&
> +	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" >expected &&
> +	test_cmp expected actual
>  '
>
>  test_expect_success 'diff-tree --stdin with log formatting' '
>
Previous: brian m. carlsonNext: brian m. carlson
Message 13 of 52 in “SHA-256 test fixes, part 8”
  1. 00/23 SHA-256 test fixes, part 8brian m. carlson, Jan 25, 2020
  2. 01/22 t/lib-pack: support SHA-256brian m. carlson, Jan 25, 2020
  3. 07/22 t3311: make test work with SHA-256brian m. carlson, Jan 25, 2020
  4. 03/22 t3305: annotate with SHA1 prerequisitebrian m. carlson, Jan 25, 2020
  5. Johannes SchindelinJan 26, 2020
  6. Johan HerlandJan 26, 2020
  7. Johannes SchindelinJan 26, 2020
  8. brian m. carlsonJan 26, 2020
  9. Johan HerlandJan 26, 2020
  10. Johannes SchindelinJan 27, 2020
  11. brian m. carlsonJan 26, 2020
  12. 08/22 t4013: make test hash independentbrian m. carlson, Jan 25, 2020
  13. Johannes SchindelinJan 26, 2020
  14. brian m. carlsonJan 26, 2020
  15. 04/22 t3308: make test work with SHA-256brian m. carlson, Jan 25, 2020
  16. 05/22 t3309: make test work with SHA-256brian m. carlson, Jan 25, 2020
  17. 09/22 t4060: make test work with SHA-256brian m. carlson, Jan 25, 2020
  18. 10/22 t4211: make test hash independentbrian m. carlson, Jan 25, 2020
  19. Johannes SchindelinJan 26, 2020
  20. 17/23 t5616: use correct filter syntaxbrian m. carlson, Jan 25, 2020
  21. Junio C HamanoJan 28, 2020
  22. brian m. carlsonJan 29, 2020
  23. 18/23 t5607: make hash size independentbrian m. carlson, Jan 25, 2020
  24. 14/22 t5321: make test hash independentbrian m. carlson, Jan 25, 2020
  25. 17/22 t5607: make hash size independentbrian m. carlson, Jan 25, 2020
  26. 19/22 t5703: switch tests to use test_oidbrian m. carlson, Jan 25, 2020
  27. 18/22 t5703: make test work with SHA-256brian m. carlson, Jan 25, 2020
  28. Junio C HamanoJan 28, 2020
  29. brian m. carlsonJan 29, 2020
  30. 21/23 t6000: abstract away SHA-1-specific constantsbrian m. carlson, Jan 25, 2020
  31. 21/22 t6006: make hash size independentbrian m. carlson, Jan 25, 2020
  32. 20/22 t6000: abstract away SHA-1-specific constantsbrian m. carlson, Jan 25, 2020
  33. 06/22 t3310: make test work with SHA-256brian m. carlson, Jan 25, 2020
  34. 22/23 t6006: make hash size independentbrian m. carlson, Jan 25, 2020
  35. 23/23 t6024: update for SHA-256brian m. carlson, Jan 25, 2020
  36. 02/22 t3206: make hash size independentbrian m. carlson, Jan 25, 2020
  37. 22/22 t6024: update for SHA-256brian m. carlson, Jan 25, 2020
  38. 20/23 t5703: switch tests to use test_oidbrian m. carlson, Jan 25, 2020
  39. 19/23 t5703: make test work with SHA-256brian m. carlson, Jan 25, 2020
  40. 15/22 t5515: make test hash independentbrian m. carlson, Jan 25, 2020
  41. Junio C HamanoJan 28, 2020
  42. brian m. carlsonJan 29, 2020
  43. 16/22 t5318: update for SHA-256brian m. carlson, Jan 25, 2020
  44. 13/22 t5313: make test hash independentbrian m. carlson, Jan 25, 2020
  45. Junio C HamanoJan 28, 2020
  46. 11/22 t5302: make hash size independentbrian m. carlson, Jan 25, 2020
  47. Johannes SchindelinJan 26, 2020
  48. brian m. carlsonJan 26, 2020
  49. 12/22 t5309: make test hash independentbrian m. carlson, Jan 25, 2020
  50. Johannes SchindelinJan 26, 2020
  51. brian m. carlsonJan 26, 2020
  52. Johannes SchindelinJan 26, 2020

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.