Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b523a6a6 authored by Christopher Ferris's avatar Christopher Ferris Committed by android-build-merger
Browse files

Merge "Small test clean up." 

am: 8ca50401

Change-Id: I177818b8d1598eb144f5ce76c3a508a71a68728c
parents fcb6c742 8ca50401

libunwindstack/Android.bp

+4 −4
Original line number Original line Diff line number Diff line
@@ -248,10 +248,10 @@ cc_test { 
        "tests/files/elf64.xz",

        "tests/files/elf64.xz",

        "tests/files/offline/bad_eh_frame_hdr_arm64/*",

        "tests/files/offline/bad_eh_frame_hdr_arm64/*",

        "tests/files/offline/debug_frame_first_x86/*",

        "tests/files/offline/debug_frame_first_x86/*",

        "tests/files/offline/jit_debug_arm32/*",

        "tests/files/offline/jit_debug_arm/*",

        "tests/files/offline/jit_debug_x86_32/*",

        "tests/files/offline/jit_debug_x86/*",

        "tests/files/offline/gnu_debugdata_arm32/*",

        "tests/files/offline/gnu_debugdata_arm/*",

        "tests/files/offline/straddle_arm32/*",

        "tests/files/offline/straddle_arm/*",

        "tests/files/offline/straddle_arm64/*",

        "tests/files/offline/straddle_arm64/*",

    ],

    ],

}

}

libunwindstack/tests/UnwindOfflineTest.cpp

+8 −8
Original line number Original line Diff line number Diff line
@@ -49,8 +49,8 @@ static std::string DumpFrames(Unwinder& unwinder) { 
  return str;

  return str;

}

}





TEST(UnwindOfflineTest, pc_straddle_arm32) {

TEST(UnwindOfflineTest, pc_straddle_arm) {

  std::string dir(TestGetFileDirectory() + "offline/straddle_arm32/");

  std::string dir(TestGetFileDirectory() + "offline/straddle_arm/");





  MemoryOffline* memory = new MemoryOffline;

  MemoryOffline* memory = new MemoryOffline;

  ASSERT_TRUE(memory->Init((dir + "stack.data").c_str(), 0));

  ASSERT_TRUE(memory->Init((dir + "stack.data").c_str(), 0));
@@ -99,8 +99,8 @@ TEST(UnwindOfflineTest, pc_straddle_arm32) { 
      frame_info);

      frame_info);

}

}





TEST(UnwindOfflineTest, pc_in_gnu_debugdata_arm32) {

TEST(UnwindOfflineTest, pc_in_gnu_debugdata_arm) {

  std::string dir(TestGetFileDirectory() + "offline/gnu_debugdata_arm32/");

  std::string dir(TestGetFileDirectory() + "offline/gnu_debugdata_arm/");





  MemoryOffline* memory = new MemoryOffline;

  MemoryOffline* memory = new MemoryOffline;

  ASSERT_TRUE(memory->Init((dir + "stack.data").c_str(), 0));

  ASSERT_TRUE(memory->Init((dir + "stack.data").c_str(), 0));
@@ -209,8 +209,8 @@ static void AddMemory(std::string file_name, MemoryOfflineParts* parts) { 
  parts->Add(memory);

  parts->Add(memory);

}

}





TEST(UnwindOfflineTest, jit_debug_x86_32) {

TEST(UnwindOfflineTest, jit_debug_x86) {

  std::string dir(TestGetFileDirectory() + "offline/jit_debug_x86_32/");

  std::string dir(TestGetFileDirectory() + "offline/jit_debug_x86/");





  MemoryOfflineParts* memory = new MemoryOfflineParts;

  MemoryOfflineParts* memory = new MemoryOfflineParts;

  AddMemory(dir + "descriptor.data", memory);

  AddMemory(dir + "descriptor.data", memory);
@@ -406,8 +406,8 @@ TEST(UnwindOfflineTest, jit_debug_x86_32) { 
      frame_info);

      frame_info);

}

}





TEST(UnwindOfflineTest, jit_debug_arm32) {

TEST(UnwindOfflineTest, jit_debug_arm) {

  std::string dir(TestGetFileDirectory() + "offline/jit_debug_arm32/");

  std::string dir(TestGetFileDirectory() + "offline/jit_debug_arm/");





  MemoryOfflineParts* memory = new MemoryOfflineParts;

  MemoryOfflineParts* memory = new MemoryOfflineParts;

  AddMemory(dir + "descriptor.data", memory);

  AddMemory(dir + "descriptor.data", memory);