commit 9e56bdf9d7deb5c9c510a46a91fb918c1ba4c9d2 from: Omar Polo date: Fri Jul 19 19:59:59 2024 UTC run more tests in sha256 mode Since we've been quickly expanded the support for sha256, instead of making the regress "opt-in", make them "opt-out". Basically, only the regress that are reaching the network protocol code needs to be disabled as of now in sha256 mode (until we add support for git protocol v2). commit - 38d18775b821d504089ef6268fc301f527ccb169 commit + 9e56bdf9d7deb5c9c510a46a91fb918c1ba4c9d2 blob - 01b59d6b22c8914f82397ad837939e2a7abf0c82 blob + d029636f37e1e06a4fba931a86782da565457b03 --- regress/cmdline/blame.sh +++ regress/cmdline/blame.sh @@ -1130,7 +1130,7 @@ run_test test_blame_lines_shifted_down run_test test_blame_commit_subsumed run_test test_blame_blame_h run_test test_blame_added_on_branch -run_test test_blame_submodule sha256-ok -run_test test_blame_symlink sha256-ok +run_test test_blame_submodule +run_test test_blame_symlink run_test test_blame_lines_shifted_skip run_test test_blame_commit_keywords blob - df93594b0d2b9c43f5458f984970bcbfef007d20 blob + 6b14508b86ae76b06c4b422f9dddcb726e665798 --- regress/cmdline/branch.sh +++ regress/cmdline/branch.sh @@ -675,9 +675,9 @@ test_branch_list_worktree_state() { test_parseargs "$@" run_test test_branch_create run_test test_branch_list -run_test test_branch_delete sha256-ok +run_test test_branch_delete run_test test_branch_delete_current_branch -run_test test_branch_delete_packed sha256-ok +run_test test_branch_delete_packed run_test test_branch_show run_test test_branch_packed_ref_collision run_test test_branch_commit_keywords blob - da9f21b71ed5a6182df333e72bc95c8b004bd456 blob + 9d71d8d52004f89383a535be68110b0dbb61be97 --- regress/cmdline/cat.sh +++ regress/cmdline/cat.sh @@ -435,9 +435,9 @@ test_cat_commit_keywords() { } test_parseargs "$@" -run_test test_cat_basic sha256-ok +run_test test_cat_basic run_test test_cat_path -run_test test_cat_submodule sha256-ok -run_test test_cat_submodule_of_same_repo sha256-ok -run_test test_cat_symlink sha256-ok +run_test test_cat_submodule +run_test test_cat_submodule_of_same_repo +run_test test_cat_symlink run_test test_cat_commit_keywords blob - f5b8de097637f7d3a470a2430dce513a1cc859f8 blob + c03acc526e5de0ab93d6adddd739a9d62026408c --- regress/cmdline/checkout.sh +++ regress/cmdline/checkout.sh @@ -1089,7 +1089,7 @@ run_test test_checkout_read_only run_test test_checkout_into_nonempty_dir run_test test_checkout_symlink run_test test_checkout_symlink_relative_wtpath -run_test test_checkout_repo_with_unknown_extension +run_test test_checkout_repo_with_unknown_extension no-sha256 # XXX git fsck fails? run_test test_checkout_quiet run_test test_checkout_umask run_test test_checkout_ulimit_n blob - 95b0e4aeb0e81d800561f45b18ef2f2c3e1b60b9 blob + 917f461bbd426aba175083612b8346c3fc981160 --- regress/cmdline/clone.sh +++ regress/cmdline/clone.sh @@ -994,16 +994,16 @@ EOF } test_parseargs "$@" -run_test test_clone_basic -run_test test_clone_quoting -run_test test_clone_list -run_test test_clone_branch -run_test test_clone_all -run_test test_clone_mirror -run_test test_clone_mirror_all -run_test test_clone_reference -run_test test_clone_branch_and_reference -run_test test_clone_reference_mirror -run_test test_clone_multiple_branches -run_test test_clone_dangling_headref -run_test test_clone_basic_http +run_test test_clone_basic no-sha256 +run_test test_clone_quoting no-sha256 +run_test test_clone_list no-sha256 +run_test test_clone_branch no-sha256 +run_test test_clone_all no-sha256 +run_test test_clone_mirror no-sha256 +run_test test_clone_mirror_all no-sha256 +run_test test_clone_reference no-sha256 +run_test test_clone_branch_and_reference no-sha256 +run_test test_clone_reference_mirror no-sha256 +run_test test_clone_multiple_branches no-sha256 +run_test test_clone_dangling_headref no-sha256 +run_test test_clone_basic_http no-sha256 blob - 4079f5788bab5a6b19194fc7f89f6c7235a230b6 blob + 41051e07321fad9c5140c71182b0ca7d9fef2410 --- regress/cmdline/common.sh +++ regress/cmdline/common.sh @@ -278,7 +278,7 @@ run_test() esac fi - if [ "${GOT_TEST_ALGO}" = sha256 -a -z "$limits" ]; then + if [ "${GOT_TEST_ALGO}" = sha256 -a "$limits" = no-sha256 ]; then return fi blob - f3fd9cd4b4a1c4dcb75a3452a8b6f215af48bf95 blob + 59243b5c07792da8486b3128282d07cd79ae5bbe --- regress/cmdline/diff.sh +++ regress/cmdline/diff.sh @@ -2270,12 +2270,12 @@ test_diff_commit_keywords() { test_parseargs "$@" run_test test_diff_basic run_test test_diff_shows_conflict -run_test test_diff_tag sha256-ok -run_test test_diff_lightweight_tag sha256-ok -run_test test_diff_ignore_whitespace -run_test test_diff_submodule_of_same_repo sha256-ok +run_test test_diff_tag +run_test test_diff_lightweight_tag +run_test test_diff_ignore_whitespace +run_test test_diff_submodule_of_same_repo run_test test_diff_symlinks_in_work_tree -run_test test_diff_symlinks_in_repo sha256-ok +run_test test_diff_symlinks_in_repo run_test test_diff_binary_files run_test test_diff_commits run_test test_diff_ignored_file blob - 928c5f4563e3de646b74ef37ef6fd2588857395d blob + 989f4e6cf60ce8128c75220328753f473901b028 --- regress/cmdline/fetch.sh +++ regress/cmdline/fetch.sh @@ -2138,21 +2138,21 @@ test_fetch_basic_http() { } test_parseargs "$@" -run_test test_fetch_basic -run_test test_fetch_list -run_test test_fetch_branch -run_test test_fetch_all -run_test test_fetch_empty_packfile -run_test test_fetch_delete_branch -run_test test_fetch_delete_branch_mirror -run_test test_fetch_update_tag -run_test test_fetch_reference -run_test test_fetch_replace_symref -run_test test_fetch_update_headref -run_test test_fetch_headref_deleted_locally -run_test test_fetch_gotconfig_remote_repo -run_test test_fetch_gitconfig_remote_repo -run_test test_fetch_delete_remote_refs -run_test test_fetch_honor_wt_conf_bflag -run_test test_fetch_from_out_of_date_remote -run_test test_fetch_basic_http +run_test test_fetch_basic no-sha256 +run_test test_fetch_list no-sha256 +run_test test_fetch_branch no-sha256 +run_test test_fetch_all no-sha256 +run_test test_fetch_empty_packfile no-sha256 +run_test test_fetch_delete_branch no-sha256 +run_test test_fetch_delete_branch_mirror no-sha256 +run_test test_fetch_update_tag no-sha256 +run_test test_fetch_reference no-sha256 +run_test test_fetch_replace_symref no-sha256 +run_test test_fetch_update_headref no-sha256 +run_test test_fetch_headref_deleted_locally no-sha256 +run_test test_fetch_gotconfig_remote_repo no-sha256 +run_test test_fetch_gitconfig_remote_repo no-sha256 +run_test test_fetch_delete_remote_refs no-sha256 +run_test test_fetch_honor_wt_conf_bflag no-sha256 +run_test test_fetch_from_out_of_date_remote no-sha256 +run_test test_fetch_basic_http no-sha256 blob - 641a80e0f4d3a3e6c42194d00008d26feca19ae0 blob + b1a6fa4f2a8b5e436b7e88a234aec2a2d44796b8 --- regress/cmdline/import.sh +++ regress/cmdline/import.sh @@ -16,12 +16,17 @@ . ./common.sh +format_arg= +if [ "${GOT_TEST_ALGO}" = sha256 ]; then + format_arg="-A sha256" +fi + test_import_basic() { local testname=import_basic local testroot=`mktemp -d \ "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"` - got init $testroot/repo + got init $format_arg $testroot/repo mkdir $testroot/tree make_test_tree $testroot/tree @@ -147,7 +152,7 @@ test_import_specified_head() { "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"` local headref=trunk - gotadmin init -b $headref $testroot/repo + gotadmin init $format_arg -b $headref $testroot/repo mkdir $testroot/tree make_test_tree $testroot/tree @@ -372,7 +377,7 @@ test_import_ignores() { local testroot=`mktemp -d \ "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"` - got init $testroot/repo + got init $format_arg $testroot/repo mkdir $testroot/tree make_test_tree $testroot/tree @@ -406,7 +411,7 @@ test_import_empty_dir() { local testroot=`mktemp -d \ "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"` - gotadmin init $testroot/repo + gotadmin init $format_arg $testroot/repo mkdir $testroot/tree mkdir -p $testroot/tree/empty $testroot/tree/notempty @@ -450,7 +455,7 @@ test_import_symlink() { local testroot=`mktemp -d \ "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"` - gotadmin init $testroot/repo + gotadmin init $format_arg $testroot/repo mkdir $testroot/tree echo 'this is file alpha' > $testroot/tree/alpha blob - ccba2603a3aa69bd7de8eff0d30822576810bc01 blob + da3d392bd7580e87c32828f695f32137a2817551 --- regress/cmdline/init.sh +++ regress/cmdline/init.sh @@ -16,13 +16,18 @@ . ./common.sh +format_arg= +if [ "${GOT_TEST_ALGO}" = sha256 ]; then + format_arg="-A sha256" +fi + test_init_basic() { local testname=init_basic local testroot=`mktemp -d \ "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"` local headref=main - gotadmin init $testroot/repo + gotadmin init $format_arg $testroot/repo local git_head=`git -C $testroot/repo symbolic-ref HEAD` echo $git_head > $testroot/content @@ -42,7 +47,7 @@ test_init_specified_head() { "$GOT_TEST_ROOT/got-test-$testname-XXXXXXXXXX"` local headref=trunk - gotadmin init -b $headref $testroot/repo + gotadmin init $format_arg -b $headref $testroot/repo local git_head=`git -C $testroot/repo symbolic-ref HEAD` echo refs/heads/$headref > $testroot/content.expected blob - 50222a69eaa0c608bf4501525a4ccd51cfe0aa70 blob + 31af9d1824061e6a3c03dc083717d9ef864769bd --- regress/cmdline/load.sh +++ regress/cmdline/load.sh @@ -16,6 +16,11 @@ . ./common.sh +format_arg= +if [ "${GOT_TEST_ALGO}" = sha256 ]; then + format_arg="-A sha256" +fi + test_load_bundle() { local testroot=`test_init test_load_bundle` @@ -23,7 +28,7 @@ test_load_bundle() { git -C "$testroot/repo" bundle create -q "$testroot/bundle" master # then load it in an empty repository - (cd "$testroot/" && gotadmin init -b master repo2) >/dev/null + (cd "$testroot/" && gotadmin init $format_arg -b master repo2) >/dev/null (cd "$testroot/repo2" && gotadmin load < "$testroot/bundle") \ >/dev/null if [ $? -ne 0 ]; then @@ -85,7 +90,7 @@ test_load_branch_from_bundle() { (cd "$testroot/repo" && gotadmin dump -q >$testroot/bundle) - (cd "$testroot/" && gotadmin init -b newbranch repo2) >/dev/null + (cd "$testroot/" && gotadmin init $format_arg -b newbranch repo2) >/dev/null # check that the reference in the bundle are what we expect (cd "$testroot/repo2" && gotadmin load -l "$testroot/bundle") \ blob - 158e231472a384a544f9d5fb653f59f7e41266f0 blob + b1c3c8ec3866e7ac66371da08256f2fa1212a13c --- regress/cmdline/log.sh +++ regress/cmdline/log.sh @@ -1304,21 +1304,21 @@ EOF test_parseargs "$@" -run_test test_log_in_repo sha256-ok -run_test test_log_in_bare_repo sha256-ok +run_test test_log_in_repo +run_test test_log_in_bare_repo run_test test_log_in_worktree run_test test_log_in_worktree_with_path_prefix run_test test_log_tag run_test test_log_limit run_test test_log_oneline run_test test_log_patch_added_file -run_test test_log_nonexistent_path sha256-ok +run_test test_log_nonexistent_path run_test test_log_end_at_commit run_test test_log_reverse_display -run_test test_log_in_worktree_different_repo sha256-ok +run_test test_log_in_worktree_different_repo run_test test_log_changed_paths -run_test test_log_merge_commit_nonexistent_path sha256-ok -run_test test_log_submodule sha256-ok +run_test test_log_merge_commit_nonexistent_path +run_test test_log_submodule run_test test_log_diffstat run_test test_log_commit_keywords run_test test_log_toposort blob - cd6a8a4afe865e1846927b4aa4b6ef571c40bee8 blob + 3e35a53501af3d2e668311babef051e8683bd1d4 --- regress/cmdline/merge.sh +++ regress/cmdline/merge.sh @@ -2029,5 +2029,5 @@ run_test test_merge_imported_branch run_test test_merge_interrupt run_test test_merge_umask run_test test_merge_gitconfig_author -run_test test_merge_fetched_branch -run_test test_merge_fetched_branch_remote +run_test test_merge_fetched_branch no-sha256 # need network +run_test test_merge_fetched_branch_remote no-sha256 # need network blob - 8c3ef3d540c1d85f90159c2da205319d07f7a15e blob + 64e5549700453bd0afc70a70e8b3e31c3cde21db --- regress/cmdline/ref.sh +++ regress/cmdline/ref.sh @@ -635,7 +635,7 @@ test_ref_commit_keywords() { test_parseargs "$@" run_test test_ref_create -run_test test_ref_delete sha256-ok +run_test test_ref_delete run_test test_ref_list run_test test_ref_list_packed_refs run_test test_ref_commit_keywords blob - 2dc1ca89112c06945139d118d2b88d6945dc2a3a blob + 5053abcc3b14deece4bb33886f4380b7fe2e9bd0 --- regress/cmdline/send.sh +++ regress/cmdline/send.sh @@ -1733,19 +1733,19 @@ EOF } test_parseargs "$@" -run_test test_send_basic -run_test test_send_rebase_required -run_test test_send_rebase_required_overwrite -run_test test_send_merge_commit -run_test test_send_delete -run_test test_send_clone_and_send -run_test test_send_tags -run_test test_send_tag_of_deleted_branch -run_test test_send_new_branch -run_test test_send_all_branches -run_test test_send_to_empty_repo -run_test test_send_and_fetch_config -run_test test_send_config -run_test test_send_gitconfig -run_test test_send_rejected -run_test test_send_basic_http +run_test test_send_basic no-sha256 +run_test test_send_rebase_required no-sha256 +run_test test_send_rebase_required_overwrite no-sha256 +run_test test_send_merge_commit no-sha256 +run_test test_send_delete no-sha256 +run_test test_send_clone_and_send no-sha256 +run_test test_send_tags no-sha256 +run_test test_send_tag_of_deleted_branch no-sha256 +run_test test_send_new_branch no-sha256 +run_test test_send_all_branches no-sha256 +run_test test_send_to_empty_repo no-sha256 +run_test test_send_and_fetch_config no-sha256 +run_test test_send_config no-sha256 +run_test test_send_gitconfig no-sha256 +run_test test_send_rejected no-sha256 +run_test test_send_basic_http no-sha256 blob - 58ab6c1816b37910ac753cdd7a7af8703b5d2981 blob + 1b2025992be4d03420f106db1af5777b5bb84907 --- regress/cmdline/tree.sh +++ regress/cmdline/tree.sh @@ -271,6 +271,6 @@ test_tree_commit_keywords() { test_parseargs "$@" run_test test_tree_basic run_test test_tree_branch -run_test test_tree_submodule sha256-ok -run_test test_tree_submodule_of_same_repo sha256-ok +run_test test_tree_submodule +run_test test_tree_submodule_of_same_repo run_test test_tree_commit_keywords