Skip to content

Commit 528472e

Browse files
committed
Replace ignore-android with ignore-cross-compile in rustdoc tests
The problem is that rustdoc searches for external crates using the host triple, not the target triple. It's actually unclear to me whether this is correct behavior or not, but it is necessary to get cross-compiled tests working.
1 parent 4b05cf1 commit 528472e

19 files changed

+19
-19
lines changed

src/test/rustdoc/default-impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:rustdoc-default-impl.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate rustdoc_default_impl as foo;
1515

src/test/rustdoc/extern-default-method.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:rustdoc-extern-default-method.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate rustdoc_extern_default_method as ext;
1515

src/test/rustdoc/extern-method.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:rustdoc-extern-method.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
#![feature(unboxed_closures)]
1515

src/test/rustdoc/ffi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:rustdoc-ffi.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate rustdoc_ffi as lib;
1515

src/test/rustdoc/inline-default-methods.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:inline-default-methods.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate inline_default_methods;
1515

src/test/rustdoc/issue-13698.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-13698.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_13698;
1515

src/test/rustdoc/issue-15318-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-15318.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_15318;
1515

src/test/rustdoc/issue-15318.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-15318.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
#![feature(no_std)]
1515
#![no_std]

src/test/rustdoc/issue-17476.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-17476.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_17476;
1515

src/test/rustdoc/issue-19190-3.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-19190-3.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_19190_3;
1515

src/test/rustdoc/issue-20646.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-20646.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
#![feature(associated_types)]
1515

src/test/rustdoc/issue-20727-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-20727.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_20727;
1515

src/test/rustdoc/issue-20727-3.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-20727.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_20727;
1515

src/test/rustdoc/issue-20727-4.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-20727.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_20727;
1515

src/test/rustdoc/issue-20727.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-20727.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_20727;
1515

src/test/rustdoc/issue-21092.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-21092.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_21092;
1515

src/test/rustdoc/issue-21801.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-21801.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_21801;
1515

src/test/rustdoc/issue-22025.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
// aux-build:issue-22025.rs
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
extern crate issue_22025;
1515

src/test/rustdoc/issue-23207.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// aux-build:issue-23207-1.rs
1212
// aux-build:issue-23207-2.rs
13-
// ignore-android
13+
// ignore-cross-compile
1414

1515
extern crate issue_23207_2;
1616

0 commit comments

Comments
 (0)