New round of fixes for "Always compile debuginfo-tests for the host triple"

clang tests were breaking, at least when compiling clang only, from an
installed llvm. Make the lit.cfg script deal with the case when we don't
have a host_triple available.

11 files changed, 20 insertions, 20 deletions

diff --git a/debuginfo-tests/aggregate-indirect-arg.cpp b/debuginfo-tests/aggregate-indirect-arg.cpp
index aa5ef8b1421..86c7caf9618 100644
--- a/debuginfo-tests/aggregate-indirect-arg.cpp
+++ b/debuginfo-tests/aggregate-indirect-arg.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
-// RUN: %clangxx --target=%itanium_abi_host_triple %t.o -o %t.out
+// RUN: %clangxx %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clangxx %target_itanium_abi_host_triple %t.o -o %t.out
 // RUN: %test_debuginfo %s %t.out 
 // Radar 8945514
 // DEBUGGER: break 22
diff --git a/debuginfo-tests/block_var.m b/debuginfo-tests/block_var.m
index 548cdd08438..7ec786f1798 100644
--- a/debuginfo-tests/block_var.m
+++ b/debuginfo-tests/block_var.m
@@ -1,5 +1,5 @@
-// RUN: %clang --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
-// RUN: %clang --target=%itanium_abi_host_triple %t.o -o %t.out -framework Foundation
+// RUN: %clang %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clang %target_itanium_abi_host_triple %t.o -o %t.out -framework Foundation
 // RUN: %test_debuginfo %s %t.out 
 
 // REQUIRES: system-darwin
diff --git a/debuginfo-tests/blocks.m b/debuginfo-tests/blocks.m
index 302005d6ca9..8e5a2121320 100644
--- a/debuginfo-tests/blocks.m
+++ b/debuginfo-tests/blocks.m
@@ -1,5 +1,5 @@
-// RUN: %clang --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
-// RUN: %clang --target=%itanium_abi_host_triple %t.o -o %t.out -framework Foundation
+// RUN: %clang %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clang %target_itanium_abi_host_triple %t.o -o %t.out -framework Foundation
 // RUN: %test_debuginfo %s %t.out 
 
 // REQUIRES: system-darwin
diff --git a/debuginfo-tests/ctor.cpp b/debuginfo-tests/ctor.cpp
index 8a858e40dac..92cdbcd7e0b 100644
--- a/debuginfo-tests/ctor.cpp
+++ b/debuginfo-tests/ctor.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
-// RUN: %clangxx --target=%itanium_abi_host_triple %t.o -o %t.out
+// RUN: %clangxx %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clangxx %target_itanium_abi_host_triple %t.o -o %t.out
 // RUN: %test_debuginfo %s %t.out 
 
 
diff --git a/debuginfo-tests/dbg-arg.c b/debuginfo-tests/dbg-arg.c
index e7acaa8e64a..26de4e5732c 100644
--- a/debuginfo-tests/dbg-arg.c
+++ b/debuginfo-tests/dbg-arg.c
@@ -1,6 +1,6 @@
 // This test case checks debug info during register moves for an argument.
-// RUN: %clang --target=%itanium_abi_host_triple -arch x86_64 -mllvm -fast-isel=false  %s -c -o %t.o
-// RUN: %clang --target=%itanium_abi_host_triple -arch x86_64 %t.o -o %t.out
+// RUN: %clang %target_itanium_abi_host_triple -arch x86_64 -mllvm -fast-isel=false  %s -c -o %t.o
+// RUN: %clang %target_itanium_abi_host_triple -arch x86_64 %t.o -o %t.out
 // RUN: %test_debuginfo %s %t.out
 //
 // Radar 8412415
diff --git a/debuginfo-tests/foreach.m b/debuginfo-tests/foreach.m
index 132dacc5da7..2e3c312c877 100644
--- a/debuginfo-tests/foreach.m
+++ b/debuginfo-tests/foreach.m
@@ -1,5 +1,5 @@
-// RUN: %clang --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
-// RUN: %clang --target=%itanium_abi_host_triple %t.o -o %t.out -framework Foundation
+// RUN: %clang %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clang %target_itanium_abi_host_triple %t.o -o %t.out -framework Foundation
 // RUN: %test_debuginfo %s %t.out 
 //
 // REQUIRES: system-darwin
diff --git a/debuginfo-tests/forward-declare-class.cpp b/debuginfo-tests/forward-declare-class.cpp
index eb9d50745de..132420009bd 100644
--- a/debuginfo-tests/forward-declare-class.cpp
+++ b/debuginfo-tests/forward-declare-class.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clangxx %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %test_debuginfo %s %t.o
 // Radar 9168773
 
diff --git a/debuginfo-tests/nested-struct.cpp b/debuginfo-tests/nested-struct.cpp
index ebb7ee4d71f..7533e6a8151 100644
--- a/debuginfo-tests/nested-struct.cpp
+++ b/debuginfo-tests/nested-struct.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clangxx %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %test_debuginfo %s %t.o
 // Radar 9440721
 // If debug info for my_number() is emitted outside function foo's scope
diff --git a/debuginfo-tests/sret.cpp b/debuginfo-tests/sret.cpp
index 28d6a068ac6..3c304e2f04a 100644
--- a/debuginfo-tests/sret.cpp
+++ b/debuginfo-tests/sret.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -c -o %t.o
-// RUN: %clangxx --target=%itanium_abi_host_triple %t.o -o %t.out
+// RUN: %clangxx %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
+// RUN: %clangxx %target_itanium_abi_host_triple %t.o -o %t.out
 // RUN: %test_debuginfo %s %t.out 
 // Radar 8775834
 // DEBUGGER: break 62
diff --git a/debuginfo-tests/static-member-2.cpp b/debuginfo-tests/static-member-2.cpp
index dda9a225849..4edb2b060f1 100644
--- a/debuginfo-tests/static-member-2.cpp
+++ b/debuginfo-tests/static-member-2.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -o %t -c
-// RUN: %clangxx --target=%itanium_abi_host_triple %t -o %t.out
+// RUN: %clangxx %target_itanium_abi_host_triple -O0 -g %s -o %t -c
+// RUN: %clangxx %target_itanium_abi_host_triple %t -o %t.out
 // RUN: %test_debuginfo %s %t.out
 
 // FIXME: LLDB finds the wrong symbol for "C". rdar://problem/14933867
diff --git a/debuginfo-tests/static-member.cpp b/debuginfo-tests/static-member.cpp
index fdca889bdf7..1d8ad62c5b8 100644
--- a/debuginfo-tests/static-member.cpp
+++ b/debuginfo-tests/static-member.cpp
@@ -1,5 +1,5 @@
-// RUN: %clangxx --target=%itanium_abi_host_triple -O0 -g %s -o %t -c
-// RUN: %clangxx --target=%itanium_abi_host_triple %t -o %t.out
+// RUN: %clangxx %target_itanium_abi_host_triple -O0 -g %s -o %t -c
+// RUN: %clangxx %target_itanium_abi_host_triple %t -o %t.out
 // RUN: %test_debuginfo %s %t.out
 
 // DEBUGGER: delete breakpoints