Lgtm<br><div class="gmail_quote"><div dir="ltr">On Fri, Nov 2, 2018 at 3:03 AM Aleksandr Urakov via Phabricator <<a href="mailto:reviews@reviews.llvm.org">reviews@reviews.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">aleksandr.urakov created this revision.<br>
aleksandr.urakov added reviewers: zturner, stella.stamenova.<br>
aleksandr.urakov added a project: LLDB.<br>
Herald added subscribers: lldb-commits, teemperor.<br>
<br>
This patch fixes the NativePDB tests to make them work from x86 command line too.<br>
<br>
<br>
Repository:<br>
  rLLDB LLDB<br>
<br>
<a href="https://reviews.llvm.org/D54031" rel="noreferrer" target="_blank">https://reviews.llvm.org/D54031</a><br>
<br>
Files:<br>
  lit/SymbolFile/NativePDB/disassembly.cpp<br>
  lit/SymbolFile/NativePDB/simple-breakpoints.cpp<br>
  lit/SymbolFile/NativePDB/tag-types.cpp<br>
<br>
<br>
Index: lit/SymbolFile/NativePDB/tag-types.cpp<br>
===================================================================<br>
--- lit/SymbolFile/NativePDB/tag-types.cpp<br>
+++ lit/SymbolFile/NativePDB/tag-types.cpp<br>
@@ -141,7 +141,7 @@<br>
 }<br>
<br>
 // CHECK:      (lldb) target create "{{.*}}tag-types.cpp.tmp.exe"<br>
-// CHECK-NEXT: Current executable set to '{{.*}}tag-types.cpp.tmp.exe' (x86_64).<br>
+// CHECK-NEXT: Current executable set to '{{.*}}tag-types.cpp.tmp.exe'<br>
 // CHECK-NEXT: (lldb) command source -s 0 '{{.*}}tag-types.lldbinit'<br>
 // CHECK-NEXT: Executing commands in '{{.*}}tag-types.lldbinit'.<br>
 // CHECK-NEXT: (lldb) type lookup -- Struct<br>
Index: lit/SymbolFile/NativePDB/simple-breakpoints.cpp<br>
===================================================================<br>
--- lit/SymbolFile/NativePDB/simple-breakpoints.cpp<br>
+++ lit/SymbolFile/NativePDB/simple-breakpoints.cpp<br>
@@ -35,30 +35,30 @@<br>
<br>
<br>
 // CHECK:      (lldb) target create "{{.*}}simple-breakpoints.cpp.tmp.exe"<br>
-// CHECK:      Current executable set to '{{.*}}simple-breakpoints.cpp.tmp.exe' (x86_64).<br>
+// CHECK:      Current executable set to '{{.*}}simple-breakpoints.cpp.tmp.exe'<br>
 // CHECK:      (lldb) break set -n main<br>
-// CHECK:      Breakpoint 1: where = simple-breakpoints.cpp.tmp.exe`main + 21<br>
+// CHECK:      Breakpoint 1: where = simple-breakpoints.cpp.tmp.exe`main + {{[0-9]+}}<br>
 // CHECK-SAME:               at simple-breakpoints.cpp:31<br>
 // CHECK:      (lldb) break set -n OvlGlobalFn<br>
 // CHECK:      Breakpoint 2: 3 locations.<br>
 // CHECK:      (lldb) break set -n StaticFn<br>
-// CHECK:      Breakpoint 3: where = simple-breakpoints.cpp.tmp.exe`StaticFn + 5<br>
+// CHECK:      Breakpoint 3: where = simple-breakpoints.cpp.tmp.exe`StaticFn + {{[0-9]+}}<br>
 // CHECK-SAME:               at simple-breakpoints.cpp:24<br>
 // CHECK:      (lldb) break set -n DoesntExist<br>
 // CHECK:      Breakpoint 4: no locations (pending).<br>
 // CHECK:      (lldb) break list<br>
 // CHECK:      Current breakpoints:<br>
 // CHECK:      1: name = 'main', locations = 1<br>
-// CHECK:        1.1: where = simple-breakpoints.cpp.tmp.exe`main + 21<br>
+// CHECK:        1.1: where = simple-breakpoints.cpp.tmp.exe`main + {{[0-9]+}}<br>
 // CHECK-SAME:                at simple-breakpoints.cpp:31<br>
 // CHECK:      2: name = 'OvlGlobalFn', locations = 3<br>
-// CHECK:        2.1: where = simple-breakpoints.cpp.tmp.exe`OvlGlobalFn + 5<br>
+// CHECK:        2.1: where = simple-breakpoints.cpp.tmp.exe`OvlGlobalFn + {{[0-9]+}}<br>
 // CHECK-SAME:                at simple-breakpoints.cpp:13<br>
 // CHECK:        2.2: where = simple-breakpoints.cpp.tmp.exe`OvlGlobalFn<br>
 // CHECK-SAME:                at simple-breakpoints.cpp:16<br>
-// CHECK:        2.3: where = simple-breakpoints.cpp.tmp.exe`OvlGlobalFn + 17<br>
+// CHECK:        2.3: where = simple-breakpoints.cpp.tmp.exe`OvlGlobalFn + {{[0-9]+}}<br>
 // CHECK-SAME:                at simple-breakpoints.cpp:20<br>
 // CHECK:      3: name = 'StaticFn', locations = 1<br>
-// CHECK:        3.1: where = simple-breakpoints.cpp.tmp.exe`StaticFn + 5<br>
+// CHECK:        3.1: where = simple-breakpoints.cpp.tmp.exe`StaticFn + {{[0-9]+}}<br>
 // CHECK-SAME:                at simple-breakpoints.cpp:24<br>
 // CHECK:      4: name = 'DoesntExist', locations = 0 (pending)<br>
Index: lit/SymbolFile/NativePDB/disassembly.cpp<br>
===================================================================<br>
--- lit/SymbolFile/NativePDB/disassembly.cpp<br>
+++ lit/SymbolFile/NativePDB/disassembly.cpp<br>
@@ -2,7 +2,7 @@<br>
 // REQUIRES: lld<br>
<br>
 // Test that we can show disassembly and source.<br>
-// RUN: clang-cl /Z7 /GS- /GR- /c /Fo%t.obj -- %s<br>
+// RUN: clang-cl -m64 /Z7 /GS- /GR- /c /Fo%t.obj -- %s<br>
 // RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj<br>
 // RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb -f %t.exe -s \<br>
 // RUN:     %p/Inputs/disassembly.lldbinit | FileCheck %s<br>
<br>
<br>
</blockquote></div>