diff options
Diffstat (limited to 'lldb/lit/SymbolFile/NativePDB')
14 files changed, 42 insertions, 55 deletions
diff --git a/lldb/lit/SymbolFile/NativePDB/ast-reconstruction.cpp b/lldb/lit/SymbolFile/NativePDB/ast-reconstruction.cpp index 3ecbbd09f9d..dae6e6195fa 100644 --- a/lldb/lit/SymbolFile/NativePDB/ast-reconstruction.cpp +++ b/lldb/lit/SymbolFile/NativePDB/ast-reconstruction.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Test various interesting cases for AST reconstruction. -// RUN: %clang_cl /Z7 /GS- /GR- /c /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/ast-reconstruction.lldbinit 2>&1 | FileCheck %s diff --git a/lldb/lit/SymbolFile/NativePDB/bitfields.cpp b/lldb/lit/SymbolFile/NativePDB/bitfields.cpp index 0f477b19d6e..301ae3067d1 100644 --- a/lldb/lit/SymbolFile/NativePDB/bitfields.cpp +++ b/lldb/lit/SymbolFile/NativePDB/bitfields.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Test various interesting cases for AST reconstruction. -// RUN: %clang_cl /Z7 /GS- /GR- /std:c++latest -Xclang -fkeep-static-consts /c /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/bitfields.lldbinit 2>&1 | FileCheck %s diff --git a/lldb/lit/SymbolFile/NativePDB/disassembly.cpp b/lldb/lit/SymbolFile/NativePDB/disassembly.cpp index e9d5eacb6ce..3553f29ce55 100644 --- a/lldb/lit/SymbolFile/NativePDB/disassembly.cpp +++ b/lldb/lit/SymbolFile/NativePDB/disassembly.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Test that we can show disassembly and source. -// RUN: %clang_cl -m64 /Z7 /GS- /GR- /c /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/disassembly.lldbinit | FileCheck %s @@ -19,21 +18,21 @@ int main(int argc, char **argv) { // CHECK: (lldb) disassemble --flavor=intel -m -n main -// CHECK: 13 int foo() { return 42; } -// CHECK-NEXT: 14 -// CHECK-NEXT: ** 15 int main(int argc, char **argv) { +// CHECK: 12 int foo() { return 42; } +// CHECK-NEXT: 13 +// CHECK-NEXT: ** 14 int main(int argc, char **argv) { // CHECK: disassembly.cpp.tmp.exe`main: // CHECK-NEXT: disassembly.cpp.tmp.exe[{{.*}}] <+0>: sub rsp, 0x38 // CHECK-NEXT: disassembly.cpp.tmp.exe[{{.*}}] <+4>: mov dword ptr [rsp + 0x34], 0x0 // CHECK-NEXT: disassembly.cpp.tmp.exe[{{.*}}] <+12>: mov qword ptr [rsp + 0x28], rdx // CHECK-NEXT: disassembly.cpp.tmp.exe[{{.*}}] <+17>: mov dword ptr [rsp + 0x24], ecx -// CHECK: ** 16 foo(); -// CHECK: disassembly.cpp.tmp.exe[{{.*}}] <+21>: call {{.*}} ; foo at disassembly.cpp:13 +// CHECK: ** 15 foo(); +// CHECK: disassembly.cpp.tmp.exe[{{.*}}] <+21>: call {{.*}} ; foo at disassembly.cpp:12 // CHECK-NEXT: disassembly.cpp.tmp.exe[{{.*}}] <+26>: xor ecx, ecx // CHECK-NEXT: disassembly.cpp.tmp.exe[{{.*}}] <+28>: mov dword ptr [rsp + 0x20], eax -// CHECK: ** 17 return 0; -// CHECK-NEXT: 18 } -// CHECK-NEXT: 19 +// CHECK: ** 16 return 0; +// CHECK-NEXT: 17 } +// CHECK-NEXT: 18 // CHECK: disassembly.cpp.tmp.exe[{{.*}}] <+32>: mov eax, ecx // CHECK-NEXT: disassembly.cpp.tmp.exe[{{.*}}] <+34>: add rsp, 0x38 // CHECK-NEXT: disassembly.cpp.tmp.exe[{{.*}}] <+38>: ret diff --git a/lldb/lit/SymbolFile/NativePDB/function-types-builtins.cpp b/lldb/lit/SymbolFile/NativePDB/function-types-builtins.cpp index 467e7d1d137..ac76955197a 100644 --- a/lldb/lit/SymbolFile/NativePDB/function-types-builtins.cpp +++ b/lldb/lit/SymbolFile/NativePDB/function-types-builtins.cpp @@ -1,8 +1,7 @@ // clang-format off // REQUIRES: lld -// RUN: %clang_cl /Z7 /GS- /GR- /c -Xclang -fkeep-static-consts /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/function-types-builtins.lldbinit | FileCheck %s diff --git a/lldb/lit/SymbolFile/NativePDB/function-types-calling-conv.cpp b/lldb/lit/SymbolFile/NativePDB/function-types-calling-conv.cpp index 60ab86fd04d..cd13159d508 100644 --- a/lldb/lit/SymbolFile/NativePDB/function-types-calling-conv.cpp +++ b/lldb/lit/SymbolFile/NativePDB/function-types-calling-conv.cpp @@ -1,8 +1,7 @@ // clang-format off // REQUIRES: lld -// RUN: %clang_cl -m32 /Z7 /GS- /GR- /c -Xclang -fkeep-static-consts /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --arch=32 --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/function-types-calling-conv.lldbinit | FileCheck %s diff --git a/lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp b/lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp index e398a1d1abc..ff7f6bbd479 100644 --- a/lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp +++ b/lldb/lit/SymbolFile/NativePDB/function-types-classes.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Test that we can display function signatures with class types. -// RUN: %clang_cl /Z7 /GS- /GR- /c -fstandalone-debug -Xclang -fkeep-static-consts /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/function-types-classes.lldbinit | FileCheck %s diff --git a/lldb/lit/SymbolFile/NativePDB/global-classes.cpp b/lldb/lit/SymbolFile/NativePDB/global-classes.cpp index 38cd8eb52ca..2fb01bd8b4f 100644 --- a/lldb/lit/SymbolFile/NativePDB/global-classes.cpp +++ b/lldb/lit/SymbolFile/NativePDB/global-classes.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Test that we can display tag types. -// RUN: %clang_cl /Z7 /GS- /GR- /c -Xclang -fkeep-static-consts /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/globals-classes.lldbinit | FileCheck %s diff --git a/lldb/lit/SymbolFile/NativePDB/globals-bss.cpp b/lldb/lit/SymbolFile/NativePDB/globals-bss.cpp index 15d5b1279e1..c10c3c19628 100644 --- a/lldb/lit/SymbolFile/NativePDB/globals-bss.cpp +++ b/lldb/lit/SymbolFile/NativePDB/globals-bss.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Make sure we can read variables from BSS -// RUN: %clang_cl /Z7 /GS- /GR- /c /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: llvm-readobj -s %t.exe | FileCheck --check-prefix=BSS %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/globals-bss.lldbinit 2>&1 | FileCheck %s diff --git a/lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp b/lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp index 31a191c87a7..79594900e4c 100644 --- a/lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp +++ b/lldb/lit/SymbolFile/NativePDB/globals-fundamental.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Test that we can display tag types. -// RUN: %clang_cl /Z7 /GS- /GR- /c -Xclang -fkeep-static-consts /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/globals-fundamental.lldbinit | FileCheck %s diff --git a/lldb/lit/SymbolFile/NativePDB/nested-types.cpp b/lldb/lit/SymbolFile/NativePDB/nested-types.cpp index 0c20315cf22..5693f7f320f 100644 --- a/lldb/lit/SymbolFile/NativePDB/nested-types.cpp +++ b/lldb/lit/SymbolFile/NativePDB/nested-types.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Test various interesting cases for AST reconstruction. -// RUN: %clang_cl /Z7 /GS- /GR- -Xclang -fkeep-static-consts /c /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/nested-types.lldbinit 2>&1 | FileCheck %s diff --git a/lldb/lit/SymbolFile/NativePDB/s_constant.cpp b/lldb/lit/SymbolFile/NativePDB/s_constant.cpp index 28e0d8d1788..7603a4daba4 100644 --- a/lldb/lit/SymbolFile/NativePDB/s_constant.cpp +++ b/lldb/lit/SymbolFile/NativePDB/s_constant.cpp @@ -4,7 +4,7 @@ // Test that we can display S_CONSTANT records. // RUN: llvm-mc -filetype=obj -triple=x86_64-pc-win32 %p/Inputs/s_constant.s > %t.obj -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib --mode=link -o %t.exe -- %t.obj // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/s_constant.lldbinit | FileCheck %s diff --git a/lldb/lit/SymbolFile/NativePDB/simple-breakpoints.cpp b/lldb/lit/SymbolFile/NativePDB/simple-breakpoints.cpp index ceafd816e3c..a590fab1faa 100644 --- a/lldb/lit/SymbolFile/NativePDB/simple-breakpoints.cpp +++ b/lldb/lit/SymbolFile/NativePDB/simple-breakpoints.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Test that we can set simple breakpoints using PDB on any platform. -// RUN: %clang_cl /Z7 /GS- /GR- /c /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/breakpoints.lldbinit | FileCheck %s @@ -38,27 +37,27 @@ int main(int argc, char **argv) { // CHECK: Current executable set to '{{.*}}simple-breakpoints.cpp.tmp.exe' // CHECK: (lldb) break set -n main // CHECK: Breakpoint 1: where = simple-breakpoints.cpp.tmp.exe`main + {{[0-9]+}} -// CHECK-SAME: at simple-breakpoints.cpp:31 +// CHECK-SAME: at simple-breakpoints.cpp:30 // CHECK: (lldb) break set -n OvlGlobalFn // CHECK: Breakpoint 2: 3 locations. // CHECK: (lldb) break set -n StaticFn // CHECK: Breakpoint 3: where = simple-breakpoints.cpp.tmp.exe`StaticFn + {{[0-9]+}} -// CHECK-SAME: at simple-breakpoints.cpp:24 +// CHECK-SAME: at simple-breakpoints.cpp:23 // CHECK: (lldb) break set -n DoesntExist // CHECK: Breakpoint 4: no locations (pending). // CHECK: (lldb) break list // CHECK: Current breakpoints: // CHECK: 1: name = 'main', locations = 1 // CHECK: 1.1: where = simple-breakpoints.cpp.tmp.exe`main + {{[0-9]+}} -// CHECK-SAME: at simple-breakpoints.cpp:31 +// CHECK-SAME: at simple-breakpoints.cpp:30 // CHECK: 2: name = 'OvlGlobalFn', locations = 3 // CHECK: 2.1: where = simple-breakpoints.cpp.tmp.exe`OvlGlobalFn + {{[0-9]+}} -// CHECK-SAME: at simple-breakpoints.cpp:13 +// CHECK-SAME: at simple-breakpoints.cpp:12 // CHECK: 2.2: where = simple-breakpoints.cpp.tmp.exe`OvlGlobalFn -// CHECK-SAME: at simple-breakpoints.cpp:16 +// CHECK-SAME: at simple-breakpoints.cpp:15 // CHECK: 2.3: where = simple-breakpoints.cpp.tmp.exe`OvlGlobalFn + {{[0-9]+}} -// CHECK-SAME: at simple-breakpoints.cpp:20 +// CHECK-SAME: at simple-breakpoints.cpp:19 // CHECK: 3: name = 'StaticFn', locations = 1 // CHECK: 3.1: where = simple-breakpoints.cpp.tmp.exe`StaticFn + {{[0-9]+}} -// CHECK-SAME: at simple-breakpoints.cpp:24 +// CHECK-SAME: at simple-breakpoints.cpp:23 // CHECK: 4: name = 'DoesntExist', locations = 0 (pending) diff --git a/lldb/lit/SymbolFile/NativePDB/source-list.cpp b/lldb/lit/SymbolFile/NativePDB/source-list.cpp index 36cf5f75ebe..6b749b082e3 100644 --- a/lldb/lit/SymbolFile/NativePDB/source-list.cpp +++ b/lldb/lit/SymbolFile/NativePDB/source-list.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Test that we can set display source of functions. -// RUN: %clang_cl /Z7 /GS- /GR- /c /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/source-list.lldbinit | FileCheck %s @@ -27,17 +26,17 @@ int main(int argc, char **argv) { // CHECK: (lldb) source list -n main // CHECK: File: {{.*}}source-list.cpp -// CHECK: 11 -// CHECK: 12 // Some context lines before -// CHECK: 13 // the function. +// CHECK: 10 +// CHECK: 11 // Some context lines before +// CHECK: 12 // the function. +// CHECK: 13 // CHECK: 14 -// CHECK: 15 -// CHECK: 16 int main(int argc, char **argv) { -// CHECK: 17 // Here are some comments. -// CHECK: 18 // That we should print when listing source. -// CHECK: 19 return 0; -// CHECK: 20 } -// CHECK: 21 -// CHECK: 22 // Some context lines after -// CHECK: 23 // the function. -// CHECK: 24 +// CHECK: 15 int main(int argc, char **argv) { +// CHECK: 16 // Here are some comments. +// CHECK: 17 // That we should print when listing source. +// CHECK: 18 return 0; +// CHECK: 19 } +// CHECK: 20 +// CHECK: 21 // Some context lines after +// CHECK: 22 // the function. +// CHECK: 23 diff --git a/lldb/lit/SymbolFile/NativePDB/tag-types.cpp b/lldb/lit/SymbolFile/NativePDB/tag-types.cpp index d0165c1506e..947fe20d17d 100644 --- a/lldb/lit/SymbolFile/NativePDB/tag-types.cpp +++ b/lldb/lit/SymbolFile/NativePDB/tag-types.cpp @@ -2,8 +2,7 @@ // REQUIRES: lld // Test that we can display tag types. -// RUN: %clang_cl /Z7 /GS- /GR- /c /Fo%t.obj -- %s -// RUN: lld-link /DEBUG /nodefaultlib /entry:main /OUT:%t.exe /PDB:%t.pdb -- %t.obj +// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/tag-types.lldbinit | FileCheck %s |
