aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2017-06-14 23:33:28 -0400
committerEugene Tarassov2017-06-14 23:33:28 -0400
commit4d0f4748072e1359939148c69e15ea5a26cdf1fa (patch)
treef853e26f1e3f941c284f22209671a4c09541204e
parent714f7dcb5ad1c588bd41ebbccd061904ddf898f3 (diff)
downloadorg.eclipse.tcf-4d0f4748072e1359939148c69e15ea5a26cdf1fa.tar.gz
org.eclipse.tcf-4d0f4748072e1359939148c69e15ea5a26cdf1fa.tar.xz
org.eclipse.tcf-4d0f4748072e1359939148c69e15ea5a26cdf1fa.zip
TCF Tests: fixed diagnostic tests failure on a bare metal target
-rw-r--r--plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestExpressions.java5
-rw-r--r--plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestRCBP1.java3
2 files changed, 6 insertions, 2 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 675ceb505..ddd0be485 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
@@ -358,7 +358,10 @@ class TestExpressions implements ITCFTest, RunControl.DiagnosticTestDone,
else {
test_ctx = ctx;
process_id = test_ctx.getProcessID();
- if (test_ctx.hasState()) thread_id = test_ctx_id;
+ if (test_ctx.hasState()) {
+ thread_id = test_ctx_id;
+ thread_ctx = test_ctx;
+ }
runTest();
}
}
diff --git a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestRCBP1.java b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestRCBP1.java
index 2a9ef861e..9cedba5ac 100644
--- a/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestRCBP1.java
+++ b/plugins/org.eclipse.tcf.debug/src/org/eclipse/tcf/internal/debug/tests/TestRCBP1.java
@@ -1640,7 +1640,7 @@ class TestRCBP1 implements ITCFTest, RunControl.DiagnosticTestDone, IRunControl.
exit(new Exception("Invalid register value size"));
return;
}
- if (ctx.isWriteable() && !ctx.isWriteOnce()) {
+ if (ctx.isWriteable() && !ctx.isWriteOnce() && ctx.getMemoryContext() == null) {
cmds.add(ctx.set(value, new IRegisters.DoneSet() {
public void doneSet(IToken token, Exception error) {
cmds.remove(token);
@@ -1689,6 +1689,7 @@ class TestRCBP1 implements ITCFTest, RunControl.DiagnosticTestDone, IRunControl.
if (ctx.isReadOnce()) continue;
if (ctx.isWriteOnce()) continue;
if (ctx.getSize() == 0) continue;
+ if (ctx.getMemoryContext() != null) continue;
int offs = rnd.nextInt(ctx.getSize());
int size = rnd.nextInt(ctx.getSize() - offs) + 1;
locs.add(new IRegisters.Location(id, offs, size));