Skip to content

Commit ea88f7c

Browse files
committed
test: ignore doctest-xcompile related tests
The doctest-xcompile flags have changed, though we don't want to bother beta toolchain for that. See #15455
1 parent 3537bde commit ea88f7c

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

tests/testsuite/build_script.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5513,6 +5513,7 @@ fn test_with_dep_metadata() {
55135513
p.cargo("test --lib").run();
55145514
}
55155515

5516+
#[ignore = "1-86 beta betaport"]
55165517
#[cargo_test]
55175518
fn duplicate_script_with_extra_env() {
55185519
// Test where a build script is run twice, that emits different rustc-env

tests/testsuite/cross_compile.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,8 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
12181218
.run();
12191219
}
12201220

1221-
#[cargo_test(nightly, reason = "-Zdoctest-xcompile is unstable")]
1221+
#[ignore = "1-86 beta betaport"]
1222+
#[cargo_test]
12221223
fn doctest_xcompile_linker() {
12231224
if cross_compile::disabled() {
12241225
return;

tests/testsuite/custom_target.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ const SIMPLE_SPEC: &str = r#"
3636
}
3737
"#;
3838

39-
#[cargo_test(nightly, reason = "requires features no_core, lang_items")]
39+
#[ignore = "1-86 beta betaport"]
40+
#[cargo_test]
4041
fn custom_target_minimal() {
4142
let p = project()
4243
.file(

tests/testsuite/standard_lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,8 @@ fn check_std() {
646646
.run();
647647
}
648648

649-
#[cargo_test(build_std_mock)]
649+
#[ignore = "1-86 beta betaport"]
650+
#[cargo_test]
650651
fn doctest() {
651652
let setup = setup();
652653

tests/testsuite/test.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4740,9 +4740,8 @@ fn test_dep_with_dev() {
47404740
.run();
47414741
}
47424742

4743-
// #[cargo_test(nightly, reason = "-Zdoctest-xcompile is unstable")]
4743+
#[ignore = "1-86 beta betaport"]
47444744
#[cargo_test]
4745-
#[ignore = "waiting for https://github.com/rust-lang/rust/pull/138877"]
47464745
fn cargo_test_doctest_xcompile_ignores() {
47474746
// -Zdoctest-xcompile also enables --enable-per-target-ignores which
47484747
// allows the ignore-TARGET syntax.
@@ -4844,7 +4843,8 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fini
48444843
.run();
48454844
}
48464845

4847-
#[cargo_test(nightly, reason = "-Zdoctest-xcompile is unstable")]
4846+
#[ignore = "1-86 beta betaport"]
4847+
#[cargo_test]
48484848
fn cargo_test_doctest_xcompile_runner() {
48494849
if !cross_compile::can_run_on_host() {
48504850
return;
@@ -4931,7 +4931,8 @@ this is a runner
49314931
.run();
49324932
}
49334933

4934-
#[cargo_test(nightly, reason = "-Zdoctest-xcompile is unstable")]
4934+
#[ignore = "1-86 beta betaport"]
4935+
#[cargo_test]
49354936
fn cargo_test_doctest_xcompile_no_runner() {
49364937
if !cross_compile::can_run_on_host() {
49374938
return;

0 commit comments

Comments
 (0)