gnu: rust: Enable more tests.

* gnu/packages/rust.scm (rust)[arguments]: Remove
'disable-tests-requiring-mercurial, 'disable-tests-requiring-crates.io
phases.  Adjust 'disable-tests-requiring-git,
'disable-tests-using-cargo-publish to skip fewer tests.
[native-inputs]: Add git-minimal/pinned.

Change-Id: Ide7510f2bc9b6a1d2e433b96673964723cc8d8be

1 files changed, 3 insertions, 62 deletions

diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm
index 7e537a32459..1f2aba2a84c 100644
--- a/gnu/packages/rust.scm
+++ b/gnu/packages/rust.scm
@@ -56,6 +56,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages web)
   #:use-module (gnu packages)
   #:use-module (guix build-system cargo)
@@ -1661,63 +1662,15 @@ ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc"))
                     ""))))
              (add-after 'unpack 'disable-tests-requiring-git
                (lambda _
-                 (substitute* "src/tools/cargo/tests/testsuite/git.rs"
-                   ,@(make-ignore-test-list
-                      '("fn fetch_downloads_with_git2_first_"
-                        "fn corrupted_checkout_with_cli")))
-                 (substitute* "src/tools/cargo/tests/testsuite/build.rs"
-                   ,@(make-ignore-test-list
-                      '("fn build_with_symlink_to_path_dependency_with_build_script_in_git")))
                  (substitute* "src/tools/cargo/tests/testsuite/publish_lockfile.rs"
                    ,@(make-ignore-test-list
                       '("fn note_resolve_changes")))))
-             (add-after 'unpack 'disable-tests-requiring-mercurial
-               (lambda _
-                 (with-directory-excursion "src/tools/cargo/tests/testsuite/cargo_init"
-                   (substitute* '("mercurial_autodetect/mod.rs"
-                                  "simple_hg_ignore_exists/mod.rs")
-                     ,@(make-ignore-test-list
-                        '("fn case"))))))
              (add-after 'unpack 'disable-tests-using-cargo-publish
                (lambda _
                  (with-directory-excursion "src/tools/cargo/tests/testsuite"
-                   (substitute* "alt_registry.rs"
-                     ,@(make-ignore-test-list
-                        '("fn warn_for_unused_fields")))
-                   (substitute* '("cargo_add/locked_unchanged/mod.rs"
-                                  "cargo_add/lockfile_updated/mod.rs"
-                                  "cargo_remove/update_lock_file/mod.rs")
-                     ,@(make-ignore-test-list
-                        '("fn case")))
-                   (substitute* "git_shallow.rs"
-                     ,@(make-ignore-test-list
-                        '("fn gitoxide_clones_registry_with_shallow_protocol_and_aborts_and_updates_again"
-                          "fn gitoxide_clones_registry_with_shallow_protocol_and_follow_up_fetch_maintains_shallowness"
-                          "fn gitoxide_clones_registry_with_shallow_protocol_and_follow_up_with_git2_fetch"
-                          "fn gitoxide_clones_registry_without_shallow_protocol_and_follow_up_fetch_uses_shallowness"
-                          "fn gitoxide_clones_shallow_two_revs_same_deps"
-                          "fn gitoxide_fetch_complete_index_then_shallow"
-                          "fn gitoxide_fetch_shallow_dep_branch_and_rev"
-                          "fn gitoxide_fetch_shallow_dep_branch_to_rev"
-                          "fn gitoxide_fetch_shallow_dep_then_git2_fetch_complete"
-                          "fn gitoxide_fetch_shallow_dep_then_gitoxide_fetch_complete"
-                          "fn gitoxide_fetch_shallow_dep_two_revs"
-                          "fn gitoxide_fetch_shallow_index_then_abort_and_update"
-                          "fn gitoxide_fetch_shallow_index_then_git2_fetch_complete"
-                          "fn gitoxide_fetch_shallow_index_then_preserve_shallow"
-                          "fn gitoxide_git_dependencies_switch_from_branch_to_rev"
-                          "fn gitoxide_shallow_clone_followed_by_non_shallow_update"
-                          "fn shallow_deps_work_with_revisions_and_branches_mixed_on_same_dependency"
-                          "fn gitoxide_clones_git_dependency_with_shallow_protocol_and_git2_is_used_for_followup_fetches")))
                    (substitute* "install.rs"
                      ,@(make-ignore-test-list
-                        '("fn failed_install_retains_temp_directory")))
-                   (substitute* "offline.rs"
-                     ,@(make-ignore-test-list
-                        '("fn gitoxide_cargo_compile_offline_with_cached_git_dep_shallow_dep")))
-                   (substitute* "patch.rs"
-                     ,@(make-ignore-test-list
-                        '("fn gitoxide_clones_shallow_old_git_patch"))))))
+                        '("fn failed_install_retains_temp_directory"))))))
              ,@(if (target-riscv64?)
                    ;; Keep this phase separate so it can be adjusted without needing
                    ;; to adjust the skipped tests on other architectures.
@@ -1774,19 +1727,6 @@ ge13ca993e8ccb9ba9847cc330696e02839f328f7/jemalloc"))
                              ,@(make-ignore-test-list
                                 '("fn test_missing_tests")))))))
                    `())
-             (add-after 'unpack 'disable-tests-requiring-crates.io
-               (lambda _
-                 (with-directory-excursion "src/tools/cargo/tests/testsuite"
-                   (substitute* "install.rs"
-                     ,@(make-ignore-test-list
-                        '("fn install_global_cargo_config")))
-                   (substitute* '("cargo_add/normalize_name_path_existing/mod.rs"
-                                  "cargo_info/within_ws_with_alternative_registry/mod.rs")
-                     ,@(make-ignore-test-list
-                        '("fn case")))
-                   (substitute* "package.rs"
-                     ,@(make-ignore-test-list
-                        '("fn workspace_with_local_deps_index_mismatch"))))))
              (add-after 'unpack 'disable-miscellaneous-broken-tests
                (lambda _
                  (substitute* "src/tools/cargo/tests/testsuite/check_cfg.rs"
@@ -2010,6 +1950,7 @@ exec -a \"$0\" \"~a\" \"$@\""
                       `("clang-source" ,(package-source clang-runtime-21))
                       ;; Add test inputs.
                       `("gdb" ,gdb/pinned)
+                      `("git-minimal" ,git-minimal/pinned)
                       `("procps" ,procps)
                       (package-native-inputs base-rust)))
       (native-search-paths