[Lldb-commits] [lldb] r375163 - Revert "[LLDB] [test] Use %clang_cl instead of build.py in a few tests"

[Martin Storsjo via lldb-commits]

Author: mstorsjo
Date: Thu Oct 17 13:14:19 2019
New Revision: 375163

URL: http://llvm.org/viewvc/llvm-project?rev=375163&view=rev
Log:
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

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=375163&r1=375162&r2=375163&view=diff
==============================================================================
--- lldb/trunk/test/Shell/SymbolFile/NativePDB/disassembly.cpp (original)
+++ lldb/trunk/test/Shell/SymbolFile/NativePDB/disassembly.cpp Thu Oct 17 13:14:19 2019
@@ -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; }
 

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=375163&r1=375162&r2=375163&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 13:14:19 2019
@@ -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