[Lldb-commits] [lldb] r181448 - Fix assertion from previous fix for debian os watchpoints.

[Matt Kopec]

Author: mkopec
Date: Wed May  8 11:52:34 2013
New Revision: 181448

URL: http://llvm.org/viewvc/llvm-project?rev=181448&view=rev
Log:
Fix assertion from previous fix for debian os watchpoints.

Also mark one of the tests as expected fail on Linux due to the debian fix.

Modified:
    lldb/trunk/source/Plugins/Process/POSIX/ProcessMessage.h
    lldb/trunk/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py

Modified: lldb/trunk/source/Plugins/Process/POSIX/ProcessMessage.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/POSIX/ProcessMessage.h?rev=181448&r1=181447&r2=181448&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/POSIX/ProcessMessage.h (original)
+++ lldb/trunk/source/Plugins/Process/POSIX/ProcessMessage.h Wed May  8 11:52:34 2013
@@ -149,7 +149,7 @@ public:
     }
 
     lldb::addr_t GetHWAddress() const {
-        assert(GetKind() == eWatchpointMessage);
+        assert(GetKind() == eWatchpointMessage || GetKind() == eTraceMessage);
         return m_addr;
     }
 

Modified: lldb/trunk/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py?rev=181448&r1=181447&r2=181448&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py (original)
+++ lldb/trunk/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py Wed May  8 11:52:34 2013
@@ -20,7 +20,7 @@ class WatchedVariableHitWhenInScopeTestC
     # clearer API to express this.
     #
 
-    @expectedFailureDarwin
+    @unittest2.expectedFailure
     @dsym_test
     def test_watched_var_should_only_hit_when_in_scope_with_dsym(self):
         """Test that a variable watchpoint should only hit when in scope."""
@@ -28,7 +28,7 @@ class WatchedVariableHitWhenInScopeTestC
         self.setTearDownCleanup(dictionary=self.d)
         self.watched_var()
 
-    @expectedFailureDarwin
+    @unittest2.expectedFailure
     @dwarf_test
     def test_watched_var_should_only_hit_when_in_scope_with_dwarf(self):
         """Test that a variable watchpoint should only hit when in scope."""