From 74b476679332cc2058d5af156c9a56651db468ce Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Mon, 28 Jul 2014 08:41:44 -0400 Subject: [PATCH] Bug 439926 - Race condition between's test 2 second timeout and launch's 2 second timeout. Change-Id: I31632107b1bd667239ab6892268c02d30d0bafa7 Signed-off-by: Marc Khouzam --- .../eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java index b3ff59cf350..27cb709181e 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/CommandTimeoutTest.java @@ -139,7 +139,8 @@ public class CommandTimeoutTest extends BaseTestCase { // Enable timeout IEclipsePreferences node = InstanceScope.INSTANCE.getNode( GdbPlugin.PLUGIN_ID ); node.putBoolean( IGdbDebugPreferenceConstants.PREF_COMMAND_TIMEOUT, true ); - node.putInt( IGdbDebugPreferenceConstants.PREF_COMMAND_TIMEOUT_VALUE, 2000 ); + // Timeout must be shorter than the launch's timeout of 2 seconds (see BaseTestCase.doLaunch()) + node.putInt( IGdbDebugPreferenceConstants.PREF_COMMAND_TIMEOUT_VALUE, 1000 ); // Setup a remote launch so that it sends a "-target-remote" as part of the // launch steps.