From bd28316f57f53357e30ebd327252cf4b0a6cbcec Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Tue, 28 May 2013 16:24:46 -0400 Subject: [PATCH] Bug 409186 - Memory tests had failures. First failure was because we now know the endianess but the test was not updated. The second failure was because different GDB versions gave different error messages for memory write failures. Change-Id: Idbac275a5de3a0af77d030474fea60808ca9a54c Reviewed-on: https://git.eclipse.org/r/13331 Reviewed-by: Marc Khouzam IP-Clean: Marc Khouzam Tested-by: Marc Khouzam --- .../org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java index b987304026b..0b5b7505d69 100644 --- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java +++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIMemoryTest.java @@ -504,8 +504,8 @@ public class MIMemoryTest extends BaseTestCase { // Ensure that we receive a block of invalid memory bytes assertTrue(fWait.getMessage(), fWait.isOK()); MemoryByte[] buffer = (MemoryByte[]) fWait.getReturnInfo(); - assertTrue("Wrong value: expected '-1, 0', received '" + buffer[0].getValue() + ", " + buffer[0].getFlags() + "'", - (buffer[0].getValue() == (byte) 0) && (buffer[0].getFlags() == (byte) 0)); + assertTrue("Wrong value: expected '0, 32', received '" + buffer[0].getValue() + ", " + buffer[0].getFlags() + "'", + (buffer[0].getValue() == (byte) 0) && (buffer[0].getFlags() == (byte) 32)); // Ensure no MemoryChangedEvent event was received assertTrue("MemoryChangedEvent problem: expected " + 0 + ", received " + getEventCount(), getEventCount() == 0); @@ -797,9 +797,7 @@ public class MIMemoryTest extends BaseTestCase { writeMemory(fMemoryDmc, fBaseAddress, offset, word_size, count, buffer); fWait.waitUntilDone(AsyncCompletionWaitor.WAIT_FOREVER); assertFalse(fWait.getMessage(), fWait.isOK()); - String expected = "Cannot access memory at address"; // Error msg returned by gdb - assertTrue("Wrong error message: expected '" + expected + "', received '" + fWait.getMessage() + "'", - fWait.getMessage().contains(expected)); + // Don't test the error message since it changes from one GDB version to another // Ensure no MemoryChangedEvent event was received assertTrue("MemoryChangedEvent problem: expected " + 0 + ", received " + getEventCount(), getEventCount() == 0);