<div dir="ltr">Nick,<div><br></div><div>Your new test seems to fail at least on my Linux machine. Here's the log.</div><div><br></div><div><pre style="color:rgb(0,0,0)">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.</pre></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 24, 2014 at 4:55 PM, Nick Kledzik <span dir="ltr"><<a href="mailto:kledzik@apple.com" target="_blank">kledzik@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: kledzik<br>
Date: Wed Sep 24 18:55:06 2014<br>
New Revision: 218429<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=218429&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=218429&view=rev</a><br>
Log:<br>
[mach-o] fix test case to work with latest llvm-objdump output<br>
<br>
Take opporunity to clean up test to only run llvm-objdump once now that<br>
llvm-objdump can disassemble mixed thumb and arm code.<br>
<br>
Modified:<br>
lld/trunk/test/mach-o/arm-interworking-movw.yaml<br>
<br>
Modified: lld/trunk/test/mach-o/arm-interworking-movw.yaml<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/arm-interworking-movw.yaml?rev=218429&r1=218428&r2=218429&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/arm-interworking-movw.yaml?rev=218429&r1=218428&r2=218429&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/mach-o/arm-interworking-movw.yaml (original)<br>
+++ lld/trunk/test/mach-o/arm-interworking-movw.yaml Wed Sep 24 18:55:06 2014<br>
@@ -1,9 +1,8 @@<br>
# REQUIRES: arm<br>
-# RUN: lld -flavor darwin -arch armv7 -r -print_atoms %s -o %t | FileCheck %s \<br>
-# RUN: && lld -flavor darwin -arch armv7 -dylib -print_atoms %t -o %t2 \<br>
-# RUN: %p/Inputs/libSystem.yaml -sectalign __TEXT __text 0x1000 | FileCheck %s \<br>
-# RUN: && llvm-objdump -d -macho -triple=armv7-apple-ios %t2 | FileCheck -check-prefix=ACODE %s \<br>
-# RUN: && llvm-objdump -d -macho -triple=thumbv7-apple-ios %t2 | FileCheck -check-prefix=TCODE %s<br>
+# RUN: lld -flavor darwin -arch armv7 -r -print_atoms %s -o %t | FileCheck %s<br>
+# RUN: lld -flavor darwin -arch armv7 -dylib -print_atoms %t -o %t2 \<br>
+# RUN: %p/Inputs/libSystem.yaml -sectalign __TEXT __text 0x1000 | FileCheck %s<br>
+# RUN: llvm-objdump -d -macho %t2 | FileCheck -check-prefix=CODE %s<br>
#<br>
# Test thumb and arm branches round trip through -r.<br>
# Test movw/movt pairs have low bit set properly for thumb vs arm.<br>
@@ -326,26 +325,26 @@ local-symbols:<br>
# CHECK: - name: _a2<br>
<br>
<br>
-# TCODE: _t1:<br>
-# TCODE-NEXT: movw r0, #4133<br>
-# TCODE-NEXT: movt r0, #0<br>
-# TCODE-NEXT: movw r1, #1<br>
-# TCODE-NEXT: movt r1, #0<br>
-# TCODE-NEXT: movw r2, #4174<br>
-# TCODE-NEXT: movt r2, #0<br>
-# TCODE-NEXT: movw r3, #42<br>
-# TCODE-NEXT: movt r3, #0<br>
+# CODE: _t1:<br>
+# CODE-NEXT: movw r0, #4133<br>
+# CODE-NEXT: movt r0, #0<br>
+# CODE-NEXT: movw r1, #1<br>
+# CODE-NEXT: movt r1, #0<br>
+# CODE-NEXT: movw r2, #4174<br>
+# CODE-NEXT: movt r2, #0<br>
+# CODE-NEXT: movw r3, #42<br>
+# CODE-NEXT: movt r3, #0<br>
<br>
<br>
-# ACODE: _a1:<br>
-# ACODE-NEXT: movw r0, #4133<br>
-# ACODE-NEXT: movt r0, #0<br>
-# ACODE-NEXT: movw r1, #65495<br>
-# ACODE-NEXT: movt r1, #65535<br>
-# ACODE-NEXT: movw r2, #4174<br>
-# ACODE-NEXT: movt r2, #0<br>
-# ACODE-NEXT: movw r3, #0<br>
-# ACODE-NEXT: movt r3, #0<br>
+# CODE: _a1:<br>
+# CODE-NEXT: movw r0, #4133<br>
+# CODE-NEXT: movt r0, #0<br>
+# CODE-NEXT: movw r1, #65495<br>
+# CODE-NEXT: movt r1, #65535<br>
+# CODE-NEXT: movw r2, _a2<br>
+# CODE-NEXT: movt r2, #0<br>
+# CODE-NEXT: movw r3, #0<br>
+# CODE-NEXT: movt r3, #0<br>
<br>
<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>