12 files changed, 12 insertions, 12 deletions
diff --git a/test/CXX/ArrayNew.cpp b/test/CXX/ArrayNew.cpp
index da89f812..8f1a983f 100644
--- a/test/CXX/ArrayNew.cpp
+++ b/test/CXX/ArrayNew.cpp
@@ -1,4 +1,4 @@
-// RUN: %xxclang %s -emit-llvm %O0opt -c -o %t1.bc
+// RUN: %clangxx %s -emit-llvm %O0opt -c -o %t1.bc
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out --no-output --exit-on-error --external-calls=none %t1.bc
 
diff --git a/test/CXX/LandingPad.cpp b/test/CXX/LandingPad.cpp
index 3abdfb0f..66fd547c 100644
--- a/test/CXX/LandingPad.cpp
+++ b/test/CXX/LandingPad.cpp
@@ -1,4 +1,4 @@
-// RUN: %xxclang %s -emit-llvm -c -o %t1.bc
+// RUN: %clangxx %s -emit-llvm -c -o %t1.bc
 // RUN: rm -rf %t.klee-out
 // RUN: klee --output-dir=%t.klee-out %t1.bc 2>&1 | FileCheck %s
 
diff --git a/test/CXX/New.cpp b/test/CXX/New.cpp
index edde0f0d..8e9bd10b 100644
--- a/test/CXX/New.cpp
+++ b/test/CXX/New.cpp
@@ -1,4 +1,4 @@
-// RUN: %xxclang %s -emit-llvm %O0opt -c -o %t1.bc
+// RUN: %clangxx %s -emit-llvm %O0opt -c -o %t1.bc
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out --no-output --exit-on-error --external-calls=none %t1.bc
 
diff --git a/test/CXX/SimpleVirtual.cpp b/test/CXX/SimpleVirtual.cpp
index 588367e9..8f6e838a 100644
--- a/test/CXX/SimpleVirtual.cpp
+++ b/test/CXX/SimpleVirtual.cpp
@@ -1,4 +1,4 @@
-// RUN: %xxclang %s -emit-llvm %O0opt -c -o %t1.bc
+// RUN: %clangxx %s -emit-llvm %O0opt -c -o %t1.bc
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out --no-output --exit-on-error --external-calls=none %t1.bc
 
diff --git a/test/CXX/StaticConstructor.cpp b/test/CXX/StaticConstructor.cpp
index 23a13eb5..0471b413 100644
--- a/test/CXX/StaticConstructor.cpp
+++ b/test/CXX/StaticConstructor.cpp
@@ -1,4 +1,4 @@
-// RUN: %xxclang %s -emit-llvm %O0opt -c -o %t1.bc
+// RUN: %clangxx %s -emit-llvm %O0opt -c -o %t1.bc
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out --libc=klee --no-output --exit-on-error %t1.bc
 
diff --git a/test/CXX/StaticDestructor.cpp b/test/CXX/StaticDestructor.cpp
index 4ea857c1..f2400029 100644
--- a/test/CXX/StaticDestructor.cpp
+++ b/test/CXX/StaticDestructor.cpp
@@ -1,6 +1,6 @@
 // don't optimize this, llvm likes to turn the *p into unreachable
 
-// RUN: %xxclang %s -emit-llvm -g %O0opt -c -o %t1.bc
+// RUN: %clangxx %s -emit-llvm -g %O0opt -c -o %t1.bc
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out --optimize=false --libc=klee --no-output %t1.bc 2> %t1.log
 // RUN: FileCheck --input-file %t1.log %s
diff --git a/test/CXX/Trivial.cpp b/test/CXX/Trivial.cpp
index b2f5a480..519bd23a 100644
--- a/test/CXX/Trivial.cpp
+++ b/test/CXX/Trivial.cpp
@@ -1,4 +1,4 @@
-// RUN: %xxclang %s -emit-llvm %O0opt -c -o %t1.bc
+// RUN: %clangxx %s -emit-llvm %O0opt -c -o %t1.bc
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out --no-output --exit-on-error %t1.bc
 
diff --git a/test/Dogfood/ImmutableSet.cpp b/test/Dogfood/ImmutableSet.cpp
index d877f28d..fe91426e 100644
--- a/test/Dogfood/ImmutableSet.cpp
+++ b/test/Dogfood/ImmutableSet.cpp
@@ -1,4 +1,4 @@
-// RUN: %xxclang -I../../../include -g -DMAX_ELEMENTS=4 -fno-exceptions -emit-llvm -c -o %t1.bc %s
+// RUN: %clangxx -I../../../include -g -DMAX_ELEMENTS=4 -fno-exceptions -emit-llvm -c -o %t1.bc %s
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out --libc=klee --max-forks=25 --no-output --exit-on-error --optimize --disable-inlining --search=nurs:depth --use-cex-cache %t1.bc
 
diff --git a/test/Feature/CallToUndefinedExternal.cpp b/test/Feature/CallToUndefinedExternal.cpp
index f425dbc8..e699071d 100644
--- a/test/Feature/CallToUndefinedExternal.cpp
+++ b/test/Feature/CallToUndefinedExternal.cpp
@@ -1,4 +1,4 @@
-// RUN: %xxclang %s -emit-llvm -g -c -o %t1.bc
+// RUN: %clangxx %s -emit-llvm -g -c -o %t1.bc
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out %t1.bc 2>&1 | FileCheck %s
 // RUN: test -f %t.klee-out/test000001.external.err
diff --git a/test/Feature/LargeReturnTypes.cpp b/test/Feature/LargeReturnTypes.cpp
index 66038383..4adcc5ce 100644
--- a/test/Feature/LargeReturnTypes.cpp
+++ b/test/Feature/LargeReturnTypes.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: not-darwin
-// RUN: %xxclang -g -fno-exceptions -emit-llvm %O0opt -c -o %t.bc %s
+// RUN: %clangxx -g -fno-exceptions -emit-llvm %O0opt -c -o %t.bc %s
 // RUN: rm -rf %t.klee-out
 // RUN: %klee --output-dir=%t.klee-out --libc=klee --no-output --exit-on-error %t.bc > %t.log
 
diff --git a/test/lit.cfg b/test/lit.cfg
index 06e6ba87..e56dc31f 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -84,7 +84,7 @@ if config.test_exec_root is None:
 
 
 # Add substitutions from lit.site.cfg
-subs = [ 'clang', 'xxclang', 'cc', 'cxx', 'O0opt' ]
+subs = [ 'clangxx', 'clang', 'cc', 'cxx', 'O0opt' ]
 for name in subs:
   value = getattr(config, name, None)
   if value == None:
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index 7f9acfc5..3367a909 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -15,7 +15,7 @@ config.llvm_version_minor = "@LLVM_VERSION_MINOR@"
 
 # Compilers
 config.clang = "@LLVMCC@"
-config.xxclang = "@LLVMCXX@"
+config.clangxx = "@LLVMCXX@"
 
 config.cc = "@NATIVE_CC@"
 config.cxx = "@NATIVE_CXX@"