From 8d26859710f820c3dbe4c2bd021a0ca8a3f96dae Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Thu, 22 Jun 2017 15:46:44 +0100 Subject: [PATCH] Bug 518643: Increase wait for CDT to quit GDB This is due to a new 500ms delay between inferior exiting and CDT killing GDB. Change-Id: I561f69e74caff3e82d89fd8cf2e4babe2c30392a --- .../dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java index 63bfdb60383..e5d31251d76 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/OperationsWhileTargetIsRunningTest.java @@ -203,7 +203,8 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase // The shutdown must happen quickly, which will confirm that it was // our own terminate that did it. If it take longer, it indicates // that the program terminated on its own, which is not what we want. - shutdownEventWaitor.waitForEvent(TestsPlugin.massageTimeout(500)); + // See Bug 518643 for details as to length of this delay + shutdownEventWaitor.waitForEvent(TestsPlugin.massageTimeout(1000)); // Now make sure GDB is dead Assert.assertTrue("GDB should have been terminated", !fControl.isActive()); @@ -286,7 +287,8 @@ public class OperationsWhileTargetIsRunningTest extends BaseParametrizedTestCase // The shutdown must happen quickly, which will confirm that it was // our own terminate that did it. If it take longer, it indicates // that the program terminated on its own, which is not what we want. - shutdownEventWaitor.waitForEvent(TestsPlugin.massageTimeout(500)); + // See Bug 518643 for details as to length of this delay + shutdownEventWaitor.waitForEvent(TestsPlugin.massageTimeout(1000)); // Now make sure GDB is dead Assert.assertTrue("GDB should have been terminated", !fControl.isActive());