Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2009-04-20 17:15:12 +0000
committereutarass2009-04-20 17:15:12 +0000
commitf4b67b164cfc12bc56f8e2784edec5ba52965bb1 (patch)
treee489bd9683e246df36837006839bb106e03ed7ea /plugins
parent08039440f38d41f218a7b5b975ec2a29300de482 (diff)
downloadorg.eclipse.tcf-f4b67b164cfc12bc56f8e2784edec5ba52965bb1.tar.gz
org.eclipse.tcf-f4b67b164cfc12bc56f8e2784edec5ba52965bb1.tar.xz
org.eclipse.tcf-f4b67b164cfc12bc56f8e2784edec5ba52965bb1.zip
Created TCF feature and update site projects
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.tm.tcf.cdt.ui/plugin.properties4
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties12
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TCFTestSuite.java23
-rw-r--r--plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestEchoFP.java21
4 files changed, 18 insertions, 42 deletions
diff --git a/plugins/org.eclipse.tm.tcf.cdt.ui/plugin.properties b/plugins/org.eclipse.tm.tcf.cdt.ui/plugin.properties
index c4fbf4d03..ca9cb9ea5 100644
--- a/plugins/org.eclipse.tm.tcf.cdt.ui/plugin.properties
+++ b/plugins/org.eclipse.tm.tcf.cdt.ui/plugin.properties
@@ -8,5 +8,5 @@
# Contributors:
# Wind River Systems - initial implementation
###############################################################################
-pluginName=TCF/CDT Integration UI (Incubation)
-providerName=Eclipse.org
+pluginName = TCF/CDT Integration UI (Incubation)
+providerName = Eclipse.org
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties b/plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties
index 4c9400318..12f916877 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/plugin.properties
@@ -8,13 +8,13 @@
# Contributors:
# Wind River Systems - initial implementation
###############################################################################
-pluginName=TCF/Eclipse Debugger Integration UI (Incubation)
-providerName=Eclipse.org
+pluginName = TCF/Eclipse Debugger Integration UI (Incubation)
+providerName = Eclipse.org
-debugCurrentInstructionPointer=Debug Current Instruction Pointer
-debugCallStack=Debug Call Stack
+debugCurrentInstructionPointer = Debug Current Instruction Pointer
+debugCallStack = Debug Call Stack
-DebuggerActionSet.label=TCF Debugger
+DebuggerActionSet.label = TCF Debugger
-SignalsCommand.label=Signals...
+SignalsCommand.label = Signals...
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TCFTestSuite.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TCFTestSuite.java
index 6a321efb2..e4bfc4929 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TCFTestSuite.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TCFTestSuite.java
@@ -48,14 +48,7 @@ public class TCFTestSuite {
public void progress(String label, int done, int total);
public void done(Collection<Throwable> errors);
}
-
- @SuppressWarnings("serial")
- private static class CancelException extends Exception {
- CancelException() {
- super("Canceled");
- }
- }
-
+
public TCFTestSuite(final IPeer peer, final TestListener listener) throws IOException {
this.listener = listener;
pending_tests.add(new Runnable() {
@@ -166,7 +159,7 @@ public class TCFTestSuite {
for (int i = 0; i < channels.length; i++) {
if (channels[i] == channel) {
channels[i] = null;
- if (error != null && !(error instanceof CancelException)) errors.add(error);
+ if (error != null) errors.add(error);
for (Iterator<ITCFTest> n = active_tests.keySet().iterator(); n.hasNext();) {
if (active_tests.get(n.next()) == channel) n.remove();
}
@@ -181,8 +174,7 @@ public class TCFTestSuite {
else if (active_tests.isEmpty()) {
for (int i = 0; i < channels.length; i++) {
if (channels[i] != null && channels[i].getState() != IChannel.STATE_CLOSED) {
- if (errors.isEmpty()) channels[i].close();
- else channels[i].terminate(new CancelException());
+ channels[i].close();
}
}
}
@@ -207,9 +199,7 @@ public class TCFTestSuite {
}
canceled = true;
for (IChannel c : channels) {
- if (c != null && c.getState() != IChannel.STATE_CLOSED) {
- c.terminate(new CancelException());
- }
+ if (c != null && c.getState() != IChannel.STATE_CLOSED) c.close();
}
}
@@ -223,7 +213,7 @@ public class TCFTestSuite {
void done(ITCFTest test, Throwable error) {
assert active_tests.get(test) != null;
- if (error != null) errors.add(error);
+ if (error != null && !canceled) errors.add(error);
active_tests.remove(test);
if (active_tests.isEmpty()) runNextTest();
}
@@ -233,8 +223,7 @@ public class TCFTestSuite {
if (cancel || errors.size() > 0 || pending_tests.size() == 0) {
for (IChannel channel : channels) {
if (channel != null && channel.getState() != IChannel.STATE_CLOSED) {
- if (errors.isEmpty()) channel.close();
- else channel.terminate(new CancelException());
+ channel.close();
}
}
return;
diff --git a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestEchoFP.java b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestEchoFP.java
index 336bfef63..a2b748f3b 100644
--- a/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestEchoFP.java
+++ b/plugins/org.eclipse.tm.tcf.debug/src/org/eclipse/tm/internal/tcf/debug/tests/TestEchoFP.java
@@ -32,22 +32,9 @@ public class TestEchoFP implements ITCFTest, IDiagnostics.DoneEchoFP {
}
private void sendMessage() {
- StringBuffer buf = new StringBuffer();
- buf.append(Integer.toHexString(count));
- for (int i = 0; i < 64; i++) {
- buf.append('-');
- buf.append((char)(0x400 * i + count));
- }
- BigDecimal s = null;
- switch (count % 10) {
- case 0: s = BigDecimal.valueOf(0); break;
- case 1: s = BigDecimal.valueOf(-1.1); break;
- case 2: s = BigDecimal.valueOf(+1.1); break;
- case 3: s = BigDecimal.valueOf(rnd.nextInt()); break;
- default: s = new BigDecimal(rnd.nextInt() / 1000000.0); break;
- }
- msgs.add(s);
- diag.echoFP(s, this);
+ BigDecimal n = BigDecimal.valueOf(rnd.nextInt(), rnd.nextInt(61) - 30);
+ msgs.add(n);
+ diag.echoFP(n, this);
count++;
}
@@ -60,7 +47,7 @@ public class TestEchoFP implements ITCFTest, IDiagnostics.DoneEchoFP {
else if (s.doubleValue() != b.doubleValue()) {
test_suite.done(this, new Exception("EchoFP test failed: " + s.doubleValue() + " != " + b.doubleValue()));
}
- else if (count < 0x400) {
+ else if (count < 0x800) {
sendMessage();
}
else if (msgs.isEmpty()){

Back to the top