mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-08 16:55:38 +02:00
Code Issues Wiki Activity

Bug 409186 - Fix debug registers test which didn't work on 64bit.

Browse source 
Change-Id: I25086ac3feca60f0776d61c162254eaadb3a7ae3
Reviewed-on: https://git.eclipse.org/r/13349
Reviewed-by: Marc Khouzam <marc.khouzam@ericsson.com>
IP-Clean: Marc Khouzam <marc.khouzam@ericsson.com>
Tested-by: Marc Khouzam <marc.khouzam@ericsson.com>
This commit is contained in:
Marc Khouzam 2013-05-29 13:06:59 -04:00
parent 9a53b3573e
commit 9330e46813
2 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/GDBPatternMatchingExpressionsTest.java
View file

@ -55,6 +55,7 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BackgroundRunner;
import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase; import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase;
import org.eclipse.cdt.tests.dsf.gdb.framework.SyncUtil; import org.eclipse.cdt.tests.dsf.gdb.framework.SyncUtil;
import org.eclipse.cdt.tests.dsf.gdb.launching.TestsPlugin; import org.eclipse.cdt.tests.dsf.gdb.launching.TestsPlugin;
import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -108,6 +109,14 @@ public class GDBPatternMatchingExpressionsTest extends BaseTestCase {
// We make it static so it does not get re-set for every test // We make it static so it does not get re-set for every test
protected static List<String> fRegisterNames = null; protected static List<String> fRegisterNames = null;
@BeforeClass
public static void initializeGlobals() {
// In case we run multiple GDB versions of this test
// in the same suite, we need to re-initialize the registers
// as they may change between GDB versions.
fRegisterNames = null;
}
protected List<String> get_X86_REGS() throws Throwable { protected List<String> get_X86_REGS() throws Throwable {
if (fRegisterNames == null) { if (fRegisterNames == null) {

44
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/src/org/eclipse/cdt/tests/dsf/gdb/tests/MIRegistersTest.java
View file

@ -56,6 +56,7 @@ import org.eclipse.cdt.tests.dsf.gdb.framework.BaseTestCase;
import org.eclipse.cdt.tests.dsf.gdb.framework.SyncUtil; import org.eclipse.cdt.tests.dsf.gdb.framework.SyncUtil;
import org.eclipse.cdt.tests.dsf.gdb.launching.TestsPlugin; import org.eclipse.cdt.tests.dsf.gdb.launching.TestsPlugin;
import org.junit.Assert; import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@ -65,6 +66,14 @@ public class MIRegistersTest extends BaseTestCase {
// Static list of register names as obtained directly from GDB. // Static list of register names as obtained directly from GDB.
// We make it static it does not get re-set for every test // We make it static it does not get re-set for every test
protected static List<String> fRegisterNames = null; protected static List<String> fRegisterNames = null;
@BeforeClass
public static void initializeGlobals() {
// In case we run multiple GDB versions of this test
// in the same suite, we need to re-initialize the registers
// as they may change between GDB versions.
fRegisterNames = null;
}
protected List<String> get_X86_REGS() throws Throwable { protected List<String> get_X86_REGS() throws Throwable {
if (fRegisterNames == null) { if (fRegisterNames == null) {
@ -338,29 +347,48 @@ public class MIRegistersTest extends BaseTestCase {
} }
private static String REGISTER_VALUE = "";
@Test @Test
public void getModelDataForRegisterDataValueInDifferentNumberFormats() throws Throwable { public void getModelDataForRegisterDataValueInDifferentNumberFormats() throws Throwable {
MIStoppedEvent stoppedEvent = getInitialStoppedEvent(); MIStoppedEvent stoppedEvent = getInitialStoppedEvent();
IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0); IFrameDMContext frameDmc = SyncUtil.getStackFrame(stoppedEvent.getDMContext(), 0);
String val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.NATURAL_FORMAT, 0); String val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.NATURAL_FORMAT, 0);
REGISTER_VALUE = val; try {
assertTrue("Register Value is not in NATURAL format " , Integer.parseInt(val)== Integer.parseInt(REGISTER_VALUE)); Long.parseLong(val);
} catch (NumberFormatException e) {
assertTrue("Register Value is not in NATURAL_FORMAT: " + val, false);
}
val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.HEX_FORMAT, 0); val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.HEX_FORMAT, 0);
assertTrue("Register Value is not in HEX_FORMAT " ,val.startsWith("0x")); assertTrue("Register Value is not in HEX_FORMAT: " + val, val.startsWith("0x"));
try {
Long.parseLong(val.substring(2), 16);
} catch (NumberFormatException e) {
assertTrue("Register Value is not in HEX_FORMAT: " + val, false);
}
val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.BINARY_FORMAT, 0); val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.BINARY_FORMAT, 0);
Assert.assertEquals("Register Value is not in BINARY_FORMAT ", Integer.toBinaryString(Integer.parseInt(REGISTER_VALUE)), val); try {
Long.parseLong(val, 2);
} catch (NumberFormatException e) {
assertTrue("Register Value is not in BINARY_FORMAT: " + val, false);
}
val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.DECIMAL_FORMAT , 0); val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.DECIMAL_FORMAT , 0);
Assert.assertEquals("Register Value is not in DECIMAL_FORMAT", Integer.parseInt(REGISTER_VALUE), Integer.parseInt(val)); try {
Long.parseLong(val);
} catch (NumberFormatException e) {
assertTrue("Register Value is not in DECIMAL_FORMAT: " + val, false);
}
val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.OCTAL_FORMAT, 0); val = getModelDataForRegisterDataValue(frameDmc, IFormattedValues.OCTAL_FORMAT, 0);
assertTrue("Register Value is not in OCTAL_FORMAT " ,val.startsWith("0")); assertTrue("Register Value is not in OCTAL_FORMAT: " + val, val.startsWith("0"));
try {
Long.parseLong(val.substring(1), 8);
} catch (NumberFormatException e) {
assertTrue("Register Value is not in OCTAL_FORMAT: " + val, false);
}
} }
@Test @Test
public void compareRegisterForMultipleExecutionContexts() throws Throwable { public void compareRegisterForMultipleExecutionContexts() throws Throwable {