diff options
| author | Martin Storsjo <martin@martin.st> | 2019-10-17 19:22:50 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2019-10-17 19:22:50 +0000 |
| commit | 95980409e6531347a39ae764cb769dc8ad835adf (patch) | |
| tree | e8b70d04c223da447d7d8e3817ea9bc99319d2c1 /lldb | |
| parent | 68db51d5c677239fe5ca286f068909479deb75c7 (diff) | |
| download | llvm-95980409e6531347a39ae764cb769dc8ad835adf.zip llvm-95980409e6531347a39ae764cb769dc8ad835adf.tar.gz llvm-95980409e6531347a39ae764cb769dc8ad835adf.tar.bz2 | |
[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.
Differential Revision: https://reviews.llvm.org/D69031
llvm-svn: 375156
Diffstat (limited to 'lldb')
| -rw-r--r-- | lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp | 6 | ||||
| -rw-r--r-- | lldb/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp b/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp index 3553f29..be05755 100644 --- a/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp @@ -2,12 +2,12 @@ // REQUIRES: lld // Test that we can show disassembly and source. -// RUN: %build --compiler=clang-cl --nodefaultlib -o %t.exe -- %s +// RUN: %clang_cl --target=x86_64-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s +// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/disassembly.lldbinit | FileCheck %s -// Some context lines before -// the function. +// Some context lines before the function. int foo() { return 42; } diff --git a/lldb/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp b/lldb/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp index cd13159..312fd1e 100644 --- a/lldb/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp @@ -1,7 +1,8 @@ // clang-format off // REQUIRES: lld -// RUN: %build --compiler=clang-cl --arch=32 --nodefaultlib -o %t.exe -- %s +// RUN: %clang_cl --target=i386-windows-msvc -Od -Z7 -c /Fo%t.obj -- %s +// RUN: lld-link -debug:full -nodefaultlib -entry:main %t.obj -out:%t.exe -pdb:%t.pdb // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb -f %t.exe -s \ // RUN: %p/Inputs/function-types-calling-conv.lldbinit | FileCheck %s |