Merge pull request libgit2#5513 from libgit2/pks/tests-fix-32-bit-formatter

ethomson · web-flow · commit 896abfc85fe7 · 2020-05-12T11:14:10.000+01:00
tests: merge: fix printf formatter on 32 bit arches
diff --git a/tests/merge/trees/renames.c b/tests/merge/trees/renames.c
@@ -307,7 +307,7 @@ void test_merge_trees_renames__cache_recomputation(void)
 	 */
 	cl_git_pass(git_treebuilder_new(&builder, repo, NULL));
 	for (i = 0; i < 1000; i++) {
-		cl_git_pass(git_buf_printf(&path, "%"PRIuMAX".txt", i));
+		cl_git_pass(git_buf_printf(&path, "%"PRIuZ".txt", i));
 		cl_git_pass(git_treebuilder_insert(NULL, builder, path.ptr, &blob, GIT_FILEMODE_BLOB));
 		git_buf_clear(&path);
 	}

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ void test_merge_trees_renames__cache_recomputation(void)`
`307`	`307`	`*/`
`308`	`308`	`cl_git_pass(git_treebuilder_new(&builder, repo, NULL));`
`309`	`309`	`for (i = 0; i < 1000; i++) {`
`310`		`- cl_git_pass(git_buf_printf(&path, "%"PRIuMAX".txt", i));`
	`310`	`+ cl_git_pass(git_buf_printf(&path, "%"PRIuZ".txt", i));`
`311`	`311`	`cl_git_pass(git_treebuilder_insert(NULL, builder, path.ptr, &blob, GIT_FILEMODE_BLOB));`
`312`	`312`	`git_buf_clear(&path);`
`313`	`313`	`}`