diff options
author | eutarass | 2009-04-16 20:23:27 +0000 |
---|---|---|
committer | eutarass | 2009-04-16 20:23:27 +0000 |
commit | 2e5dcb01e97d03102540f52ecf6007d75fe0272b (patch) | |
tree | fb382d3d2c57624e7d19159365d17072d66ffe53 /plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests | |
parent | c01119c6c88f769f3843f4d14dfc627733ce4a6d (diff) | |
download | org.eclipse.tcf-2e5dcb01e97d03102540f52ecf6007d75fe0272b.tar.gz org.eclipse.tcf-2e5dcb01e97d03102540f52ecf6007d75fe0272b.tar.xz org.eclipse.tcf-2e5dcb01e97d03102540f52ecf6007d75fe0272b.zip |
TCF Debugger: launch configuration dialog now can install TCF agent on remote host using TELNET or SSH.
Diffstat (limited to 'plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests')
-rw-r--r-- | plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestExpressions.java | 17 |
1 files changed, 13 insertions, 4 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 9ccf6c7ac..fc29e45ec 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 @@ -38,6 +38,8 @@ class TestExpressions implements ITCFTest, private IDiagnostics.ISymbol sym_func3; private String process_id; private String thread_id; + private boolean process_exited; + private boolean test_done; private IRunControl.RunControlContext thread_ctx; private String suspended_pc; private boolean waiting_suspend; @@ -112,8 +114,8 @@ class TestExpressions implements ITCFTest, return; } } + exit(null); } - exit(null); } }); } @@ -348,6 +350,7 @@ class TestExpressions implements ITCFTest, return; } } + test_done = true; diag.cancelTest(process_id, new IDiagnostics.DoneCancelTest() { public void doneCancelTest(IToken token, Throwable error) { exit(error); @@ -386,6 +389,12 @@ class TestExpressions implements ITCFTest, } public void contextRemoved(String[] context_ids) { + for (String id : context_ids) { + if (id.equals(process_id)) { + process_exited = true; + if (!test_done) exit(new Exception("Test process exited too soon")); + } + } } public void contextResumed(String context) { @@ -410,12 +419,12 @@ class TestExpressions implements ITCFTest, @SuppressWarnings("unchecked") public void breakpointStatusChanged(String id, Map<String,Object> status) { - if (id.equals(bp_id) && process_id != null) { + if (id.equals(bp_id) && process_id != null && !process_exited) { String s = (String)status.get(IBreakpoints.STATUS_ERROR); if (s != null) exit(new Exception(s)); Collection<Map<String,Object>> list = (Collection<Map<String,Object>>)status.get(IBreakpoints.STATUS_INSTANCES); if (list == null) { - exit(new Exception("Invalis BP status")); + exit(new Exception("Invalid BP status")); return; } boolean ok = false; @@ -423,7 +432,7 @@ class TestExpressions implements ITCFTest, String ctx = (String)map.get(IBreakpoints.INSTANCE_CONTEXT); if (process_id.equals(ctx) && map.get(IBreakpoints.INSTANCE_ERROR) == null) ok = true; } - if (!ok) exit(new Exception("Invalis BP status")); + if (!ok) exit(new Exception("Invalid BP status")); } } |