Skip to content

Commit 1739c7c

Browse files
committed
Reapply [LLDB] [test] Use %clang_cl instead of build.py in a few tests
This allows explicitly specifying the intended target architecture, for tests that aren't supposed to be executed, and that don't require MSVC headers or libraries to be available. (These tests already implicitly assumed to be built for x86; one didn't specify anything, assuming x86_64, while the other specified --arch=32, which only picks the 32 bit variant of the default target architecture). Join two comment lines in disassembly.cpp, to keep row numbers checked in the test unchanged. This fixes running check-lldb on arm linux. Previously when this was applied (in 9598040), it broke macos buildbots, as they added "-isysroot <path>" to all %clang* substitutions, and clang-cl didn't support that. Reapplying it without further changes to this patch, after D69619 (9c73925), because now, such extra parameters are added to %clang_host*, but not to plain %clang_cl. Differential Revision: https://reviews.llvm.org/D69031
1 parent 309f9a1 commit 1739c7c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
// REQUIRES: lld
33

44
// Test that we can show disassembly and source.
5-
// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s
5+
// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s
6+
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
67
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
78
// RUN: %p/Inputs/disassembly.lldbinit | FileCheck %s
89

9-
// Some context lines before
10-
// the function.
10+
// Some context lines before the function.
1111

1212
int foo() { return 42; }
1313

lldb/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// clang-format off
22
// REQUIRES: lld
33

4-
// RUN: %build --compiler=clang-cl --arch=32 --nodefaultlib -o %t.exe -- %s
4+
// RUN: %clang_cl --target=i386-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s
5+
// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb
56
// RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \
67
// RUN: %p/Inputs/function-types-calling-conv.lldbinit | FileCheck %s
78

0 commit comments

Comments
 (0)