From f7962d2dae4462a154c6d2f1b32c315f2a7ca4ab Mon Sep 17 00:00:00 2001 From: Ryan Prichard Date: Wed, 22 Apr 2015 15:20:57 -0700 Subject: [PATCH] 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. --- src/test/compile-fail-fulldeps/macro-crate-rlib.rs | 1 - src/test/run-pass-fulldeps/compiler-calls.rs | 2 +- src/test/run-pass-fulldeps/create-dir-all-bare.rs | 2 +- src/test/run-pass-fulldeps/issue-15149.rs | 2 +- src/test/run-pass-fulldeps/issue-16992.rs | 2 +- src/test/run-pass-fulldeps/issue-18763-quote-token-tree.rs | 2 +- src/test/run-pass-fulldeps/qquote.rs | 1 + src/test/run-pass-fulldeps/quote-tokens.rs | 2 +- src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs | 2 +- src/test/run-pass-fulldeps/rename-directory.rs | 2 +- 10 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/compile-fail-fulldeps/macro-crate-rlib.rs b/src/test/compile-fail-fulldeps/macro-crate-rlib.rs index 7a362994b8db..396b1c1de3aa 100644 --- a/src/test/compile-fail-fulldeps/macro-crate-rlib.rs +++ b/src/test/compile-fail-fulldeps/macro-crate-rlib.rs @@ -11,7 +11,6 @@ // aux-build:rlib_crate_test.rs // ignore-stage1 // ignore-tidy-linelength -// ignore-android // ignore-cross-compile gives a different error message #![feature(plugin)] diff --git a/src/test/run-pass-fulldeps/compiler-calls.rs b/src/test/run-pass-fulldeps/compiler-calls.rs index 4bacde0aadf3..1cf36dab395f 100644 --- a/src/test/run-pass-fulldeps/compiler-calls.rs +++ b/src/test/run-pass-fulldeps/compiler-calls.rs @@ -10,7 +10,7 @@ // Test that the CompilerCalls interface to the compiler works. -// ignore-android +// ignore-cross-compile #![feature(rustc_private, path)] #![feature(core)] diff --git a/src/test/run-pass-fulldeps/create-dir-all-bare.rs b/src/test/run-pass-fulldeps/create-dir-all-bare.rs index e4fb7c199094..e22736d77856 100644 --- a/src/test/run-pass-fulldeps/create-dir-all-bare.rs +++ b/src/test/run-pass-fulldeps/create-dir-all-bare.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android +// ignore-cross-compile #![feature(rustc_private)] diff --git a/src/test/run-pass-fulldeps/issue-15149.rs b/src/test/run-pass-fulldeps/issue-15149.rs index 7e64bbdf703b..ea7e959a73ce 100644 --- a/src/test/run-pass-fulldeps/issue-15149.rs +++ b/src/test/run-pass-fulldeps/issue-15149.rs @@ -9,7 +9,7 @@ // except according to those terms. // no-prefer-dynamic -// ignore-android +// ignore-cross-compile #![feature(rustc_private)] diff --git a/src/test/run-pass-fulldeps/issue-16992.rs b/src/test/run-pass-fulldeps/issue-16992.rs index 40947b2e2565..a439e2bb25b8 100644 --- a/src/test/run-pass-fulldeps/issue-16992.rs +++ b/src/test/run-pass-fulldeps/issue-16992.rs @@ -9,7 +9,7 @@ // except according to those terms. // ignore-pretty -// ignore-android +// ignore-cross-compile #![feature(quote, rustc_private)] diff --git a/src/test/run-pass-fulldeps/issue-18763-quote-token-tree.rs b/src/test/run-pass-fulldeps/issue-18763-quote-token-tree.rs index e1ef32b64d71..829fdb176bd3 100644 --- a/src/test/run-pass-fulldeps/issue-18763-quote-token-tree.rs +++ b/src/test/run-pass-fulldeps/issue-18763-quote-token-tree.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android +// ignore-cross-compile // ignore-pretty: does not work well with `--test` #![feature(quote, rustc_private)] diff --git a/src/test/run-pass-fulldeps/qquote.rs b/src/test/run-pass-fulldeps/qquote.rs index 7e11b9d9f278..710b3b07549f 100644 --- a/src/test/run-pass-fulldeps/qquote.rs +++ b/src/test/run-pass-fulldeps/qquote.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// ignore-cross-compile // ignore-pretty // ignore-test diff --git a/src/test/run-pass-fulldeps/quote-tokens.rs b/src/test/run-pass-fulldeps/quote-tokens.rs index 99e0333ee298..64061eb09324 100644 --- a/src/test/run-pass-fulldeps/quote-tokens.rs +++ b/src/test/run-pass-fulldeps/quote-tokens.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android +// ignore-cross-compile // ignore-pretty: does not work well with `--test` #![feature(quote, rustc_private)] diff --git a/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs b/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs index 928368fabdf3..e9de95b95e5f 100644 --- a/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs +++ b/src/test/run-pass-fulldeps/quote-unused-sp-no-warning.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// ignore-android +// ignore-cross-compile // ignore-pretty: does not work well with `--test` #![feature(quote, rustc_private)] diff --git a/src/test/run-pass-fulldeps/rename-directory.rs b/src/test/run-pass-fulldeps/rename-directory.rs index a0644e513a6e..2bec41f3ee04 100644 --- a/src/test/run-pass-fulldeps/rename-directory.rs +++ b/src/test/run-pass-fulldeps/rename-directory.rs @@ -11,7 +11,7 @@ // This test can't be a unit test in std, // because it needs TempDir, which is in extra -// ignore-android +// ignore-cross-compile #![feature(rustc_private, path_ext)]