Update, fix, and tweak some tests

Author: alexcrichton

src/capture.rs

@@ -129,7 +129,7 @@ impl Backtrace {
     /// and the last frame is likely something about how this thread or the main
     /// function started.
     pub fn frames(&self) -> &[BacktraceFrame] {
-        &self.frames
+        &self.frames[self.actual_start_index..]
     }
 
     /// If this backtrace was created from `new_unresolved` then this function

tests/skip_inner_frames.rs

@@ -4,17 +4,6 @@ use backtrace::Backtrace;
 
 const FRAME_RANGE: usize = 128; // should be close enough not to give false positives
 
-// FIXME: on Windows 32-bit ('i686-pc-windows-msvc') backtraces contain some spurious calls 
-// which are not in the code (for instance calls to RtlFindCharInUnicodeString), however generated 
-// backtraces are consistent between runs (so probably this is not an issue with synchronization?).
-// Until resolved those test are ignored and `Backtrace::ext_index()` always returns None.
-#[test]
-#[cfg_attr(not(all(target_os = "windows", target_arch = "x86")), ignore)]
-fn ext_index_must_be_0_on_win32() {
-    let b = Backtrace::new();
-    assert_eq!(b.ext_index(), 0);
-}
-
 #[test]
 #[cfg_attr(any(not(any(feature = "libunwind", feature = "unix-backtrace", feature = "dbghelp")), all(target_os = "windows", target_arch = "x86")), ignore)]
 fn backtrace_new_unresolved_should_start_with_call_site_trace() {
@@ -24,10 +13,9 @@ fn backtrace_new_unresolved_should_start_with_call_site_trace() {
 	println!("{:#?}", b);
 
     assert!(!b.frames().is_empty());
-    assert!(b.ext_index() > 0);
 
     let this_ip = backtrace_new_unresolved_should_start_with_call_site_trace as usize;
-    let frame_ip = b.ext_frames().first().unwrap().ip() as usize;
+    let frame_ip = b.frames().first().unwrap().ip() as usize;
 
     assert!(frame_ip >= this_ip);
     assert!(frame_ip <= this_ip + FRAME_RANGE);
@@ -40,11 +28,10 @@ fn backtrace_new_should_start_with_call_site_trace() {
     println!("{:?}", b);
 
     assert!(!b.frames().is_empty());
-    assert!(b.ext_index() > 0);
 
     let this_ip = backtrace_new_should_start_with_call_site_trace as usize;
-    let frame_ip = b.ext_frames().first().unwrap().ip() as usize;
+    let frame_ip = b.frames().first().unwrap().ip() as usize;
 
     assert!(frame_ip >= this_ip);
     assert!(frame_ip <= this_ip + FRAME_RANGE);
-}
+}

tests/smoke.rs

@@ -64,6 +64,7 @@ fn smoke_test_frames() {
                     expected_file: &str,
                     expected_line: u32) {
         if offset > idx { return }
+        println!("frame: {}", idx);
         let (ip, sym) = syms[idx - offset];
         let ip = ip as usize;
         let sym = sym as usize;
@@ -72,8 +73,9 @@ fn smoke_test_frames() {
 
         // windows dbghelp is *quite* liberal (and wrong) in many of its reports
         // right now...
-        if !DBGHELP && cfg!(debug) {
-            // this assertion fails for release build.
+        //
+        // This assertion can also fail for release builds, so skip it there
+        if !DBGHELP && cfg!(debug_assertions) {
             assert!(sym - actual_fn_pointer < 1024);
         }
 
@@ -90,6 +92,7 @@ fn smoke_test_frames() {
             addr = sym.addr();
             line = sym.lineno();
             file = sym.filename().map(|v| v.to_path_buf());
+            println!("  sym: {:?}", name);
         });
 
         // dbghelp doesn't always resolve symbols right now
@@ -105,8 +108,13 @@ fn smoke_test_frames() {
            !(DBGHELP && !MSVC)
         {
             let name = name.expect("didn't find a name");
-            assert!(name.contains(expected_name),
-                    "didn't find `{}` in `{}`", expected_name, name);
+
+            // in release mode names get weird as functions can get merged
+            // together with `mergefunc`, so only assert this in debug mode
+            if cfg!(debug_assertions) {
+                assert!(name.contains(expected_name),
+                        "didn't find `{}` in `{}`", expected_name, name);
+            }
         }
 
         if can_resolve {