[lld] r212949 - [Mips] Fix test case expectations due the latest changes in the LLVM.

Simon Atanasyan simon at atanasyan.com
Mon Jul 14 08:31:47 PDT 2014


Author: atanasyan
Date: Mon Jul 14 10:31:47 2014
New Revision: 212949

URL: http://llvm.org/viewvc/llvm-project?rev=212949&view=rev
Log:
[Mips] Fix test case expectations due the latest changes in the LLVM.

Modified:
    lld/trunk/test/elf/Mips/base-address.test
    lld/trunk/test/elf/Mips/dynlib-dynamic.test
    lld/trunk/test/elf/Mips/dynlib-fileheader.test
    lld/trunk/test/elf/Mips/entry-name.test
    lld/trunk/test/elf/Mips/hilo16-1.test
    lld/trunk/test/elf/Mips/hilo16-2.test
    lld/trunk/test/elf/Mips/hilo16-3.test
    lld/trunk/test/elf/Mips/interpreter.test

Modified: lld/trunk/test/elf/Mips/base-address.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/base-address.test?rev=212949&r1=212948&r2=212949&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/base-address.test (original)
+++ lld/trunk/test/elf/Mips/base-address.test Mon Jul 14 10:31:47 2014
@@ -9,9 +9,9 @@
 
 # CHECK: DynamicSection [ (15 entries)
 # CHECK:   Tag        Type                 Name/Value
-# CHECK-NEXT:   0x00000004 HASH                 0x400104
-# CHECK-NEXT:   0x00000005 STRTAB               0x400124
-# CHECK-NEXT:   0x00000006 SYMTAB               0x400114
+# CHECK-NEXT:   0x00000004 HASH                 0x{{[0-9A-F]+}}
+# CHECK-NEXT:   0x00000005 STRTAB               0x{{[0-9A-F]+}}
+# CHECK-NEXT:   0x00000006 SYMTAB               0x{{[0-9A-F]+}}
 # CHECK-NEXT:   0x0000000A STRSZ                1 (bytes)
 # CHECK-NEXT:   0x0000000B SYMENT               16 (bytes)
 # CHECK-NEXT:   0x0000001A FINI_ARRAY           0x0
@@ -30,32 +30,32 @@
 # CHECK:   ProgramHeader {
 # CHECK:     Type: PT_PHDR (0x6)
 # CHECK:     Offset: 0x34
-# CHECK:     VirtualAddress: 0x400034
+# CHECK:     VirtualAddress: 0x{{[0-9A-F]+}}
 # CHECK:   }
 # CHECK:   ProgramHeader {
 # CHECK:     Type: PT_INTERP (0x3)
-# CHECK:     Offset: 0xF4
-# CHECK:     VirtualAddress: 0x4000F4
+# CHECK:     Offset: 0x100
+# CHECK:     VirtualAddress: 0x{{[0-9A-F]+}}
 # CHECK:   }
 # CHECK:   ProgramHeader {
 # CHECK:     Type: PT_LOAD (0x1)
 # CHECK:     Offset: 0x0
-# CHECK:     VirtualAddress: 0x400000
+# CHECK:     VirtualAddress: 0x{{[0-9A-F]+}}
 # CHECK:   }
 # CHECK:   ProgramHeader {
 # CHECK:     Type: PT_LOAD (0x1)
 # CHECK:     Offset: 0x1000
-# CHECK:     VirtualAddress: 0x401000
+# CHECK:     VirtualAddress: 0x{{[0-9A-F]+}}
 # CHECK:   }
 # CHECK:   ProgramHeader {
 # CHECK:     Type: PT_LOAD (0x1)
 # CHECK:     Offset: 0x2000
-# CHECK:     VirtualAddress: 0x402000
+# CHECK:     VirtualAddress: 0x{{[0-9A-F]+}}
 # CHECK:   }
 # CHECK:   ProgramHeader {
 # CHECK:     Type: PT_DYNAMIC (0x2)
-# CHECK:     Offset: 0x12C
-# CHECK:     VirtualAddress: 0x40012C
+# CHECK:     Offset: 0x144
+# CHECK:     VirtualAddress: 0x{{[0-9A-F]+}}
 # CHECK:   }
 # CHECK: ]
 

Modified: lld/trunk/test/elf/Mips/dynlib-dynamic.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/dynlib-dynamic.test?rev=212949&r1=212948&r2=212949&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/dynlib-dynamic.test (original)
+++ lld/trunk/test/elf/Mips/dynlib-dynamic.test Mon Jul 14 10:31:47 2014
@@ -13,9 +13,9 @@
 # CHECK: LoadName:
 # CHECK: DynamicSection [ (15 entries)
 # CHECK:   Tag        Type                 Name/Value
-# CHECK-NEXT:  0x00000004 HASH                 0xB4
-# CHECK-NEXT:  0x00000005 STRTAB               0x118
-# CHECK-NEXT:  0x00000006 SYMTAB               0xD8
+# CHECK-NEXT:  0x00000004 HASH                 0x{{[0-9A-F]+}}
+# CHECK-NEXT:  0x00000005 STRTAB               0x{{[0-9A-F]+}}
+# CHECK-NEXT:  0x00000006 SYMTAB               0x{{[0-9A-F]+}}
 # CHECK-NEXT:  0x0000000A STRSZ                17 (bytes)
 # CHECK-NEXT:  0x0000000B SYMENT               16 (bytes)
 # CHECK-NEXT:  0x0000001A FINI_ARRAY           0x0

Modified: lld/trunk/test/elf/Mips/dynlib-fileheader.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/dynlib-fileheader.test?rev=212949&r1=212948&r2=212949&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/dynlib-fileheader.test (original)
+++ lld/trunk/test/elf/Mips/dynlib-fileheader.test Mon Jul 14 10:31:47 2014
@@ -24,7 +24,7 @@
 # CHECK:  Type: SharedObject (0x3)
 # CHECK:  Machine: EM_MIPS (0x8)
 # CHECK:  Version: 1
-# CHECK:  Entry: 0xF0
+# CHECK:  Entry: 0x100
 # CHECK:  ProgramHeaderOffset: 0x34
 # CHECK:  SectionHeaderOffset: 0x2100
 # CHECK:  Flags [ (0x70001007)

Modified: lld/trunk/test/elf/Mips/entry-name.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/entry-name.test?rev=212949&r1=212948&r2=212949&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/entry-name.test (original)
+++ lld/trunk/test/elf/Mips/entry-name.test Mon Jul 14 10:31:47 2014
@@ -6,8 +6,8 @@
 # RUN: llvm-objdump -t %t2 | FileCheck %s
 
 # CHECK: SYMBOL TABLE:
-# CHECK: 00400128 g     F .text  00000004 main
-# CHECK: 00000000         *UND*  00000000 __start
+# CHECK: {{[0-9a-f]+}} g     F .text  00000004 main
+# CHECK: 00000000              *UND*  00000000 __start
 
     .global main
     .ent    main

Modified: lld/trunk/test/elf/Mips/hilo16-1.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/hilo16-1.test?rev=212949&r1=212948&r2=212949&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/hilo16-1.test (original)
+++ lld/trunk/test/elf/Mips/hilo16-1.test Mon Jul 14 10:31:47 2014
@@ -8,19 +8,19 @@
 
 # CHECK: Disassembly of section .text:
 # CHECK: glob1:
-# CHECK-NEXT: 400128:  40 00 08 3c  lui  $8, 64
-# CHECK-NEXT: 40012c:  40 00 08 3c  lui  $8, 64
-# CHECK-NEXT: 400130:  40 00 08 3c  lui  $8, 64
-# CHECK-NEXT: 400134:  40 00 08 3c  lui  $8, 64
-# CHECK-NEXT: 400138:  42 00 08 3c  lui  $8, 66
-# CHECK-NEXT: 40013c:  3e 00 08 3c  lui  $8, 62
-# CHECK-NEXT: 400140:  40 02 08 3c  lui  $8, 576
-# CHECK-NEXT: 400144:  40 fe 08 3c  lui  $8, 65088
-# CHECK-NEXT: 400148:  4d 01 08 85  lh   $8, 333($8)
+# CHECK-NEXT: {{[0-9a-f]+}}: 40 00 08 3c  lui     $8, 64
+# CHECK-NEXT: {{[0-9a-f]+}}: 40 00 08 3c  lui     $8, 64
+# CHECK-NEXT: {{[0-9a-f]+}}: 40 00 08 3c  lui     $8, 64
+# CHECK-NEXT: {{[0-9a-f]+}}: 40 00 08 3c  lui     $8, 64
+# CHECK-NEXT: {{[0-9a-f]+}}: 42 00 08 3c  lui     $8, 66
+# CHECK-NEXT: {{[0-9a-f]+}}: 3e 00 08 3c  lui     $8, 62
+# CHECK-NEXT: {{[0-9a-f]+}}: 40 02 08 3c  lui     $8, 576
+# CHECK-NEXT: {{[0-9a-f]+}}: 40 fe 08 3c  lui     $8, 65088
+# CHECK-NEXT: {{[0-9a-f]+}}: 65 01 08 85  lh      $8, 357($8)
 
 # CHECK: SYMBOL TABLE:
-# CHECK: 00400128 g F .text  00000024 glob1
-# CHECK: 0040014c g F .text  00000004 glob2
+# CHECK: {{[0-9a-f]+}} g F .text  00000024 glob1
+# CHECK: {{[0-9a-f]+}} g F .text  00000004 glob2
 
     .global glob1
     .ent    glob1

Modified: lld/trunk/test/elf/Mips/hilo16-2.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/hilo16-2.test?rev=212949&r1=212948&r2=212949&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/hilo16-2.test (original)
+++ lld/trunk/test/elf/Mips/hilo16-2.test Mon Jul 14 10:31:47 2014
@@ -12,26 +12,26 @@
 
 # CHECK: Disassembly of section .text:
 # CHECK: glob1:
-# CHECK-NEXT: 400128:  40 00 08 3c  lui  $8, 64
-# CHECK-NEXT: 40012c:  69 01 08 85  lh   $8, 361($8)
-# CHECK-NEXT: 400130:  40 00 08 3c  lui  $8, 64
-# CHECK-NEXT: 400134:  67 01 08 85  lh   $8, 359($8)
-# CHECK-NEXT: 400138:  40 00 08 3c  lui  $8, 64
-# CHECK-NEXT: 40013c:  67 03 08 85  lh   $8, 871($8)
-# CHECK-NEXT: 400140:  40 00 08 3c  lui  $8, 64
-# CHECK-NEXT: 400144:  69 ff 08 85  lh   $8, -151($8)
-# CHECK-NEXT: 400148:  42 00 08 3c  lui  $8, 66
-# CHECK-NEXT: 40014c:  67 01 08 85  lh   $8, 359($8)
-# CHECK-NEXT: 400150:  3e 00 08 3c  lui  $8, 62
-# CHECK-NEXT: 400154:  69 01 08 85  lh   $8, 361($8)
-# CHECK-NEXT: 400158:  40 02 08 3c  lui  $8, 576
-# CHECK-NEXT: 40015c:  67 01 08 85  lh   $8, 359($8)
-# CHECK-NEXT: 400160:  40 fe 08 3c  lui  $8, 65088
-# CHECK-NEXT: 400164:  69 01 08 85  lh   $8, 361($8)
+# CHECK-NEXT: {{[0-9a-f]+}}:  40 00 08 3c  lui  $8, 64
+# CHECK-NEXT: {{[0-9a-f]+}}:  81 01 08 85  lh   $8, 385($8)
+# CHECK-NEXT: {{[0-9a-f]+}}:  40 00 08 3c  lui  $8, 64
+# CHECK-NEXT: {{[0-9a-f]+}}:  7f 01 08 85  lh   $8, 383($8)
+# CHECK-NEXT: {{[0-9a-f]+}}:  40 00 08 3c  lui  $8, 64
+# CHECK-NEXT: {{[0-9a-f]+}}:  7f 03 08 85  lh   $8, 895($8)
+# CHECK-NEXT: {{[0-9a-f]+}}:  40 00 08 3c  lui  $8, 64
+# CHECK-NEXT: {{[0-9a-f]+}}:  81 ff 08 85  lh   $8, -127($8)
+# CHECK-NEXT: {{[0-9a-f]+}}:  42 00 08 3c  lui  $8, 66
+# CHECK-NEXT: {{[0-9a-f]+}}:  7f 01 08 85  lh   $8, 383($8)
+# CHECK-NEXT: {{[0-9a-f]+}}:  3e 00 08 3c  lui  $8, 62
+# CHECK-NEXT: {{[0-9a-f]+}}:  81 01 08 85  lh   $8, 385($8)
+# CHECK-NEXT: {{[0-9a-f]+}}:  40 02 08 3c  lui  $8, 576
+# CHECK-NEXT: {{[0-9a-f]+}}:  7f 01 08 85  lh   $8, 383($8)
+# CHECK-NEXT: {{[0-9a-f]+}}:  40 fe 08 3c  lui  $8, 65088
+# CHECK-NEXT: {{[0-9a-f]+}}:  81 01 08 85  lh   $8, 385($8)
 
 # CHECK: SYMBOL TABLE:
-# CHECK: 00400128  g F .text  00000040 glob1
-# CHECK: 00400168  g F .text  00000004 glob2
+# CHECK: {{[0-9a-f]+}}  g F .text  00000040 glob1
+# CHECK: {{[0-9a-f]+}}  g F .text  00000004 glob2
 
     .global glob1
     .ent    glob1

Modified: lld/trunk/test/elf/Mips/hilo16-3.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/hilo16-3.test?rev=212949&r1=212948&r2=212949&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/hilo16-3.test (original)
+++ lld/trunk/test/elf/Mips/hilo16-3.test Mon Jul 14 10:31:47 2014
@@ -12,20 +12,20 @@
 
 # CHECK: Disassembly of section .text:
 # CHECK: glob1:
-# CHECK-NEXT:  f0:  01 00 08 3c  lui  $8, 1
-# CHECK-NEXT:  f4:  01 8f 08 85  lh   $8, -28927($8)
-# CHECK-NEXT:  f8:  01 00 08 3c  lui  $8, 1
-# CHECK-NEXT:  fc:  f7 8e 08 85  lh   $8, -28937($8)
-# CHECK-NEXT: 100:  01 00 08 3c  lui  $8, 1
-# CHECK-NEXT: 104:  ef 90 08 85  lh   $8, -28433($8)
-# CHECK-NEXT: 108:  01 00 08 3c  lui  $8, 1
-# CHECK-NEXT: 10c:  e9 8c 08 85  lh   $8, -29463($8)
-# CHECK-NEXT: 110:  03 00 08 3c  lui  $8, 3
-# CHECK-NEXT: 114:  df 8e 08 85  lh   $8, -28961($8)
+# CHECK-NEXT: {{[0-9a-f]+}}: 01 00 08 3c  lui     $8, 1
+# CHECK-NEXT: {{[0-9a-f]+}}: f1 8e 08 85  lh      $8, -28943($8)
+# CHECK-NEXT: {{[0-9a-f]+}}: 01 00 08 3c  lui     $8, 1
+# CHECK-NEXT: {{[0-9a-f]+}}: e7 8e 08 85  lh      $8, -28953($8)
+# CHECK-NEXT: {{[0-9a-f]+}}: 01 00 08 3c  lui     $8, 1
+# CHECK-NEXT: {{[0-9a-f]+}}: df 90 08 85  lh      $8, -28449($8)
+# CHECK-NEXT: {{[0-9a-f]+}}: 01 00 08 3c  lui     $8, 1
+# CHECK-NEXT: {{[0-9a-f]+}}: d9 8c 08 85  lh      $8, -29479($8)
+# CHECK-NEXT: {{[0-9a-f]+}}: 03 00 08 3c  lui     $8, 3
+# CHECK-NEXT: {{[0-9a-f]+}}: cf 8e 08 85  lh      $8, -28977($8)
 
 # CHECK: SYMBOL TABLE:
-# CHECK: 000000f0  g F  .text  00000028 glob1
-# CHECK: 00008ff0  g    *ABS*  00000000 _gp_disp
+# CHECK: {{[0-9a-f]+}}  g F  .text  00000028 glob1
+# CHECK: {{[0-9a-f]+}}  g    *ABS*  00000000 _gp_disp
 
     .global glob1
     .ent    glob1

Modified: lld/trunk/test/elf/Mips/interpreter.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/Mips/interpreter.test?rev=212949&r1=212948&r2=212949&view=diff
==============================================================================
--- lld/trunk/test/elf/Mips/interpreter.test (original)
+++ lld/trunk/test/elf/Mips/interpreter.test Mon Jul 14 10:31:47 2014
@@ -6,7 +6,7 @@
 # RUN: llvm-objdump -s %t2 | FileCheck %s
 
 # CHECK: Contents of section .interp:
-# CHECK-NEXT: 4000f4 2f6c6962 2f6c642e 736f2e31 00 /lib/ld.so.1.
+# CHECK-NEXT: {{[0-9a-f]+}} 2f6c6962 2f6c642e 736f2e31 00 /lib/ld.so.1.
 
     .global main
     .ent    main





More information about the llvm-commits mailing list