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.

llvm-svn: 181448

2 files changed, 3 insertions, 3 deletions

diff --git a/lldb/source/Plugins/Process/POSIX/ProcessMessage.h b/lldb/source/Plugins/Process/POSIX/ProcessMessage.h
index 2a4c6121453..2107e92a130 100644
--- a/lldb/source/Plugins/Process/POSIX/ProcessMessage.h
+++ b/lldb/source/Plugins/Process/POSIX/ProcessMessage.h
@@ -149,7 +149,7 @@ public:
     }
 
     lldb::addr_t GetHWAddress() const {
-        assert(GetKind() == eWatchpointMessage);
+        assert(GetKind() == eWatchpointMessage || GetKind() == eTraceMessage);
         return m_addr;
     }
 
diff --git a/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
index 6af5f1a8507..81a1e0b88c7 100644
--- a/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
+++ b/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
@@ -20,7 +20,7 @@ class WatchedVariableHitWhenInScopeTestCase(TestBase):
     # 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 WatchedVariableHitWhenInScopeTestCase(TestBase):
         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."""