[lld] r218429 - [mach-o] fix test case to work with latest llvm-objdump output

[Kevin Enderby]

Hi Rui,

Likely you don’t have the change I made in the llvm trunk:

	r218423  Flush out enough of llvm-objdump’s SymbolizerSymbolLookUp() for Mach-O files …

If your getting #4174 instead of that being the symbol _a2 at that address.  If your still having trouble after picking up that llvm update on trunk let me and Nick know and we’ll look into it.

Kev

On Sep 24, 2014, at 5:55 PM, Rui Ueyama <ruiu at google.com> wrote:

> Buildbots seem fine with that patch. Weird. Looking ...
> 
> On Wed, Sep 24, 2014 at 5:47 PM, Rui Ueyama <ruiu at google.com> wrote:
> Nick,
> 
> Your new test seems to fail at least on my Linux machine. Here's the log.
> 
> Command Output (stderr):
> --
> /usr/local/google/home/ruiu/src/llvm/tools/lld/test/mach-o/arm-interworking-movw.yaml:344:14: error: expected string not found in input
> # CODE-NEXT: movw r2, _a2
>              ^
> <stdin>:22:2: note: scanning from here
>  1036: 4e 20 01 e3 movw r2, #4174
>  ^
> <stdin>:22:20: note: possible intended match here
>  1036: 4e 20 01 e3 movw r2, #4174
>                    ^
> 
> --
> 
> ********************
> Testing: 0 .. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90.. 
> Testing Time: 2.39s
> ********************
> Failing Tests (1):
>     lld :: mach-o/arm-interworking-movw.yaml
> 
>   Expected Passes    : 525
>   Expected Failures  : 1
>   Unsupported Tests  : 4
>   Unexpected Failures: 1
> ninja: build stopped: subcommand failed.
> 
> On Wed, Sep 24, 2014 at 4:55 PM, Nick Kledzik <kledzik at apple.com> wrote:
> Author: kledzik
> Date: Wed Sep 24 18:55:06 2014
> New Revision: 218429
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=218429&view=rev
> Log:
> [mach-o] fix test case to work with latest llvm-objdump output
> 
> Take opporunity to clean up test to only run llvm-objdump once now that
> llvm-objdump can disassemble mixed thumb and arm code.
> 
> Modified:
>     lld/trunk/test/mach-o/arm-interworking-movw.yaml
> 
> Modified: lld/trunk/test/mach-o/arm-interworking-movw.yaml
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/arm-interworking-movw.yaml?rev=218429&r1=218428&r2=218429&view=diff
> ==============================================================================
> --- lld/trunk/test/mach-o/arm-interworking-movw.yaml (original)
> +++ lld/trunk/test/mach-o/arm-interworking-movw.yaml Wed Sep 24 18:55:06 2014
> @@ -1,9 +1,8 @@
>  # REQUIRES: arm
> -# RUN: lld -flavor darwin -arch armv7 -r -print_atoms %s -o %t  | FileCheck %s \
> -# RUN: && lld -flavor darwin -arch armv7 -dylib -print_atoms %t -o %t2 \
> -# RUN:     %p/Inputs/libSystem.yaml -sectalign __TEXT __text 0x1000  | FileCheck %s \
> -# RUN: && llvm-objdump -d -macho -triple=armv7-apple-ios %t2 | FileCheck -check-prefix=ACODE %s \
> -# RUN: && llvm-objdump -d -macho -triple=thumbv7-apple-ios %t2 | FileCheck -check-prefix=TCODE %s
> +# RUN: lld -flavor darwin -arch armv7 -r -print_atoms %s -o %t  | FileCheck %s
> +# RUN: lld -flavor darwin -arch armv7 -dylib -print_atoms %t -o %t2 \
> +# RUN:     %p/Inputs/libSystem.yaml -sectalign __TEXT __text 0x1000  | FileCheck %s
> +# RUN: llvm-objdump -d -macho %t2 | FileCheck -check-prefix=CODE %s
>  #
>  # Test thumb and arm branches round trip through -r.
>  # Test movw/movt pairs have low bit set properly for thumb vs arm.
> @@ -326,26 +325,26 @@ local-symbols:
>  # CHECK:   - name:            _a2
> 
> 
> -# TCODE: _t1:
> -# TCODE-NEXT:                  movw    r0, #4133
> -# TCODE-NEXT:                   movt   r0, #0
> -# TCODE-NEXT:                   movw   r1, #1
> -# TCODE-NEXT:                   movt   r1, #0
> -# TCODE-NEXT:                   movw   r2, #4174
> -# TCODE-NEXT:                   movt   r2, #0
> -# TCODE-NEXT:                   movw   r3, #42
> -# TCODE-NEXT:                   movt   r3, #0
> +# CODE: _t1:
> +# CODE-NEXT:                    movw   r0, #4133
> +# CODE-NEXT:                   movt    r0, #0
> +# CODE-NEXT:                   movw    r1, #1
> +# CODE-NEXT:                   movt    r1, #0
> +# CODE-NEXT:                   movw    r2, #4174
> +# CODE-NEXT:                   movt    r2, #0
> +# CODE-NEXT:                   movw    r3, #42
> +# CODE-NEXT:                   movt    r3, #0
> 
> 
> -# ACODE: _a1:
> -# ACODE-NEXT:                  movw    r0, #4133
> -# ACODE-NEXT:                   movt   r0, #0
> -# ACODE-NEXT:                   movw   r1, #65495
> -# ACODE-NEXT:                   movt   r1, #65535
> -# ACODE-NEXT:                   movw   r2, #4174
> -# ACODE-NEXT:                   movt   r2, #0
> -# ACODE-NEXT:                   movw   r3, #0
> -# ACODE-NEXT:                   movt   r3, #0
> +# CODE: _a1:
> +# CODE-NEXT:                    movw   r0, #4133
> +# CODE-NEXT:                   movt    r0, #0
> +# CODE-NEXT:                   movw    r1, #65495
> +# CODE-NEXT:                   movt    r1, #65535
> +# CODE-NEXT:                   movw    r2, _a2
> +# CODE-NEXT:                   movt    r2, #0
> +# CODE-NEXT:                   movw    r3, #0
> +# CODE-NEXT:                   movt    r3, #0
> 
> 
> 
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20140924/a11589a5/attachment.html>