diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-30 03:57:31 +0000 |
commit | dc0db358abe19481e475e10c32149b53370f1a1c (patch) | |
tree | ab8ce99c4b255ce46f99ef402c27916055b899ee /src/tools/cargo/tests/testsuite/cargo_add/mod.rs | |
parent | Releasing progress-linux version 1.71.1+dfsg1-2~progress7.99u1. (diff) | |
download | rustc-dc0db358abe19481e475e10c32149b53370f1a1c.tar.xz rustc-dc0db358abe19481e475e10c32149b53370f1a1c.zip |
Merging upstream version 1.72.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/tools/cargo/tests/testsuite/cargo_add/mod.rs')
-rw-r--r-- | src/tools/cargo/tests/testsuite/cargo_add/mod.rs | 95 |
1 files changed, 2 insertions, 93 deletions
diff --git a/src/tools/cargo/tests/testsuite/cargo_add/mod.rs b/src/tools/cargo/tests/testsuite/cargo_add/mod.rs index cd7e94e09..be7a1546b 100644 --- a/src/tools/cargo/tests/testsuite/cargo_add/mod.rs +++ b/src/tools/cargo/tests/testsuite/cargo_add/mod.rs @@ -1,6 +1,7 @@ mod add_basic; mod add_multiple; mod add_normalized_name_external; +mod add_toolchain; mod build; mod build_prefer_existing_version; mod change_rename_target; @@ -36,7 +37,6 @@ mod git_rev; mod git_tag; mod infer_prerelease; mod invalid_arg; -mod invalid_git_external; mod invalid_git_name; mod invalid_key_inherit_dependency; mod invalid_key_overwrite_inherit_dependency; @@ -96,6 +96,7 @@ mod path_dev; mod path_inferred_name; mod path_inferred_name_conflicts_full_feature; mod path_normalized_name; +mod preserve_features_table; mod preserve_sorted; mod preserve_unsorted; mod quiet; @@ -114,95 +115,3 @@ mod vers; mod workspace_name; mod workspace_path; mod workspace_path_dev; - -fn init_registry() { - cargo_test_support::registry::init(); - add_registry_packages(false); -} - -fn init_alt_registry() { - cargo_test_support::registry::alt_init(); - add_registry_packages(true); -} - -fn add_registry_packages(alt: bool) { - for name in [ - "my-package", - "my-package1", - "my-package2", - "my-dev-package1", - "my-dev-package2", - "my-build-package1", - "my-build-package2", - "toml", - "versioned-package", - "cargo-list-test-fixture-dependency", - "unrelateed-crate", - ] { - cargo_test_support::registry::Package::new(name, "0.1.1+my-package") - .alternative(alt) - .publish(); - cargo_test_support::registry::Package::new(name, "0.2.0+my-package") - .alternative(alt) - .publish(); - cargo_test_support::registry::Package::new(name, "0.2.3+my-package") - .alternative(alt) - .publish(); - cargo_test_support::registry::Package::new(name, "0.4.1+my-package") - .alternative(alt) - .publish(); - cargo_test_support::registry::Package::new(name, "20.0.0+my-package") - .alternative(alt) - .publish(); - cargo_test_support::registry::Package::new(name, "99999.0.0+my-package") - .alternative(alt) - .publish(); - cargo_test_support::registry::Package::new(name, "99999.0.0-alpha.1+my-package") - .alternative(alt) - .publish(); - } - - cargo_test_support::registry::Package::new("prerelease_only", "0.2.0-alpha.1") - .alternative(alt) - .publish(); - cargo_test_support::registry::Package::new("test_breaking", "0.2.0") - .alternative(alt) - .publish(); - cargo_test_support::registry::Package::new("test_nonbreaking", "0.1.1") - .alternative(alt) - .publish(); - cargo_test_support::registry::Package::new("test_cyclic_features", "0.1.1") - .alternative(alt) - .feature("default", &["feature-one", "feature-two"]) - .feature("feature-one", &["feature-two"]) - .feature("feature-two", &["feature-one"]) - .publish(); - - // Normalization - cargo_test_support::registry::Package::new("linked-hash-map", "0.5.4") - .alternative(alt) - .feature("clippy", &[]) - .feature("heapsize", &[]) - .feature("heapsize_impl", &[]) - .feature("nightly", &[]) - .feature("serde", &[]) - .feature("serde_impl", &[]) - .feature("serde_test", &[]) - .publish(); - cargo_test_support::registry::Package::new("inflector", "0.11.4") - .alternative(alt) - .feature("default", &["heavyweight", "lazy_static", "regex"]) - .feature("heavyweight", &[]) - .feature("lazy_static", &[]) - .feature("regex", &[]) - .feature("unstable", &[]) - .publish(); - - cargo_test_support::registry::Package::new("your-face", "99999.0.0+my-package") - .alternative(alt) - .feature("nose", &[]) - .feature("mouth", &[]) - .feature("eyes", &[]) - .feature("ears", &[]) - .publish(); -} |