diff options
| author | Dave Lee <davelee.com@gmail.com> | 2022-11-13 01:16:41 +0300 |
|---|---|---|
| committer | Dave Lee <davelee.com@gmail.com> | 2022-11-13 01:17:28 +0300 |
| commit | 01f924d0e37a5deae51df0d77e10a15b63aa0c0f (patch) | |
| tree | 3ef3a40893bc58243ce1eb90204b04053e7cff68 | |
| parent | 760c75fe2d25e06644271cb1338f8b0f8d9abc70 (diff) | |
[lldb] Revert SBFileSpec.fullpath path separator fix
Primarily reverts 5223366416fb.
| -rw-r--r-- | lldb/bindings/interface/SBFileSpec.i | 2 | ||||
| -rw-r--r-- | lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py | 12 | ||||
| -rw-r--r-- | lldb/test/API/python_api/file_spec/TestFileSpecAPI.py | 15 |
3 files changed, 7 insertions, 22 deletions
diff --git a/lldb/bindings/interface/SBFileSpec.i b/lldb/bindings/interface/SBFileSpec.i index 104339472384..b549321487ec 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 777548c39253..e36f1af89e9c 100644 --- a/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py +++ b/lldb/test/API/functionalities/postmortem/minidump/TestMiniDump.py @@ -44,27 +44,27 @@ class MiniDumpTestCase(TestBase): 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 6c074df0c12f..000000000000 --- 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")) |