Author: mstorsjo Date: Thu Oct 17 12:22:50 2019 New Revision: 375156 URL: http://llvm.org/viewvc/llvm-project?rev=375156&view=rev Log: [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 Modified: lldb/trunk/test/Shell/SymbolFile/NativePDB/disassembly.cpp lldb/trunk/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp Modified: lldb/trunk/test/Shell/SymbolFile/NativePDB/disassembly.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/Shell/SymbolFile/NativePDB/disassembly.cpp?rev=375156&r1=375155&r2=375156&view=diff ============================================================================== --- lldb/trunk/test/Shell/SymbolFile/NativePDB/disassembly.cpp (original) +++ lldb/trunk/test/Shell/SymbolFile/NativePDB/disassembly.cpp Thu Oct 17 12:22:50 2019 @@ -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; } Modified: lldb/trunk/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp?rev=375156&r1=375155&r2=375156&view=diff ============================================================================== --- lldb/trunk/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp (original) +++ lldb/trunk/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp Thu Oct 17 12:22:50 2019 @@ -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 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
