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

[PATCH v2 14/39] t7400: make hash size independent

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Jul 13, 2020, 02:48 UTC
Message-ID
<20200713024909.3714837-15-sandals@crustytoothpaste.net>
In-Reply-To
<20200713024909.3714837-1-sandals@crustytoothpaste.net>

Instead of using cut with hard-coded hash sizes, use cut with fields, or where that's not possible, sed with $OID_REGEX, so that the tests are independent of hash size.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t7400-submodule-basic.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 956e17abb3..fec7e0299d 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -1231,7 +1231,7 @@ test_expect_success 'submodule helper list is not confused by common prefixes' '
 	git submodule add /dir1/b dir1/b &&
 	git submodule add /dir2/b dir2/b &&
 	git commit -m "first submodule commit" &&
-	git submodule--helper list dir1/b |cut -c51- >actual &&
+	git submodule--helper list dir1/b | cut -f 2 >actual &&
 	echo "dir1/b" >expect &&
 	test_cmp expect actual
 '
@@ -1260,7 +1260,7 @@ test_expect_success 'submodule update --init with a specification' '
 	pwd=$(pwd) &&
 	git clone file://"$pwd"/multisuper multisuper_clone &&
 	git -C multisuper_clone submodule update --init . ":(exclude)sub0" &&
-	git -C multisuper_clone submodule status |cut -c 1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 '
 
@@ -1271,7 +1271,7 @@ test_expect_success 'submodule update --init with submodule.active set' '
 	git -C multisuper_clone config submodule.active "." &&
 	git -C multisuper_clone config --add submodule.active ":(exclude)sub0" &&
 	git -C multisuper_clone submodule update --init &&
-	git -C multisuper_clone submodule status |cut -c 1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 '
 
@@ -1290,7 +1290,7 @@ test_expect_success 'submodule update and setting submodule.<name>.active' '
 	-sub3
 	EOF
 	git -C multisuper_clone submodule update &&
-	git -C multisuper_clone submodule status |cut -c 1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 '
 
@@ -1307,12 +1307,12 @@ test_expect_success 'clone active submodule without submodule url set' '
 		git submodule update &&
 		git submodule status >actual_raw &&
 
-		cut -c 1,43- actual_raw >actual &&
+		cut -d" " -f3- actual_raw >actual &&
 		cat >expect <<-\EOF &&
-		 sub0 (test2)
-		 sub1 (test2)
-		 sub2 (test2)
-		 sub3 (test2)
+		sub0 (test2)
+		sub1 (test2)
+		sub2 (test2)
+		sub3 (test2)
 		EOF
 		test_cmp expect actual
 	)
@@ -1328,7 +1328,7 @@ test_expect_success 'clone --recurse-submodules with a pathspec works' '
 	EOF
 
 	git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
-	git -C multisuper_clone submodule status |cut -c1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expected actual
 '
 
@@ -1345,7 +1345,7 @@ test_expect_success 'clone with multiple --recurse-submodules options' '
 		  --recurse-submodules=":(exclude)sub0" \
 		  --recurse-submodules=":(exclude)sub2" \
 		  multisuper multisuper_clone &&
-	git -C multisuper_clone submodule status |cut -c1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 '
 
@@ -1373,7 +1373,7 @@ test_expect_success 'clone and subsequent updates correctly auto-initialize subm
 		  --recurse-submodules=":(exclude)sub4" \
 		  multisuper multisuper_clone &&
 
-	git -C multisuper_clone submodule status |cut -c1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual &&
 
 	git -C multisuper submodule add ../sub1 sub4 &&
@@ -1382,7 +1382,7 @@ test_expect_success 'clone and subsequent updates correctly auto-initialize subm
 	# obtain the new superproject
 	git -C multisuper_clone pull &&
 	git -C multisuper_clone submodule update --init &&
-	git -C multisuper_clone submodule status |cut -c1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect2 actual
 '
Previous: brian m. carlsonNext: brian m. carlson
Message 5 of 44 in “SHA-256, part 3/3”
  1. 00/39 SHA-256, part 3/3brian m. carlson, Jul 13, 2020
  2. 01/39 t: make test-bloom initialize repositorybrian m. carlson, Jul 13, 2020
  3. 09/39 t6501: avoid hard-coded objectsbrian m. carlson, Jul 13, 2020
  4. 10/39 t7003: compute appropriate length constantbrian m. carlson, Jul 13, 2020
  5. 14/39 t7400: make hash size independentbrian m. carlson, Jul 13, 2020
  6. 06/39 t6101: make hash size independentbrian m. carlson, Jul 13, 2020
  7. 18/39 t8002: make hash size independentbrian m. carlson, Jul 13, 2020
  8. 11/39 t7063: make hash size independentbrian m. carlson, Jul 13, 2020
  9. 17/39 t7508: use $ZERO_OID instead of hard-coded constantbrian m. carlson, Jul 13, 2020
  10. 16/39 t7506: avoid checking for SHA-1-specific constantsbrian m. carlson, Jul 13, 2020
  11. 12/39 t7201: abstract away SHA-1-specific constantsbrian m. carlson, Jul 13, 2020
  12. 02/39 t1001: use $ZERO_OIDbrian m. carlson, Jul 13, 2020
  13. 21/39 t9300: abstract away SHA-1-specific constantsbrian m. carlson, Jul 13, 2020
  14. 22/39 t9300: use $ZERO_OID instead of hard-coded object IDbrian m. carlson, Jul 13, 2020
  15. 19/39 t8003: make hash size independentbrian m. carlson, Jul 13, 2020
  16. 37/39 ci: run tests with SHA-256brian m. carlson, Jul 13, 2020
  17. 38/39 docs: add documentation for extensions.objectFormatbrian m. carlson, Jul 13, 2020
  18. 39/39 t: remove test_oid_init in testsbrian m. carlson, Jul 13, 2020
  19. 07/39 t6301: make hash size independentbrian m. carlson, Jul 13, 2020
  20. 03/39 t3305: make hash agnosticbrian m. carlson, Jul 13, 2020
  21. 05/39 t6100: make hash size independentbrian m. carlson, Jul 13, 2020
  22. 04/39 t3404: prepare 'short SHA-1 collision' tests for SHA-256brian m. carlson, Jul 13, 2020
  23. 34/39 t: add test_oid option to select hash algorithmbrian m. carlson, Jul 13, 2020
  24. 29/39 http-fetch: set up git directory before parsing pack hashesbrian m. carlson, Jul 13, 2020
  25. 08/39 t6500: specify test values for SHA-256brian m. carlson, Jul 13, 2020
  26. 15/39 t7405: make hash size independentbrian m. carlson, Jul 13, 2020
  27. 33/39 Enable SHA-256 support by defaultbrian m. carlson, Jul 13, 2020
  28. 13/39 t7102: abstract away SHA-1-specific constantsbrian m. carlson, Jul 13, 2020
  29. 24/39 t9350: make hash size independentbrian m. carlson, Jul 13, 2020
  30. 25/39 t9500: ensure that algorithm info is preserved in configbrian m. carlson, Jul 13, 2020
  31. 20/39 t8011: make hash size independentbrian m. carlson, Jul 13, 2020
  32. 26/39 t9700: make hash size independentbrian m. carlson, Jul 13, 2020
  33. 27/39 t5308: make test work with SHA-256brian m. carlson, Jul 13, 2020
  34. 28/39 t0410: mark test with SHA1 prerequisitebrian m. carlson, Jul 13, 2020
  35. 35/39 t: allow testing different hash algorithms via environmentbrian m. carlson, Jul 13, 2020
  36. 36/39 t: make SHA1 prerequisite depend on default hashbrian m. carlson, Jul 13, 2020
  37. 32/39 setup: add support for reading extensions.objectformatbrian m. carlson, Jul 13, 2020
  38. 30/39 builtin/verify-pack: implement an --object-format optionbrian m. carlson, Jul 13, 2020
  39. 31/39 bundle: add new version for use with SHA-256brian m. carlson, Jul 13, 2020
  40. Junio C HamanoJul 13, 2020
  41. SZEDER GáborJul 13, 2020
  42. Johannes SchindelinJul 15, 2020
  43. Junio C HamanoJul 15, 2020
  44. 23/39 t9301: make hash size independentbrian m. carlson, Jul 13, 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.