summaryrefslogtreecommitdiffstats
path: root/debian/patches/c-2002_disable-net-tests.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 02:49:47 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-18 02:49:47 +0000
commit9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1 (patch)
tree3f4102a262698a69127c4c527a3efe30a13ac7df /debian/patches/c-2002_disable-net-tests.patch
parentMerging upstream version 1.71.1+dfsg1. (diff)
downloadrustc-9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1.tar.xz
rustc-9a1b5b5113f0fe12f83b7cedc2353ad41cc837b1.zip
Adding debian version 1.71.1+dfsg1-1.debian/1.71.1+dfsg1-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/c-2002_disable-net-tests.patch')
-rw-r--r--debian/patches/c-2002_disable-net-tests.patch104
1 files changed, 52 insertions, 52 deletions
diff --git a/debian/patches/c-2002_disable-net-tests.patch b/debian/patches/c-2002_disable-net-tests.patch
index 2e99a9e9a..3f8926877 100644
--- a/debian/patches/c-2002_disable-net-tests.patch
+++ b/debian/patches/c-2002_disable-net-tests.patch
@@ -51,7 +51,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
===================================================================
--- rust.orig/src/tools/cargo/tests/testsuite/publish.rs
+++ rust/src/tools/cargo/tests/testsuite/publish.rs
-@@ -85,7 +85,7 @@ fn validate_upload_li() {
+@@ -88,7 +88,7 @@ fn validate_upload_li() {
);
}
@@ -60,7 +60,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -127,7 +127,7 @@ You may press ctrl-c to skip waiting; th
+@@ -130,7 +130,7 @@ You may press ctrl-c to skip waiting; th
// Check that the `token` key works at the root instead of under a
// `[registry]` table.
@@ -69,7 +69,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple_publish_with_http() {
let _reg = registry::RegistryBuilder::new()
.http_api()
-@@ -167,7 +167,7 @@ You may press ctrl-c to skip waiting; th
+@@ -170,7 +170,7 @@ You may press ctrl-c to skip waiting; th
.run();
}
@@ -78,7 +78,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple_publish_with_asymmetric() {
let _reg = registry::RegistryBuilder::new()
.http_api()
-@@ -210,7 +210,7 @@ You may press ctrl-c to skip waiting; th
+@@ -213,7 +213,7 @@ You may press ctrl-c to skip waiting; th
.run();
}
@@ -87,7 +87,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn old_token_location() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -267,7 +267,7 @@ You may press ctrl-c [..]
+@@ -270,7 +270,7 @@ You may press ctrl-c [..]
// Other tests will verify the endpoint gets the right payload.
}
@@ -96,7 +96,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple_with_index() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -312,7 +312,7 @@ You may press ctrl-c [..]
+@@ -315,7 +315,7 @@ You may press ctrl-c [..]
// Other tests will verify the endpoint gets the right payload.
}
@@ -105,7 +105,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn git_deps() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -350,7 +350,7 @@ the `git` specification will be removed
+@@ -353,7 +353,7 @@ the `git` specification will be removed
.run();
}
@@ -114,7 +114,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn path_dependency_no_version() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -390,7 +390,7 @@ the `path` specification will be removed
+@@ -393,7 +393,7 @@ the `path` specification will be removed
.run();
}
@@ -123,7 +123,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn unpublishable_crate() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -423,7 +423,7 @@ fn unpublishable_crate() {
+@@ -426,7 +426,7 @@ fn unpublishable_crate() {
.run();
}
@@ -132,7 +132,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn dont_publish_dirty() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -465,7 +465,7 @@ to proceed despite this and include the
+@@ -468,7 +468,7 @@ to proceed despite this and include the
.run();
}
@@ -141,7 +141,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_clean() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -513,7 +513,7 @@ You may press ctrl-c to skip waiting; th
+@@ -516,7 +516,7 @@ You may press ctrl-c to skip waiting; th
// Other tests will verify the endpoint gets the right payload.
}
@@ -150,7 +150,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_in_sub_repo() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -562,7 +562,7 @@ You may press ctrl-c [..]
+@@ -565,7 +565,7 @@ You may press ctrl-c [..]
// Other tests will verify the endpoint gets the right payload.
}
@@ -159,7 +159,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_when_ignored() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -611,7 +611,7 @@ You may press ctrl-c [..]
+@@ -614,7 +614,7 @@ You may press ctrl-c [..]
// Other tests will verify the endpoint gets the right payload.
}
@@ -168,7 +168,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn ignore_when_crate_ignored() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -659,7 +659,7 @@ You may press ctrl-c [..]
+@@ -662,7 +662,7 @@ You may press ctrl-c [..]
// Other tests will verify the endpoint gets the right payload.
}
@@ -177,7 +177,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn new_crate_rejected() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -692,7 +692,7 @@ fn new_crate_rejected() {
+@@ -695,7 +695,7 @@ fn new_crate_rejected() {
.run();
}
@@ -186,7 +186,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn dry_run() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -735,7 +735,7 @@ See [..]
+@@ -738,7 +738,7 @@ See [..]
assert!(!registry::api_path().join("api/v1/crates/new").exists());
}
@@ -195,7 +195,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn registry_not_in_publish_list() {
let p = project()
.file(
-@@ -768,7 +768,7 @@ The registry `alternative` is not listed
+@@ -771,7 +771,7 @@ The registry `alternative` is not listed
.run();
}
@@ -204,7 +204,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_empty_list() {
let p = project()
.file(
-@@ -797,7 +797,7 @@ fn publish_empty_list() {
+@@ -800,7 +800,7 @@ fn publish_empty_list() {
.run();
}
@@ -213,7 +213,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_allowed_registry() {
let _registry = RegistryBuilder::new()
.http_api()
-@@ -857,7 +857,7 @@ You may press ctrl-c [..]
+@@ -860,7 +860,7 @@ You may press ctrl-c [..]
);
}
@@ -222,7 +222,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_implicitly_to_only_allowed_registry() {
let _registry = RegistryBuilder::new()
.http_api()
-@@ -918,7 +918,7 @@ You may press ctrl-c [..]
+@@ -921,7 +921,7 @@ You may press ctrl-c [..]
);
}
@@ -231,7 +231,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_fail_with_no_registry_specified() {
let p = project().build();
-@@ -952,7 +952,7 @@ The registry `crates-io` is not listed i
+@@ -955,7 +955,7 @@ The registry `crates-io` is not listed i
.run();
}
@@ -240,7 +240,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn block_publish_no_registry() {
let p = project()
.file(
-@@ -982,7 +982,7 @@ fn block_publish_no_registry() {
+@@ -985,7 +985,7 @@ fn block_publish_no_registry() {
}
// Explicitly setting `crates-io` in the publish list.
@@ -249,7 +249,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_crates_io_explicit() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -1035,7 +1035,7 @@ You may press ctrl-c [..]
+@@ -1038,7 +1038,7 @@ You may press ctrl-c [..]
.run();
}
@@ -258,7 +258,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_select_features() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -1086,7 +1086,7 @@ You may press ctrl-c [..]
+@@ -1089,7 +1089,7 @@ You may press ctrl-c [..]
.run();
}
@@ -267,7 +267,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_all_features() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -1137,7 +1137,7 @@ You may press ctrl-c [..]
+@@ -1140,7 +1140,7 @@ You may press ctrl-c [..]
.run();
}
@@ -276,7 +276,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_no_default_features() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -1173,7 +1173,7 @@ fn publish_with_no_default_features() {
+@@ -1176,7 +1176,7 @@ fn publish_with_no_default_features() {
.run();
}
@@ -285,7 +285,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_patch() {
let registry = RegistryBuilder::new().http_api().http_index().build();
Package::new("bar", "1.0.0").publish();
-@@ -1278,7 +1278,7 @@ You may press ctrl-c [..]
+@@ -1282,7 +1282,7 @@ You may press ctrl-c [..]
);
}
@@ -294,7 +294,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_checks_for_token_before_verify() {
let registry = registry::RegistryBuilder::new()
.no_configure_token()
-@@ -1327,7 +1327,7 @@ fn publish_checks_for_token_before_verif
+@@ -1331,7 +1331,7 @@ fn publish_checks_for_token_before_verif
.run();
}
@@ -303,7 +303,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_bad_source() {
let p = project()
.file(
-@@ -1376,7 +1376,7 @@ include `--registry crates-io` to use cr
+@@ -1380,7 +1380,7 @@ include `--registry crates-io` to use cr
}
// A dependency with both `git` and `version`.
@@ -312,7 +312,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_git_with_version() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -1519,7 +1519,7 @@ You may press ctrl-c [..]
+@@ -1524,7 +1524,7 @@ You may press ctrl-c [..]
);
}
@@ -321,7 +321,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_dev_dep_no_version() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -1608,7 +1608,7 @@ repository = "foo"
+@@ -1614,7 +1614,7 @@ repository = "foo"
);
}
@@ -330,7 +330,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn credentials_ambiguous_filename() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -1664,7 +1664,7 @@ You may press ctrl-c [..]
+@@ -1670,7 +1670,7 @@ You may press ctrl-c [..]
// --index will not load registry.token to avoid possibly leaking
// crates.io token to another server.
@@ -339,7 +339,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn index_requires_token() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -1699,7 +1699,7 @@ fn index_requires_token() {
+@@ -1705,7 +1705,7 @@ fn index_requires_token() {
}
// publish with source replacement without --registry
@@ -348,7 +348,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn cratesio_source_replacement() {
registry::init();
let p = project()
-@@ -1728,7 +1728,7 @@ include `--registry dummy-registry` or `
+@@ -1734,7 +1734,7 @@ include `--registry dummy-registry` or `
.run();
}
@@ -357,7 +357,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_missing_readme() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -1773,7 +1773,7 @@ Caused by:
+@@ -1782,7 +1782,7 @@ Caused by:
}
// Registry returns an API error.
@@ -366,7 +366,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn api_error_json() {
let _registry = registry::RegistryBuilder::new()
.alternative()
-@@ -1821,7 +1821,7 @@ Caused by:
+@@ -1830,7 +1830,7 @@ Caused by:
}
// Registry returns an API error with a 200 status code.
@@ -375,7 +375,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn api_error_200() {
let _registry = registry::RegistryBuilder::new()
.alternative()
-@@ -1869,7 +1869,7 @@ Caused by:
+@@ -1878,7 +1878,7 @@ Caused by:
}
// Registry returns an error code without a JSON message.
@@ -384,7 +384,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn api_error_code() {
let _registry = registry::RegistryBuilder::new()
.alternative()
-@@ -1923,7 +1923,7 @@ Caused by:
+@@ -1932,7 +1932,7 @@ Caused by:
}
// Registry has a network error.
@@ -393,7 +393,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn api_curl_error() {
let _registry = registry::RegistryBuilder::new()
.alternative()
-@@ -1973,7 +1973,7 @@ Caused by:
+@@ -1982,7 +1982,7 @@ Caused by:
}
// Registry returns an invalid response.
@@ -402,7 +402,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn api_other_error() {
let _registry = registry::RegistryBuilder::new()
.alternative()
-@@ -2023,7 +2023,7 @@ Caused by:
+@@ -2032,7 +2032,7 @@ Caused by:
.run();
}
@@ -411,7 +411,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_package_workspace() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -2074,7 +2074,7 @@ You may press ctrl-c [..]
+@@ -2084,7 +2084,7 @@ You may press ctrl-c [..]
validate_upload_li();
}
@@ -420,7 +420,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn with_duplicate_spec_in_members() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -2126,7 +2126,7 @@ fn with_duplicate_spec_in_members() {
+@@ -2136,7 +2136,7 @@ fn with_duplicate_spec_in_members() {
.run();
}
@@ -429,7 +429,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_package_workspace_with_members_with_features_old() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -2176,7 +2176,7 @@ You may press ctrl-c [..]
+@@ -2187,7 +2187,7 @@ You may press ctrl-c [..]
validate_upload_li();
}
@@ -438,7 +438,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_virtual_workspace() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -2212,7 +2212,7 @@ fn in_virtual_workspace() {
+@@ -2223,7 +2223,7 @@ fn in_virtual_workspace() {
.run();
}
@@ -447,7 +447,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_virtual_workspace_with_p() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -2269,7 +2269,7 @@ You may press ctrl-c [..]
+@@ -2281,7 +2281,7 @@ You may press ctrl-c [..]
.run();
}
@@ -456,7 +456,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_package_workspace_not_found() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -2314,7 +2314,7 @@ error: package ID specification `li` did
+@@ -2326,7 +2326,7 @@ error: package ID specification `li` did
.run();
}
@@ -465,7 +465,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_package_workspace_found_multiple() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -2371,7 +2371,7 @@ error: the `-p` argument must be specifi
+@@ -2383,7 +2383,7 @@ error: the `-p` argument must be specifi
.run();
}
@@ -474,7 +474,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
// https://github.com/rust-lang/cargo/issues/10536
fn publish_path_dependency_without_workspace() {
// Use local registry for faster test times since no publish will occur
-@@ -2418,7 +2418,7 @@ error: package ID specification `bar` di
+@@ -2430,7 +2430,7 @@ error: package ID specification `bar` di
.run();
}
@@ -483,7 +483,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn http_api_not_noop() {
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -2479,7 +2479,7 @@ You may press ctrl-c [..]
+@@ -2491,7 +2491,7 @@ You may press ctrl-c [..]
p.cargo("build").run();
}
@@ -492,7 +492,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn wait_for_first_publish() {
// Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
-@@ -2561,7 +2561,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2573,7 +2573,7 @@ You may press ctrl-c to skip waiting; th
/// A separate test is needed for package names with - or _ as they hit
/// the responder twice per cargo invocation. If that ever gets changed
/// this test will need to be changed accordingly.
@@ -501,7 +501,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn wait_for_first_publish_underscore() {
// Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
-@@ -2657,7 +2657,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2669,7 +2669,7 @@ You may press ctrl-c to skip waiting; th
p.cargo("build").with_status(0).run();
}
@@ -510,7 +510,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn wait_for_subsequent_publish() {
// Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
-@@ -2749,7 +2749,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2761,7 +2761,7 @@ You may press ctrl-c to skip waiting; th
p.cargo("check").with_status(0).run();
}