This revision was automatically updated to reflect the committed changes. Closed by commit rGfac5d05eb75f: [lldb] Fix and enable Windows minidump tests (authored by jarin).
Changed prior to commit: https://reviews.llvm.org/D81465?vs=269609&id=269649#toc Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D81465/new/ https://reviews.llvm.org/D81465 Files: lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py Index: lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py =================================================================== --- lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py +++ lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py @@ -19,9 +19,14 @@ NO_DEBUG_INFO_TESTCASE = True def verify_module(self, module, verify_path, verify_uuid): - uuid = module.GetUUIDString() - self.assertEqual(verify_path, module.GetFileSpec().fullpath) - self.assertEqual(verify_uuid, uuid) + # Compare the filename and the directory separately. We are avoiding + # SBFileSpec.fullpath because it causes a slash/backslash confusion + # on Windows. + self.assertEqual( + os.path.basename(verify_path), module.GetFileSpec().basename) + self.assertEqual( + os.path.dirname(verify_path), module.GetFileSpec().dirname or "") + self.assertEqual(verify_uuid, module.GetUUIDString()) def get_minidump_modules(self, yaml_file): minidump_path = self.getBuildArtifact(os.path.basename(yaml_file) + ".dmp") @@ -130,7 +135,6 @@ self.verify_module(modules[1], "/file/does/not/exist/b", '11223344-1122-3344-1122-334411223344-11223344') - @expectedFailureAll(oslist=["windows"]) def test_partial_uuid_match(self): """ Breakpad has been known to create minidump files using CvRecord in each @@ -248,7 +252,6 @@ "a", "", "01020304-0506-0708-090A-0B0C0D0E0F10").IsValid()) self.assertFalse(self.target.AddModule("a", "", "01020305").IsValid()) - @expectedFailureAll(oslist=["windows"]) def test_remove_placeholder_add_real_module(self): """ Test that removing a placeholder module and adding back the real
Index: lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py =================================================================== --- lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py +++ lldb/test/API/functionalities/postmortem/minidump-new/TestMiniDumpUUID.py @@ -19,9 +19,14 @@ NO_DEBUG_INFO_TESTCASE = True def verify_module(self, module, verify_path, verify_uuid): - uuid = module.GetUUIDString() - self.assertEqual(verify_path, module.GetFileSpec().fullpath) - self.assertEqual(verify_uuid, uuid) + # Compare the filename and the directory separately. We are avoiding + # SBFileSpec.fullpath because it causes a slash/backslash confusion + # on Windows. + self.assertEqual( + os.path.basename(verify_path), module.GetFileSpec().basename) + self.assertEqual( + os.path.dirname(verify_path), module.GetFileSpec().dirname or "") + self.assertEqual(verify_uuid, module.GetUUIDString()) def get_minidump_modules(self, yaml_file): minidump_path = self.getBuildArtifact(os.path.basename(yaml_file) + ".dmp") @@ -130,7 +135,6 @@ self.verify_module(modules[1], "/file/does/not/exist/b", '11223344-1122-3344-1122-334411223344-11223344') - @expectedFailureAll(oslist=["windows"]) def test_partial_uuid_match(self): """ Breakpad has been known to create minidump files using CvRecord in each @@ -248,7 +252,6 @@ "a", "", "01020304-0506-0708-090A-0B0C0D0E0F10").IsValid()) self.assertFalse(self.target.AddModule("a", "", "01020305").IsValid()) - @expectedFailureAll(oslist=["windows"]) def test_remove_placeholder_add_real_module(self): """ Test that removing a placeholder module and adding back the real
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits