Skip to content

Commit 377b267

Browse files
committed
---
yaml --- r: 210026 b: refs/heads/try c: 60f8f6b h: refs/heads/master v: v3
1 parent 59d1a93 commit 377b267

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 3e561f05c00cd180ec02db4ccab2840a4aba93d2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
5-
refs/heads/try: 7dd62155d85e9556c2b2b70c03acce9910896696
5+
refs/heads/try: 60f8f6bde9be62554a850c31c770357e7d3e576e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/compiletest/header.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
170170
format!("ignore-{}",
171171
config.stage_id.split('-').next().unwrap())
172172
}
173+
fn ignore_env(config: &Config) -> String {
174+
format!("ignore-{}", util::get_env(&config.target).unwrap_or("<unknown>"))
175+
}
173176
fn ignore_gdb(config: &Config, line: &str) -> bool {
174177
if config.mode != common::DebugInfoGdb {
175178
return false;
@@ -231,6 +234,7 @@ pub fn is_test_ignored(config: &Config, testfile: &Path) -> bool {
231234
!parse_name_directive(ln, &ignore_target(config)) &&
232235
!parse_name_directive(ln, &ignore_architecture(config)) &&
233236
!parse_name_directive(ln, &ignore_stage(config)) &&
237+
!parse_name_directive(ln, &ignore_env(config)) &&
234238
!(config.mode == common::Pretty && parse_name_directive(ln, "ignore-pretty")) &&
235239
!(config.target != config.host && parse_name_directive(ln, "ignore-cross-compile")) &&
236240
!ignore_gdb(config, ln) &&

branches/try/src/compiletest/util.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ pub fn get_arch(triple: &str) -> &'static str {
6060
panic!("Cannot determine Architecture from triple");
6161
}
6262

63+
pub fn get_env(triple: &str) -> Option<&str> {
64+
triple.split('-').nth(3)
65+
}
66+
6367
pub fn make_new_path(path: &str) -> String {
6468
assert!(cfg!(windows));
6569
// Windows just uses PATH as the library search path, so we have to

0 commit comments

Comments
 (0)