maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix a number of tests on Windows. 

These fix various issues with path handling and disable a few tests
which use features of LLVM which are not yet supported on Windows.

llvm-svn: 226042
This commit is contained in:
Zachary Turner 2015-01-14 21:42:53 +00:00
parent 6e7ab02cff
commit 12947b7e25
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/source/Plugins/Process/Windows/ProcessWindows.cpp
View File

@ -332,7 +332,7 @@ ProcessWindows::RefreshStateAfterStop()
break_id = site->GetID();
}
stop_info = StopInfo::CreateStopReasonWithBreakpointSiteID(*stop_thread, break_id, should_stop);
stop_info = StopInfo::CreateStopReasonWithBreakpointSiteID(*stop_thread, break_id);
stop_thread->SetStopInfo(stop_info);
}
else

3
lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
View File

@ -35,12 +35,14 @@ class BreakpointConditionsTestCase(TestBase):
self.breakpoint_conditions_python()
@dwarf_test
@unittest2.skipIf(sys.platform.startswith("win32"), "Requires EE to support COFF on Windows (http://llvm.org/pr22232)")
def test_breakpoint_condition_with_dwarf_and_run_command(self):
"""Exercise breakpoint condition with 'breakpoint modify -c <expr> id'."""
self.buildDwarf()
self.breakpoint_conditions()
@dwarf_test
@unittest2.skipIf(sys.platform.startswith("win32"), "Requires EE to support COFF on Windows (http://llvm.org/pr22232)")
def test_breakpoint_condition_inline_with_dwarf_and_run_command(self):
"""Exercise breakpoint condition inline with 'breakpoint set'."""
self.buildDwarf()
@ -48,6 +50,7 @@ class BreakpointConditionsTestCase(TestBase):
@python_api_test
@dwarf_test
@unittest2.skipIf(sys.platform.startswith("win32"), "Requires EE to support COFF on Windows (http://llvm.org/pr22232)")
def test_breakpoint_condition_with_dwarf_and_python_api(self):
"""Use Python APIs to set breakpoint conditions."""
self.buildDwarf()

2
lldb/test/lang/c/bitfields/TestBitfields.py
View File

@ -26,6 +26,7 @@ class BitfieldsTestCase(TestBase):
self.bitfields_variable_python()
@dwarf_test
@unittest2.skipIf(sys.platform.startswith("win32"), "BitFields exhibit crashes in record layout on Windows (http://llvm.org/pr21800)")
def test_with_dwarf_and_run_command(self):
"""Test 'frame variable ...' on a variable with bitfields."""
self.buildDwarf()
@ -33,6 +34,7 @@ class BitfieldsTestCase(TestBase):
@python_api_test
@dwarf_test
@unittest2.skipIf(sys.platform.startswith("win32"), "BitFields exhibit crashes in record layout on Windows (http://llvm.org/pr21800)")
@expectedFailureGcc # GCC (4.6/4.7) generates incorrect code with unnamed bitfields.
def test_with_dwarf_and_python_api(self):
"""Use Python APIs to inspect a bitfields variable."""

4
lldb/test/lang/cpp/class_types/TestClassTypes.py
View File

@ -128,7 +128,7 @@ class ClassTypesTestCase(TestBase):
filespec = target.GetExecutable()
self.assertTrue(filespec, VALID_FILESPEC)
fsDir = filespec.GetDirectory()
fsDir = os.path.normpath(filespec.GetDirectory())
fsFile = filespec.GetFilename()
self.assertTrue(fsDir == os.getcwd() and fsFile == "a.out",
@ -238,7 +238,7 @@ class ClassTypesTestCase(TestBase):
filespec = target.GetExecutable()
self.assertTrue(filespec, VALID_FILESPEC)
fsDir = filespec.GetDirectory()
fsDir = os.path.normpath(filespec.GetDirectory())
fsFile = filespec.GetFilename()
self.assertTrue(fsDir == os.getcwd() and fsFile == "a.out",

2
lldb/test/python_api/target/TestTargetAPI.py
View File

@ -310,7 +310,7 @@ class TargetAPITestCase(TestBase):
# While we are at it, let's also exercise the similar SBModule.FindGlobalVariables() API.
for m in target.module_iter():
if m.GetFileSpec().GetDirectory() == os.getcwd() and m.GetFileSpec().GetFilename() == exe_name:
if os.path.normpath(m.GetFileSpec().GetDirectory()) == os.getcwd() and m.GetFileSpec().GetFilename() == exe_name:
value_list = m.FindGlobalVariables(target, 'my_global_var_of_char_type', 3)
self.assertTrue(value_list.GetSize() == 1)
self.assertTrue(value_list.GetValueAtIndex(0).GetValue() == "'X'")