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.

diff --git a/src/test/rustdoc/default-impl.rs b/src/test/rustdoc/default-impl.rs
index 92b243140021d26004cf22eda29972f79ec99cbd..6153a3966342c03aec62431869e2bb82343b379a 100644 (file)
--- a/src/test/rustdoc/default-impl.rs
+++ b/src/test/rustdoc/default-impl.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:rustdoc-default-impl.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate rustdoc_default_impl as foo;
 

diff --git a/src/test/rustdoc/extern-default-method.rs b/src/test/rustdoc/extern-default-method.rs
index 9178c1bcb9d76d56b65755ec191b8909669d5c41..10d2884ebae0771646f60cd5ef6605c71d89ee18 100644 (file)
--- a/src/test/rustdoc/extern-default-method.rs
+++ b/src/test/rustdoc/extern-default-method.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:rustdoc-extern-default-method.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate rustdoc_extern_default_method as ext;
 

diff --git a/src/test/rustdoc/extern-method.rs b/src/test/rustdoc/extern-method.rs
index 5e30e6c0c1c58a008651bd2414062f012ed5df17..c422871867d5d83ddf8eeb79909897bcd9a84ad7 100644 (file)
--- a/src/test/rustdoc/extern-method.rs
+++ b/src/test/rustdoc/extern-method.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:rustdoc-extern-method.rs
-// ignore-android
+// ignore-cross-compile
 
 #![feature(unboxed_closures)]
 

diff --git a/src/test/rustdoc/ffi.rs b/src/test/rustdoc/ffi.rs
index 717c64b3aa54667cf841c79af8c25310c24700cb..3997dcd81e153e75a20cb5a7fc2a5447e59ce788 100644 (file)
--- a/src/test/rustdoc/ffi.rs
+++ b/src/test/rustdoc/ffi.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:rustdoc-ffi.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate rustdoc_ffi as lib;
 

diff --git a/src/test/rustdoc/inline-default-methods.rs b/src/test/rustdoc/inline-default-methods.rs
index a613736ab4c500bed8e419a9253836fba51ca8d4..055af0160f54cdbd7def4aadd6d116d50bb5894b 100644 (file)
--- a/src/test/rustdoc/inline-default-methods.rs
+++ b/src/test/rustdoc/inline-default-methods.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:inline-default-methods.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate inline_default_methods;
 

diff --git a/src/test/rustdoc/issue-13698.rs b/src/test/rustdoc/issue-13698.rs
index 5c31c297724649f8cbb95b547e8635a62868c9e5..cf9b30a0fe9873a46f96eade6c92126fea358e79 100644 (file)
--- a/src/test/rustdoc/issue-13698.rs
+++ b/src/test/rustdoc/issue-13698.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-13698.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_13698;
 

diff --git a/src/test/rustdoc/issue-15318-2.rs b/src/test/rustdoc/issue-15318-2.rs
index 32898d652f8217fb112d6dce6b5acb4ae7b0e791..7999af46eebb6b5d88b85d80b828916edf3697ba 100644 (file)
--- a/src/test/rustdoc/issue-15318-2.rs
+++ b/src/test/rustdoc/issue-15318-2.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-15318.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_15318;
 

diff --git a/src/test/rustdoc/issue-15318.rs b/src/test/rustdoc/issue-15318.rs
index 3bcc8f45b0e88338009deb0e5e709a5e1628dd80..fd46b6e990962d37e81f6a53a012a03a2ee68f83 100644 (file)
--- a/src/test/rustdoc/issue-15318.rs
+++ b/src/test/rustdoc/issue-15318.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-15318.rs
-// ignore-android
+// ignore-cross-compile
 
 #![feature(no_std)]
 #![no_std]

diff --git a/src/test/rustdoc/issue-17476.rs b/src/test/rustdoc/issue-17476.rs
index 8d31a1c288eb8d097d53eb9916ffefe4b2b5e816..dcd3f2a2ba5b8e5afc44139338a28a4333d2f8b6 100644 (file)
--- a/src/test/rustdoc/issue-17476.rs
+++ b/src/test/rustdoc/issue-17476.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-17476.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_17476;
 

diff --git a/src/test/rustdoc/issue-19190-3.rs b/src/test/rustdoc/issue-19190-3.rs
index c315ea26d264291f3ec4a8641c1dc3797d2afc04..eec5c0253773720b42574accfed97994efb26cde 100644 (file)
--- a/src/test/rustdoc/issue-19190-3.rs
+++ b/src/test/rustdoc/issue-19190-3.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-19190-3.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_19190_3;
 

diff --git a/src/test/rustdoc/issue-20646.rs b/src/test/rustdoc/issue-20646.rs
index 77abe35948c3de259726a6f80e855f957b9ad984..87c40d11579747af3090c46240593c38ac0523e1 100644 (file)
--- a/src/test/rustdoc/issue-20646.rs
+++ b/src/test/rustdoc/issue-20646.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-20646.rs
-// ignore-android
+// ignore-cross-compile
 
 #![feature(associated_types)]
 

diff --git a/src/test/rustdoc/issue-20727-2.rs b/src/test/rustdoc/issue-20727-2.rs
index 03181bebdb05a187c08d43ee9290ae5deb59b2d6..1f29a9c97972c6986d24bc62781d1b1b6b863458 100644 (file)
--- a/src/test/rustdoc/issue-20727-2.rs
+++ b/src/test/rustdoc/issue-20727-2.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-20727.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_20727;
 

diff --git a/src/test/rustdoc/issue-20727-3.rs b/src/test/rustdoc/issue-20727-3.rs
index 9d05ce99c4d3034908cc52f71e576ff9a54b66d2..e4a9dd7e7f142b1c9217404374c7051bcc9b5ccb 100644 (file)
--- a/src/test/rustdoc/issue-20727-3.rs
+++ b/src/test/rustdoc/issue-20727-3.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-20727.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_20727;
 

diff --git a/src/test/rustdoc/issue-20727-4.rs b/src/test/rustdoc/issue-20727-4.rs
index 39db387f090003ebe6696b173b3d8a0d5d646264..9ebd1c448eeb0d4195479782b9e066531b043188 100644 (file)
--- a/src/test/rustdoc/issue-20727-4.rs
+++ b/src/test/rustdoc/issue-20727-4.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-20727.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_20727;
 

diff --git a/src/test/rustdoc/issue-20727.rs b/src/test/rustdoc/issue-20727.rs
index 3205f5bfa33715ff2d6bb5d6dbd8e67146c7d6cb..e38f06c4b317ac30d5bdc65d4d8f369c3dafc3ff 100644 (file)
--- a/src/test/rustdoc/issue-20727.rs
+++ b/src/test/rustdoc/issue-20727.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-20727.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_20727;
 

diff --git a/src/test/rustdoc/issue-21092.rs b/src/test/rustdoc/issue-21092.rs
index 38983aee93397de586152071a1ebba5c4799a768..745c6e2c6648da6822f4e6f6960e1b49e787cf69 100644 (file)
--- a/src/test/rustdoc/issue-21092.rs
+++ b/src/test/rustdoc/issue-21092.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-21092.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_21092;
 

diff --git a/src/test/rustdoc/issue-21801.rs b/src/test/rustdoc/issue-21801.rs
index a4392b84e5b12ab89e2a30b48a5f727000f2b729..4e2c77826b6c07d2fae90280d23f5139831753c2 100644 (file)
--- a/src/test/rustdoc/issue-21801.rs
+++ b/src/test/rustdoc/issue-21801.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-21801.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_21801;
 

diff --git a/src/test/rustdoc/issue-22025.rs b/src/test/rustdoc/issue-22025.rs
index d2eb4fb6ad845559e3f4b74c8ce497b4960d487d..c0e4e673f94d8d7178333714fc20d14cdc594ba7 100644 (file)
--- a/src/test/rustdoc/issue-22025.rs
+++ b/src/test/rustdoc/issue-22025.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // aux-build:issue-22025.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_22025;
 

diff --git a/src/test/rustdoc/issue-23207.rs b/src/test/rustdoc/issue-23207.rs
index 722046723be7c4e96d1461755cc5ffd31e402f39..4931d158ac3e4277a3b50b7fbc2f34ad25702032 100644 (file)
--- a/src/test/rustdoc/issue-23207.rs
+++ b/src/test/rustdoc/issue-23207.rs
@@ -10,7 +10,7 @@
 
 // aux-build:issue-23207-1.rs
 // aux-build:issue-23207-2.rs
-// ignore-android
+// ignore-cross-compile
 
 extern crate issue_23207_2;