[Dexter] Fix incorrect substitution errors in clang-cl builder

Following 262520a3, tests on windows bots began failing due to an incorrect
substitution in the previous patch, where clang-cl was used instead of
clang_cl.

Also fixes an inconsistency in the builders used for some of the tests
in 'dexter-tests', where %clang++ was used for some tests and %clang for
tests that should have identical RUN lines.

7 files changed, 9 insertions, 9 deletions

diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/global-constant.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/global-constant.cpp
index ad6b3b123daa..7274506b9ae4 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/global-constant.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/global-constant.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: system-windows
 //
-// RUN: %clang-cl /Z7 /Zi %s -o %t
+// RUN: %clang_cl /Z7 /Zi %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
 
 // Check that global constants have debug info.
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/hello.c b/cross-project-tests/debuginfo-tests/dexter-tests/hello.c
index 0a3c9fc7cc06..1e7b050cf08f 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/hello.c
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/hello.c
@@ -1,6 +1,6 @@
 // REQUIRES: system-windows
 //
-// RUN: %clang-cl /Z7 /Zi %s -o %t
+// RUN: %clang_cl /Z7 /Zi %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
 
 #include <stdio.h>
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.cpp
index 11e4cf82d8bd..e24d3a48656e 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/inline-line-gap.cpp
@@ -1,9 +1,9 @@
 // REQUIRES: system-windows
 //
-// RUN: %clang-cl /Od /Z7 /Zi %s -o %t
+// RUN: %clang_cl /Od /Z7 /Zi %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
 //
-// RUN: %clang-cl /O2 /Z7 /Zi %s -o %t
+// RUN: %clang_cl /O2 /Z7 /Zi %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w --binary %t \
 // RUN:      --debugger 'dbgeng' -- %s
 
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/nrvo.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/nrvo.cpp
index d71add46d88a..e9b14da3f5b7 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/nrvo.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/nrvo.cpp
@@ -3,7 +3,7 @@
 //
 // REQUIRES: system-windows
 //
-// RUN: %clang-cl /Z7 /Zi %s -o %t
+// RUN: %clang_cl /Z7 /Zi %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
 
 struct string {
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-vectors-and-functions.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-vectors-and-functions.cpp
index a0481999dede..48eed154340c 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/optnone-vectors-and-functions.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/optnone-vectors-and-functions.cpp
@@ -1,7 +1,7 @@
-// RUN: %clang -O2 -g %s -o %t
+// RUN: %clang++ -O2 -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
 // RUN:     --binary %t --debugger 'lldb' -v -- %s
-// RUN: %clang -O0 -g %s -o %t
+// RUN: %clang++ -O0 -g %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w \
 // RUN:     --binary %t --debugger 'lldb' -- %s
 
diff --git a/cross-project-tests/debuginfo-tests/dexter-tests/realigned-frame.cpp b/cross-project-tests/debuginfo-tests/dexter-tests/realigned-frame.cpp
index d07159faa3b0..24583cc968b6 100644
--- a/cross-project-tests/debuginfo-tests/dexter-tests/realigned-frame.cpp
+++ b/cross-project-tests/debuginfo-tests/dexter-tests/realigned-frame.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: system-windows
 //
-// RUN: %clang-cl /Z7 /Zi %s -o %t
+// RUN: %clang_cl /Z7 /Zi %s -o %t
 // RUN: %dexter --fail-lt 1.0 -w --binary %t --debugger 'dbgeng' -- %s
 
 // From https://llvm.org/pr38857, where we had issues with stack realignment.
diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py
index a9d2a7b13130..b6537916957f 100644
--- a/cross-project-tests/lit.cfg.py
+++ b/cross-project-tests/lit.cfg.py
@@ -123,7 +123,7 @@ def configure_dexter_substitutions():
     if platform.system() == "Windows":
         # The Windows builder script uses lld.
         dependencies = ["clang", "lld-link"]
-        dexter_regression_test_builder = "clang-cl"
+        dexter_regression_test_builder = "clang_cl"
         dexter_regression_test_debugger = "dbgeng"
         dexter_regression_test_flags = "/Zi /Od"
     else: