Author: Dave Lee Date: 2022-11-12T14:17:28-08:00 New Revision: 01f924d0e37a5deae51df0d77e10a15b63aa0c0f
URL: https://github.com/llvm/llvm-project/commit/01f924d0e37a5deae51df0d77e10a15b63aa0c0f DIFF: https://github.com/llvm/llvm-project/commit/01f924d0e37a5deae51df0d77e10a15b63aa0c0f.diff LOG: [lldb] Revert SBFileSpec.fullpath path separator fix Primarily reverts 5223366416fb. Added: Modified: lldb/bindings/interface/SBFileSpec.i lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py Removed: lldb/test/API/python_api/file_spec/TestFileSpecAPI.py ################################################################################ diff --git a/lldb/bindings/interface/SBFileSpec.i b/lldb/bindings/interface/SBFileSpec.i index 104339472384f..b549321487ec2 100644 --- a/lldb/bindings/interface/SBFileSpec.i +++ b/lldb/bindings/interface/SBFileSpec.i @@ -88,7 +88,7 @@ public: spec_dir = self.GetDirectory() spec_file = self.GetFilename() if spec_dir and spec_file: - return os.path.join(spec_dir, spec_file) + return '%s/%s' % (spec_dir, spec_file) elif spec_dir: return spec_dir elif spec_file: diff --git a/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py b/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py index 777548c39253d..e36f1af89e9ca 100644 --- a/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py +++ b/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py @@ -44,27 +44,27 @@ def test_modules_in_mini_dump(self): self.assertTrue(self.process, PROCESS_IS_VALID) expected_modules = [ { - 'filename' : r"C:\Users\amccarth\Documents\Visual Studio 2013\Projects\fizzbuzz\Debug\fizzbuzz.exe", + 'filename' : r"C:\Users\amccarth\Documents\Visual Studio 2013\Projects\fizzbuzz\Debug/fizzbuzz.exe", 'uuid' : '0F45B791-9A96-46F9-BF8F-2D6076EA421A-00000011', }, { - 'filename' : r"C:\Windows\SysWOW64\ntdll.dll", + 'filename' : r"C:\Windows\SysWOW64/ntdll.dll", 'uuid' : 'BBB0846A-402C-4052-A16B-67650BBFE6B0-00000002', }, { - 'filename' : r"C:\Windows\SysWOW64\kernel32.dll", + 'filename' : r"C:\Windows\SysWOW64/kernel32.dll", 'uuid' : 'E5CB7E1B-005E-4113-AB98-98D6913B52D8-00000002', }, { - 'filename' : r"C:\Windows\SysWOW64\KERNELBASE.dll", + 'filename' : r"C:\Windows\SysWOW64/KERNELBASE.dll", 'uuid' : '0BF95241-CB0D-4BD4-AC5D-186A6452E522-00000001', }, { - 'filename' : r"C:\Windows\System32\MSVCP120D.dll", + 'filename' : r"C:\Windows\System32/MSVCP120D.dll", 'uuid' : '3C05516E-57E7-40EB-8D3F-9722C5BD80DD-00000001', }, { - 'filename' : r"C:\Windows\System32\MSVCR120D.dll", + 'filename' : r"C:\Windows\System32/MSVCR120D.dll", 'uuid' : '6382FB86-46C4-4046-AE42-8D97B3F91FF2-00000001', }, ] diff --git a/lldb/test/API/python_api/file_spec/TestFileSpecAPI.py b/lldb/test/API/python_api/file_spec/TestFileSpecAPI.py deleted file mode 100644 index 6c074df0c12fb..0000000000000 --- a/lldb/test/API/python_api/file_spec/TestFileSpecAPI.py +++ /dev/null @@ -1,15 +0,0 @@ -import lldb -import os -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil - - -class TestCase(TestBase): - NO_DEBUG_INFO_TESTCASE = True - - def test_full_path(self): - file_spec = lldb.SBFileSpec() - file_spec.SetDirectory("a") - file_spec.SetFilename("b") - self.assertEqual(file_spec.fullpath, os.path.join("a", "b")) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
