Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2016-10-21 23:47:49 +0000
committerEugene Tarassov2016-10-21 23:47:49 +0000
commit7856be37fb5f6af699f58862402cf742b237e9c4 (patch)
tree962f1866a5014d90020553eb6d78bc9b248b10b8 /plugins
parentb6f4f080844473a56ca01480b929ca88e1432a06 (diff)
downloadorg.eclipse.tcf-7856be37fb5f6af699f58862402cf742b237e9c4.tar.gz
org.eclipse.tcf-7856be37fb5f6af699f58862402cf742b237e9c4.tar.xz
org.eclipse.tcf-7856be37fb5f6af699f58862402cf742b237e9c4.zip
TCF Tests: fixed expressions test failure on Windows 10
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestExpressions.java45
1 files changed, 13 insertions, 32 deletions
diff --git a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestExpressions.java b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestExpressions.java
index 02289a450..675ceb505 100644
--- a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestExpressions.java
+++ b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestExpressions.java
@@ -365,37 +365,35 @@ class TestExpressions implements ITCFTest, RunControl.DiagnosticTestDone,
});
return;
}
- if (thread_id == null) {
- srv_rc.getChildren(process_id, new IRunControl.DoneGetChildren() {
- public void doneGetChildren(IToken token, Exception error, String[] ids) {
+ if (sym_func3 == null) {
+ srv_diag.getSymbol(process_id, "tcf_test_func3", new IDiagnostics.DoneGetSymbol() {
+ public void doneGetSymbol(IToken token, Throwable error, IDiagnostics.ISymbol symbol) {
if (error != null) {
exit(error);
}
- else if (ids == null || ids.length == 0) {
- exit(new Exception("Test process has no threads"));
- }
- else if (ids.length != 1) {
- exit(new Exception("Test process has too many threads"));
+ else if (symbol == null) {
+ exit(new Exception("Symbol must not be null: tcf_test_func3"));
}
else {
- thread_id = ids[0];
+ sym_func3 = symbol;
runTest();
}
}
});
return;
}
- if (thread_ctx == null) {
- srv_rc.getContext(thread_id, new IRunControl.DoneGetContext() {
- public void doneGetContext(IToken token, Exception error, IRunControl.RunControlContext ctx) {
+ if (thread_id == null) {
+ srv_rc.getChildren(process_id, new IRunControl.DoneGetChildren() {
+ public void doneGetChildren(IToken token, Exception error, String[] ids) {
if (error != null) {
exit(error);
}
- else if (ctx == null || !ctx.hasState()) {
- exit(new Exception("Invalid thread context"));
+ else if (ids == null || ids.length == 0) {
+ exit(new Exception("Test process has no threads"));
}
else {
- thread_ctx = ctx;
+ thread_id = ids[0];
+ thread_ctx = test_rc.getContext(thread_id);
runTest();
}
}
@@ -424,23 +422,6 @@ class TestExpressions implements ITCFTest, RunControl.DiagnosticTestDone,
});
return;
}
- if (sym_func3 == null) {
- srv_diag.getSymbol(process_id, "tcf_test_func3", new IDiagnostics.DoneGetSymbol() {
- public void doneGetSymbol(IToken token, Throwable error, IDiagnostics.ISymbol symbol) {
- if (error != null) {
- exit(error);
- }
- else if (symbol == null) {
- exit(new Exception("Symbol must not be null: tcf_test_func3"));
- }
- else {
- sym_func3 = symbol;
- runTest();
- }
- }
- });
- return;
- }
if (!run_to_bp_done) {
BigInteger pc0 = JSON.toBigInteger(sym_func3.getValue());
BigInteger pc1 = new BigInteger(suspended_pc);

Back to the top