merge-string.s test failing on windows

[George Rimar via llvm-commits]

Hi,

I noticed that merge-string.s test is failing. Actually that happens from its being commited (3 days ago) for me,
I just thought that its probably because of my bit outdated llvm code, but today updated to top revision and it still fails.

20>  Command 3 Stderr:
20>  C:\access_softek\llvm\tools\lld\test\elf2\merge-string.s:78:16: error: expected string not found in input
20>
20>  // CHECK-NEXT: Value: 0x121
20>
20>                 ^
20>
20>  <stdin>:268:12: note: scanning from here
20>
20>   Name: bar (1)
20>
20>             ^
20>
20>  <stdin>:269:2: note: possible intended match here
20>
20>   Value: 0x100000120

It is because of next checks:

// CHECK:      Name:    bar
// CHECK-NEXT: Value:   0x121

// CHECK:      Name:    foo
// CHECK-NEXT: Value:   0x120

// CHECK:      Name: zed
// CHECK-NEXT: Value: 0x124
// CHECK-NEXT: Size: 0

But actual llvm-readobj output is:

  Symbol {
    Name: bar (1)
    Value: 0x100000120
    Size: 0
    Binding: Local (0x0)
    Type: None (0x0)
    Other: 0
    Section: .rodata (0x1)
  }
  Symbol {
    Name: foo (5)
    Value: 0x10000011F
    Size: 0
    Binding: Local (0x0)
    Type: None (0x0)
    Other: 0
    Section: .rodata (0x1)
  }
  Symbol {
    Name: zed (9)
    Value: 0x100000123
    Size: 0
    Binding: Local (0x0)
    Type: None (0x0)
    Other: 0
    Section: .rodata (0x2)
  }

I am not sure why buildbots don`t fail.

Best regards,
George.