diff options
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 7 | ||||
| -rw-r--r-- | src/tools/compiletest/src/util.rs | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 10b8133326b..b335fe3ae18 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -2217,9 +2217,7 @@ impl<'test> TestCx<'test> { fn charset() -> &'static str { // FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset - if cfg!(target_os = "bitrig") { - "auto" - } else if cfg!(target_os = "freebsd") { + if cfg!(target_os = "freebsd") { "ISO-8859-1" } else { "UTF-8" @@ -2670,8 +2668,7 @@ impl<'test> TestCx<'test> { create_dir_all(&tmpdir).unwrap(); let host = &self.config.host; - let make = if host.contains("bitrig") - || host.contains("dragonfly") + let make = if host.contains("dragonfly") || host.contains("freebsd") || host.contains("netbsd") || host.contains("openbsd") diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs index adc1224bcd3..8caf5ca00f5 100644 --- a/src/tools/compiletest/src/util.rs +++ b/src/tools/compiletest/src/util.rs @@ -9,7 +9,6 @@ use log::*; const OS_TABLE: &'static [(&'static str, &'static str)] = &[ ("android", "android"), ("androideabi", "android"), - ("bitrig", "bitrig"), ("cloudabi", "cloudabi"), ("cuda", "cuda"), ("darwin", "macos"), |