Navigation Menu

Skip to content

Commit

Permalink
test: Fix a test on MSVC
Browse files Browse the repository at this point in the history
Apparently MSVC now has namespaces in backtraces!
  • Loading branch information
alexcrichton authored and badboy committed Jul 29, 2016
1 parent f38762a commit 5243072
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions src/test/run-pass/backtrace.rs
Expand Up @@ -46,19 +46,7 @@ fn template(me: &str) -> Command {
}

fn expected(fn_name: &str) -> String {
// FIXME(#32481)
//
// On windows, we read the function name from debuginfo using some
// system APIs. For whatever reason, these APIs seem to use the
// "name" field, which is only the "relative" name, not the full
// name with namespace info, so we just see `foo` and not
// `backtrace::foo` as we see on linux (which uses the linkage
// name).
if cfg!(windows) && cfg!(target_env = "msvc") {
format!(" - {}", fn_name)
} else {
format!(" - backtrace::{}", fn_name)
}
format!(" - backtrace::{}", fn_name)
}

fn runtest(me: &str) {
Expand Down

0 comments on commit 5243072

Please sign in to comment.