Alignment info for Elf test

[Mark Wielaard <mark@klomp.org>]

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

Hi,

As mentioned in bug #3763 this patch adds alignment info for Elf test so
that it now passes on x86_64. But this breaks on x86 it seems. Does
anybody know what is needed on x86 to get the alignment info there also
correct? I would like to add this patch since it fixes the only test
suite failure on x86_64 I am seeing.

2007-01-09  Mark Wielaard  <mark@klomp.org>

    * tests/TestElf.java (testObjectFile): Add and use
    expectedDataAlignments values.

Cheers,

Mark

[-- Attachment #2: TestElf-expectedDataAlignments.patch --]
[-- Type: text/x-patch, Size: 1676 bytes --]

Index: frysk-imports/lib/elf/tests/TestElf.java
===================================================================
RCS file: /cvs/frysk/frysk-imports/lib/elf/tests/TestElf.java,v
retrieving revision 1.12
diff -u -r1.12 TestElf.java
--- frysk-imports/lib/elf/tests/TestElf.java	14 Dec 2006 18:32:57 -0000	1.12
+++ frysk-imports/lib/elf/tests/TestElf.java	9 Jan 2007 11:42:50 -0000
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, 2006 Red Hat Inc.
+// Copyright 2005, 2006, 2007 Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@
     int[] expectedTypes = { 0, 1, 9, 1, 8, 1, 1, 1, 3, 2, 3 };
 
     int[] expectedDataSizes = { 0, 43, 16, 0, 0, 14, 45, 0, 81, 160, 25 };
+    int[] expectedDataAlignments = { 0, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1 };
     ElfType[] expectedDataTypes = { ElfType.ELF_T_BYTE, ElfType.ELF_T_BYTE,
                                    ElfType.ELF_T_REL, ElfType.ELF_T_BYTE,
                                    ElfType.ELF_T_BYTE, ElfType.ELF_T_BYTE,
@@ -190,7 +191,8 @@
 
         ElfData data = section.getData();
         assertNotNull(data);
-        assertEquals("section-" + i + "-alignment", 0, data.getAlignment());
+        assertEquals("section-" + i + "-alignment", expectedDataAlignments[i],
+                     data.getAlignment());
         assertEquals("section-" + i + "-offset", 0, data.getOffset());
         assertEquals("section-" + i + "-size", expectedDataSizes[i], data.getSize());
         assertEquals("section-" + i + "-type", expectedDataTypes[i], data.getType());