From 54017d0f526391a88e5e250a4bbc7a8ea77fa902 Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Thu, 17 Oct 2019 20:14:19 +0000 Subject: [PATCH] Revert "[LLDB] [test] Use %clang_cl instead of build.py in a few tests" This reverts SVN r375156, as it seems to have broken tests when run on macOS: http://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/2706/console llvm-svn: 375163 --- lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp | 6 +++--- .../test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp b/lldb/test/Shell/SymbolFile/NativePDB/disassembly.cpp index be05755..3553f29 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: %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: %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 -// 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 312fd1e..cd13159 100644 --- a/lldb/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/function-types-calling-conv.cpp @@ -1,8 +1,7 @@ // clang-format off // REQUIRES: lld -// 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: %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 -- 2.7.4