jarin created this revision.
jarin added a reviewer: labath.
jarin added a project: LLDB.
Herald added a subscriber: lldb-commits.
jarin edited the summary of this revision.
SBFileSpec.fullpath always uses the forward slash to join the directory with
the base name. This causes mismatches when comparing Windows paths with
backslashes in two of the minidump tests. To get around that we just compare
the directory names separately from the filenames.
Repository:
rG LLVM Github Monorepo
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
@@ -20,7 +20,12 @@
def verify_module(self, module, verify_path, verify_uuid):
uuid = module.GetUUIDString()
- self.assertEqual(verify_path, module.GetFileSpec().fullpath)
+ self.assertEqual(
+ os.path.basename(verify_path),
+ module.GetFileSpec().GetFilename())
+ self.assertEqual(
+ os.path.dirname(verify_path),
+ module.GetFileSpec().GetDirectory() or "")
self.assertEqual(verify_uuid, uuid)
def get_minidump_modules(self, yaml_file):
@@ -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
@@ -20,7 +20,12 @@
def verify_module(self, module, verify_path, verify_uuid):
uuid = module.GetUUIDString()
- self.assertEqual(verify_path, module.GetFileSpec().fullpath)
+ self.assertEqual(
+ os.path.basename(verify_path),
+ module.GetFileSpec().GetFilename())
+ self.assertEqual(
+ os.path.dirname(verify_path),
+ module.GetFileSpec().GetDirectory() or "")
self.assertEqual(verify_uuid, uuid)
def get_minidump_modules(self, yaml_file):
@@ -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
