This is an archive of the discontinued LLVM Phabricator instance.

In D133366#3923291, @kastiglione wrote:

Ugh, the test that is failing uses windows paths but runs on both windows and non-windows machines. I will revert this and the two fix commits.

You should be able to test for the operating system and set the paths accordingly in the test.

I will do that and recommit, thanks.

The real problem here is that the __get_fullpath__ implementation does not use the path style information from within the FileSpec object. Hardcoding it to use the host os path style (instead of posix style) just changes the set of bugs.

@labath thanks, I believe a more correct fix here https://reviews.llvm.org/D138348

Revision Contents

Path

Size

lldb/

bindings/

interface/

SBFileSpec.i

2 lines

test/

API/

python_api/

file_spec/

TestFileSpecAPI.py

15 lines

Diff 474884

lldb/bindings/interface/SBFileSpec.i

Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines	public:
STRING_EXTENSION(SBFileSpec)		STRING_EXTENSION(SBFileSpec)

#ifdef SWIGPYTHON		#ifdef SWIGPYTHON
%pythoncode %{		%pythoncode %{
def __get_fullpath__(self):		def __get_fullpath__(self):
spec_dir = self.GetDirectory()		spec_dir = self.GetDirectory()
spec_file = self.GetFilename()		spec_file = self.GetFilename()
if spec_dir and spec_file:		if spec_dir and spec_file:
return '%s/%s' % (spec_dir, spec_file)		return os.path.join(spec_dir, spec_file)
elif spec_dir:		elif spec_dir:
return spec_dir		return spec_dir
elif spec_file:		elif spec_file:
return spec_file		return spec_file
return None		return None

fullpath = property(__get_fullpath__, None, doc='''A read only property that returns the fullpath as a python string.''')		fullpath = property(__get_fullpath__, None, doc='''A read only property that returns the fullpath as a python string.''')
basename = property(GetFilename, None, doc='''A read only property that returns the path basename as a python string.''')		basename = property(GetFilename, None, doc='''A read only property that returns the path basename as a python string.''')
dirname = property(GetDirectory, None, doc='''A read only property that returns the path directory name as a python string.''')		dirname = property(GetDirectory, None, doc='''A read only property that returns the path directory name as a python string.''')
exists = property(Exists, None, doc='''A read only property that returns a boolean value that indicates if the file exists.''')		exists = property(Exists, None, doc='''A read only property that returns a boolean value that indicates if the file exists.''')
%}		%}
#endif		#endif

};		};

} // namespace lldb		} // namespace lldb

lldb/test/API/python_api/file_spec/TestFileSpecAPI.py

This file was added.

				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"))

This is an archive of the discontinued LLVM Phabricator instance.

[lldb] Fix SBFileSpec.fullpath for WindowsClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents

Diff 474884

lldb/bindings/interface/SBFileSpec.i

lldb/test/API/python_api/file_spec/TestFileSpecAPI.py

[lldb] Fix SBFileSpec.fullpath for Windows
ClosedPublic