1 files changed, 7 insertions, 0 deletions
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestExpressions.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestExpressions.java
index 61afd99af..a861cb341 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestExpressions.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestExpressions.java
@@ -546,6 +546,13 @@ class TestExpressions implements ITCFTest,
     }
 
     public void contextException(String context, String msg) {
+        if (test_done) return;
+        IRunControl.RunControlContext ctx = ctx_map.get(context);
+        if (ctx != null) {
+            String p = ctx.getParentID();
+            String c = ctx.getCreatorID();
+            if (!test_ctx_id.equals(c) && !test_ctx_id.equals(p)) return;
+        }
         exit(new Exception("Context exception: " + msg));
     }