diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/GDBConsoleSynchronizingTest_7_6.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/GDBConsoleSynchronizingTest_7_6.java index e57b0bd5996..c6e84daa156 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/GDBConsoleSynchronizingTest_7_6.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/tests_7_6/GDBConsoleSynchronizingTest_7_6.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants; import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor; import org.eclipse.cdt.dsf.concurrent.ImmediateRequestMonitor; @@ -161,7 +160,7 @@ public class GDBConsoleSynchronizingTest_7_6 extends BaseTestCase { IExpressionDMAddress data = query.get(); IMemoryDMContext memoryDmc = DMContexts.getAncestorOfType(frameDmc, IMemoryDMContext.class); - readMemory(memoryDmc, data.getAddress(), NEW_VAR_SIZE); + SyncUtil.readMemory(memoryDmc, data.getAddress(), 0, 1, NEW_VAR_SIZE); fEventsReceived.clear(); @@ -173,7 +172,7 @@ public class GDBConsoleSynchronizingTest_7_6 extends BaseTestCase { assertEquals(data.getAddress(), memoryEvent.getAddresses()[0]); // Now verify the memory service knows the new memory value - MemoryByte[] memory = readMemory(memoryDmc, data.getAddress(), NEW_VAR_SIZE); + MemoryByte[] memory = SyncUtil.readMemory(memoryDmc, data.getAddress(), 0, 1, NEW_VAR_SIZE); assertEquals(NEW_VAR_SIZE, memory.length); for (int i=0; i query = new Query() { - @Override - protected void execute(DataRequestMonitor rm) { - fMemoryService.getMemory(dmc, address, 0, 1, count, rm); - } - }; - fSession.getExecutor().execute(query); - return query.get(DEFAULT_TIMEOUT, DEFAULT_TIME_UNIT); - } - private void queueConsoleCommand(String command) throws Throwable { queueConsoleCommand(command, DEFAULT_TIMEOUT, DEFAULT_TIME_UNIT); }