diff options
| author | bors <bors@rust-lang.org> | 2015-03-20 17:45:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-20 17:45:15 +0000 |
| commit | 3900c089a1305f06c6dbb15d07127b4e3a8f040c (patch) | |
| tree | f30cfb67ceaf403565f320ffc1008c104e749942 /src/compiletest/header.rs | |
| parent | ecdf792d1dda479d04781e5750737aa6cc574119 (diff) | |
| parent | 0ed265e63b130a52255031f593786bebdbc7f28d (diff) | |
| download | rust-3900c089a1305f06c6dbb15d07127b4e3a8f040c.tar.gz rust-3900c089a1305f06c6dbb15d07127b4e3a8f040c.zip | |
Auto merge of #23471 - sae-bom:aarch64-linux-android, r=alexcrichton
Resolved #21773. (Aarch64 test has been broken again) r? @alexcrichton
Diffstat (limited to 'src/compiletest/header.rs')
| -rw-r--r-- | src/compiletest/header.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs index 6899fa13974..29123173f5b 100644 --- a/src/compiletest/header.rs +++ b/src/compiletest/header.rs @@ -163,6 +163,9 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool { fn ignore_target(config: &Config) -> String { format!("ignore-{}", util::get_os(&config.target)) } + fn ignore_architecture(config: &Config) -> String { + format!("ignore-{}", util::get_arch(&config.target)) + } fn ignore_stage(config: &Config) -> String { format!("ignore-{}", config.stage_id.split('-').next().unwrap()) @@ -226,6 +229,7 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool { let val = iter_header(testfile, &mut |ln| { !parse_name_directive(ln, "ignore-test") && !parse_name_directive(ln, &ignore_target(config)) && + !parse_name_directive(ln, &ignore_architecture(config)) && !parse_name_directive(ln, &ignore_stage(config)) && !(config.mode == common::Pretty && parse_name_directive(ln, "ignore-pretty")) && !(config.target != config.host && parse_name_directive(ln, "ignore-cross-compile")) && |