Skip to content

Commit cf3464b

Browse files
authored
[lldb] Set LLDB_USE_NATIVE_PDB_READER at the directory level (#114455)
Lit allows you to set environment variables for all tests in a directory using a `lit.local.cfg` file. Do this for the PDB and NativePDB tests.
1 parent e241964 commit cf3464b

40 files changed

+43
-42
lines changed

lldb/test/Shell/SymbolFile/NativePDB/ast-functions-msvc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33

44
// RUN: %build --compiler=msvc --nodefaultlib -o %t.exe -- %S/ast-functions.cpp
55

6-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
6+
// RUN: %lldb -f %t.exe -s \
77
// RUN: %p/Inputs/ast-functions.lldbinit 2>&1 | FileCheck %S/ast-functions.cpp

lldb/test/Shell/SymbolFile/NativePDB/ast-functions.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s
55
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
66

7-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
8-
// RUN: %p/Inputs/ast-functions.lldbinit 2>&1 | FileCheck %s
7+
// RUN: %lldb -f %t.exe -s %p/Inputs/ast-functions.lldbinit 2>&1 | FileCheck %s
98

109
static int static_fn() {
1110
return 42;

lldb/test/Shell/SymbolFile/NativePDB/ast-methods.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -GR- -c /Fo%t.obj -- %s
55
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
6-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
6+
// RUN: %lldb -f %t.exe -s \
77
// RUN: %p/Inputs/ast-methods.lldbinit 2>&1 | FileCheck %s --check-prefix=AST
88

9-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 lldb-test symbols --dump-ast %t.exe | FileCheck %s --check-prefix=SYMBOL
9+
// RUN: lldb-test symbols --dump-ast %t.exe | FileCheck %s --check-prefix=SYMBOL
1010

1111
struct Struct {
1212
void simple_method() {}

lldb/test/Shell/SymbolFile/NativePDB/ast-types.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Test various interesting cases for AST reconstruction.
55
// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s
66
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
7-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
7+
// RUN: %lldb -f %t.exe -s \
88
// RUN: %p/Inputs/ast-types.lldbinit 2>&1 | FileCheck %s
99

1010
// Test trivial versions of each tag type.

lldb/test/Shell/SymbolFile/NativePDB/bitfields.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Test various interesting cases for AST reconstruction.
55
// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s
66
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
7-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
7+
// RUN: %lldb -f %t.exe -s \
88
// RUN: %p/Inputs/bitfields.lldbinit 2>&1 | FileCheck %s
99

1010
// Test trivial versions of each tag type.

lldb/test/Shell/SymbolFile/NativePDB/blocks.s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Test block range is set.
55
// RUN: llvm-mc -triple=x86_64-windows-msvc --filetype=obj %s > %t.obj
66
// RUN: lld-link /debug:full /nodefaultlib /entry:main %t.obj /out:%t.exe /base:0x140000000
7-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb %t.exe -o "image lookup -a 0x140001014 -v" -o "exit" | FileCheck %s
7+
// RUN: %lldb %t.exe -o "image lookup -a 0x140001014 -v" -o "exit" | FileCheck %s
88

99
// CHECK: Function: id = {{.*}}, name = "main", range = [0x0000000140001000-0x0000000140001044)
1010
// CHECK-NEXT: FuncType: id = {{.*}}, byte-size = 0, compiler_type = "int (void)"

lldb/test/Shell/SymbolFile/NativePDB/break-by-function.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Test that we can set simple breakpoints using PDB on any platform.
55
// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s
66
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
7-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
7+
// RUN: %lldb -f %t.exe -s \
88
// RUN: %p/Inputs/break-by-function.lldbinit | FileCheck %s
99

1010
// Use different indentation style for each overload so that the starting

lldb/test/Shell/SymbolFile/NativePDB/break-by-line.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Test that we can set simple breakpoints using PDB on any platform.
55
// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s
66
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
7-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
7+
// RUN: %lldb -f %t.exe -s \
88
// RUN: %p/Inputs/break-by-line.lldbinit | FileCheck %s
99

1010
// This is a separate test from break-by-function.cpp because this test is

lldb/test/Shell/SymbolFile/NativePDB/class_layout.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Make sure class layout is correct.
55
// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s
66
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
7-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
7+
// RUN: %lldb -f %t.exe -s \
88
// RUN: %p/Inputs/class_layout.lldbinit 2>&1 | FileCheck %s
99

1010
// CHECK: (lldb) expr a

lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Test that we can show disassembly and source.
55
// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s
66
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
7-
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
7+
// RUN: %lldb -f %t.exe -s \
88
// RUN: %p/Inputs/disassembly.lldbinit | FileCheck %s
99

1010
// Some context lines before the function.

0 commit comments

Comments
 (0)