Skip to content

Commit 4b05cf1

Browse files
committed
Ignore cross-compilation in some fulldeps tests.
These tests fail, in general, for cross-compilation, because they require the rustc crates to exist for the target, and they don't. We can't compile them for the target unless we also compile LLVM for the target (we don't). Android is a subset of cross-compilation. The other fulldeps tests, on the other hand, work fine for cross-compilation, and in fact, are verifying that rustc correctly searches for a host plugin crate, not a target plugin crate.
1 parent 8aa8018 commit 4b05cf1

10 files changed

+9
-9
lines changed

src/test/compile-fail-fulldeps/macro-crate-rlib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
// aux-build:rlib_crate_test.rs
1212
// ignore-stage1
1313
// ignore-tidy-linelength
14-
// ignore-android
1514
// ignore-cross-compile gives a different error message
1615

1716
#![feature(plugin)]

src/test/run-pass-fulldeps/compiler-calls.rs

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

1111
// Test that the CompilerCalls interface to the compiler works.
1212

13-
// ignore-android
13+
// ignore-cross-compile
1414

1515
#![feature(rustc_private, path)]
1616
#![feature(core)]

src/test/run-pass-fulldeps/create-dir-all-bare.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-android
11+
// ignore-cross-compile
1212

1313
#![feature(rustc_private)]
1414

src/test/run-pass-fulldeps/issue-15149.rs

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

1111
// no-prefer-dynamic
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
#![feature(rustc_private)]
1515

src/test/run-pass-fulldeps/issue-16992.rs

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

1111
// ignore-pretty
12-
// ignore-android
12+
// ignore-cross-compile
1313

1414
#![feature(quote, rustc_private)]
1515

src/test/run-pass-fulldeps/issue-18763-quote-token-tree.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-android
11+
// ignore-cross-compile
1212
// ignore-pretty: does not work well with `--test`
1313

1414
#![feature(quote, rustc_private)]

src/test/run-pass-fulldeps/qquote.rs

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-cross-compile
1112
// ignore-pretty
1213
// ignore-test
1314

src/test/run-pass-fulldeps/quote-tokens.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-android
11+
// ignore-cross-compile
1212
// ignore-pretty: does not work well with `--test`
1313

1414
#![feature(quote, rustc_private)]

src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// ignore-android
11+
// ignore-cross-compile
1212
// ignore-pretty: does not work well with `--test`
1313

1414
#![feature(quote, rustc_private)]

src/test/run-pass-fulldeps/rename-directory.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// This test can't be a unit test in std,
1212
// because it needs TempDir, which is in extra
1313

14-
// ignore-android
14+
// ignore-cross-compile
1515

1616
#![feature(rustc_private, path_ext)]
1717

0 commit comments

Comments
 (0)