mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #24150 - wg:master, r=alexcrichton

Browse Source 
This fix allows the gdb debuginfo tests to pass on FreeBSD when using the newer 7.8 package.
This commit is contained in:
Manish Goregaokar 2015-04-08 01:19:38 +05:30
commit c4bd1c2bb2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiletest/runtest.rs
View File

@ -382,8 +382,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
// write debugger script // write debugger script
let mut script_str = String::with_capacity(2048); let mut script_str = String::with_capacity(2048);
let charset = if cfg!(target_os = "bitrig") { "auto" } else { "UTF-8" }; script_str.push_str(&format!("set charset {}\n", charset()));
script_str.push_str(&format!("set charset {}\n", charset));
script_str.push_str(&format!("file {}\n", exe_file.to_str().unwrap())); script_str.push_str(&format!("file {}\n", exe_file.to_str().unwrap()));
script_str.push_str("target remote :5039\n"); script_str.push_str("target remote :5039\n");
script_str.push_str(&format!("set solib-search-path \ script_str.push_str(&format!("set solib-search-path \
@ -517,8 +516,7 @@ fn sleep() {
.to_string(); .to_string();
// write debugger script // write debugger script
let mut script_str = String::with_capacity(2048); let mut script_str = String::with_capacity(2048);
let charset = if cfg!(target_os = "bitrig") { "auto" } else { "UTF-8" }; script_str.push_str(&format!("set charset {}\n", charset()));
script_str.push_str(&format!("set charset {}\n", charset));
script_str.push_str("show version\n"); script_str.push_str("show version\n");
match config.gdb_version { match config.gdb_version {
@ -1791,3 +1789,11 @@ fn run_codegen_test(config: &Config, props: &TestProps,
(base_lines as f64) / (clang_lines as f64), (base_lines as f64) / (clang_lines as f64),
0.001); 0.001);
} }
fn charset() -> &'static str {
if cfg!(any(target_os = "bitrig", target_os = "freebsd")) {
"auto"
} else {
"UTF-8"
}
}