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

[PATCH v2 15/28] t4007: abstract away SHA-1-specific constants

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
May 13, 2018, 02:24 UTC
Message-ID
<20180513022438.60003-16-sandals@crustytoothpaste.net>
In-Reply-To
<20180513022438.60003-1-sandals@crustytoothpaste.net>

Adjust the test so that it computes variables for blobs and uses the ZERO_OID variable instead of using hard-coded hashes.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t4007-rename-3.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index dae327fabb..b187b7f6c6 100755
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -17,6 +17,7 @@ test_expect_success 'prepare reference tree' '
 	echo $tree
 '
 
+blob=$(git hash-object "$TEST_DIRECTORY/diff-lib/COPYING")
 test_expect_success 'prepare work tree' '
 	cp path0/COPYING path1/COPYING &&
 	git update-index --add --remove path0/COPYING path1/COPYING
@@ -26,8 +27,8 @@ test_expect_success 'prepare work tree' '
 # path1 both have COPYING and the latter is a copy of path0/COPYING.
 # Comparing the full tree with cache should tell us so.
 
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 C100	path0/COPYING	path1/COPYING
+cat >expected <<EOF
+:100644 100644 $blob $blob C100	path0/COPYING	path1/COPYING
 EOF
 
 test_expect_success 'copy detection' '
@@ -46,8 +47,8 @@ test_expect_success 'copy detection, cached' '
 # path1/COPYING suddenly appearing from nowhere, not detected as
 # a copy from path0/COPYING.
 
-cat >expected <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A	path1/COPYING
+cat >expected <<EOF
+:000000 100644 $ZERO_OID $blob A	path1/COPYING
 EOF
 
 test_expect_success 'copy, limited to a subtree' '
@@ -64,8 +65,8 @@ test_expect_success 'tweak work tree' '
 # path0/COPYING.  Showing the full tree with cache should tell us about
 # the rename.
 
-cat >expected <<\EOF
-:100644 100644 6ff87c4664981e4397625791c8ea3bbb5f2279a3 6ff87c4664981e4397625791c8ea3bbb5f2279a3 R100	path0/COPYING	path1/COPYING
+cat >expected <<EOF
+:100644 100644 $blob $blob R100	path0/COPYING	path1/COPYING
 EOF
 
 test_expect_success 'rename detection' '
@@ -78,8 +79,8 @@ test_expect_success 'rename detection' '
 # path0/COPYING.  When we say we care only about path1, we should just
 # see path1/COPYING appearing from nowhere.
 
-cat >expected <<\EOF
-:000000 100644 0000000000000000000000000000000000000000 6ff87c4664981e4397625791c8ea3bbb5f2279a3 A	path1/COPYING
+cat >expected <<EOF
+:000000 100644 $ZERO_OID $blob A	path1/COPYING
 EOF
 
 test_expect_success 'rename, limited to a subtree' '
Previous: brian m. carlsonNext: brian m. carlson
Message 14 of 31 in “Hash-independent tests (part 2)”
  1. 00/28 Hash-independent tests (part 2)brian m. carlson, May 13, 2018
  2. 01/28 t/test-lib: add an SHA1 prerequisitebrian m. carlson, May 13, 2018
  3. 02/28 t/test-lib: introduce ZERO_OIDbrian m. carlson, May 13, 2018
  4. 03/28 t: switch $_z40 to $ZERO_OIDbrian m. carlson, May 13, 2018
  5. 04/28 t/test-lib: introduce OID_REGEXbrian m. carlson, May 13, 2018
  6. 05/28 t: switch $_x40 to $OID_REGEXbrian m. carlson, May 13, 2018
  7. 06/28 t0000: annotate with SHA1 prerequisitebrian m. carlson, May 13, 2018
  8. 07/28 t1007: annotate with SHA1 prerequisitebrian m. carlson, May 13, 2018
  9. 09/28 t4044: skip test if not using SHA-1brian m. carlson, May 13, 2018
  10. 11/28 t2203: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  11. 10/28 t: skip pack tests if not using SHA-1brian m. carlson, May 13, 2018
  12. 08/28 t1512: skip test if not using SHA-1brian m. carlson, May 13, 2018
  13. 12/28 t3103: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  14. 15/28 t4007: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  15. 17/28 t4014: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  16. Johannes SixtMay 13, 2018
  17. brian m. carlsonMay 13, 2018
  18. 18/28 t4020: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  19. 21/28 t4029: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  20. 19/28 t4022: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  21. 24/28 t4205: sort log output in a hash-independent waybrian m. carlson, May 13, 2018
  22. 26/28 t4045: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  23. 25/28 t4042: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  24. 28/28 t5300: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  25. 27/28 t4208: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  26. 20/28 t4029: fix test indentationbrian m. carlson, May 13, 2018
  27. 23/28 t/lib-diff-alternative: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  28. 22/28 t4030: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  29. 13/28 t3702: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  30. 16/28 t4008: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  31. 14/28 t3905: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018

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.