[cfe-commits] r107153 - in /cfe/trunk/test: CXX/dcl.dcl/basic.namespace/namespace.udecl/p10.cpp CodeGenCXX/constructor-convert.cpp CodeGenCXX/cxx-apple-kext.cpp Driver/cxx-pth.cpp Headers/x86-intrinsics-headers.c Lexer/has_feature_cxx0x.cpp Lexer/has_feature_exceptions.cpp Lexer/has_feature_rtti.cpp Misc/macro-backtrace-limit.c SemaCXX/warn-unreachable.cpp SemaObjCXX/instantiate-message.mm SemaTemplate/example-dynarray.cpp lit.cfg

Daniel Dunbar daniel at zuster.org
Tue Jun 29 09:52:25 PDT 2010


Author: ddunbar
Date: Tue Jun 29 11:52:24 2010
New Revision: 107153

URL: http://llvm.org/viewvc/llvm-project?rev=107153&view=rev
Log:
tests: Use %clangxx when using driver for C++, in case C++ support is disabled.

Modified:
    cfe/trunk/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p10.cpp
    cfe/trunk/test/CodeGenCXX/constructor-convert.cpp
    cfe/trunk/test/CodeGenCXX/cxx-apple-kext.cpp
    cfe/trunk/test/Driver/cxx-pth.cpp
    cfe/trunk/test/Headers/x86-intrinsics-headers.c
    cfe/trunk/test/Lexer/has_feature_cxx0x.cpp
    cfe/trunk/test/Lexer/has_feature_exceptions.cpp
    cfe/trunk/test/Lexer/has_feature_rtti.cpp
    cfe/trunk/test/Misc/macro-backtrace-limit.c
    cfe/trunk/test/SemaCXX/warn-unreachable.cpp
    cfe/trunk/test/SemaObjCXX/instantiate-message.mm
    cfe/trunk/test/SemaTemplate/example-dynarray.cpp
    cfe/trunk/test/lit.cfg

Modified: cfe/trunk/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p10.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p10.cpp?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p10.cpp (original)
+++ cfe/trunk/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p10.cpp Tue Jun 29 11:52:24 2010
@@ -1,4 +1,4 @@
-// RUN: %clang -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 namespace test0 {
   namespace ns0 {

Modified: cfe/trunk/test/CodeGenCXX/constructor-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/constructor-convert.cpp?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/constructor-convert.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/constructor-convert.cpp Tue Jun 29 11:52:24 2010
@@ -1,4 +1,4 @@
-// RUN: %clang -emit-llvm -S -o - %s
+// RUN: %clang_cc1 -emit-llvm -o - %s
 
 // PR5775
 class Twine {

Modified: cfe/trunk/test/CodeGenCXX/cxx-apple-kext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/cxx-apple-kext.cpp?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/CodeGenCXX/cxx-apple-kext.cpp (original)
+++ cfe/trunk/test/CodeGenCXX/cxx-apple-kext.cpp Tue Jun 29 11:52:24 2010
@@ -1,6 +1,6 @@
-// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 %s -flto -S -o - |\
+// RUN: %clangxx -ccc-host-triple x86_64-apple-darwin10 %s -flto -S -o - |\
 // RUN:   FileCheck --check-prefix=CHECK-NO-KEXT %s
-// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 %s -fapple-kext -flto -S -o - |\
+// RUN: %clangxx -ccc-host-triple x86_64-apple-darwin10 %s -fapple-kext -flto -S -o - |\
 // RUN:   FileCheck --check-prefix=CHECK-KEXT %s
 
 // CHECK-NO-KEXT-NOT: _GLOBAL__D_a

Modified: cfe/trunk/test/Driver/cxx-pth.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cxx-pth.cpp?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/Driver/cxx-pth.cpp (original)
+++ cfe/trunk/test/Driver/cxx-pth.cpp Tue Jun 29 11:52:24 2010
@@ -1,12 +1,12 @@
 // Test forced PTH for CXX support.
 
-// RUN: %clang -x c++-header %s -### 2> %t.log
+// RUN: %clangxx -x c++-header %s -### 2> %t.log
 // RUN: FileCheck -check-prefix EMIT -input-file %t.log %s
 
 // EMIT: "{{.*}}/clang{{.*}}" {{.*}} "-emit-pth" "{{.*}}.cpp.gch" "-x" "c++-header" "{{.*}}.cpp"
 
 // RUN: touch %t.h.gch
-// RUN: %clang -E -include %t.h %s -### 2> %t.log
+// RUN: %clangxx -E -include %t.h %s -### 2> %t.log
 // RUN: FileCheck -check-prefix USE -input-file %t.log %s
 
 // USE: "{{.*}}/clang{{.*}}" {{.*}}"-include-pth" "{{.*}}.h.gch" {{.*}}"-x" "c++" "{{.*}}.cpp"

Modified: cfe/trunk/test/Headers/x86-intrinsics-headers.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Headers/x86-intrinsics-headers.c?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/Headers/x86-intrinsics-headers.c (original)
+++ cfe/trunk/test/Headers/x86-intrinsics-headers.c Tue Jun 29 11:52:24 2010
@@ -1,6 +1,6 @@
 // RUN: %clang -fsyntax-only %s
 // RUN: %clang -fsyntax-only -fno-lax-vector-conversions %s
-// RUN: %clang -fsyntax-only -x c++ %s
+// RUN: %clangxx -fsyntax-only -x c++ %s
 
 #if defined(i386) || defined(__x86_64__)
 

Modified: cfe/trunk/test/Lexer/has_feature_cxx0x.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/has_feature_cxx0x.cpp?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/Lexer/has_feature_cxx0x.cpp (original)
+++ cfe/trunk/test/Lexer/has_feature_cxx0x.cpp Tue Jun 29 11:52:24 2010
@@ -1,5 +1,5 @@
-// RUN: %clang -E -std=c++0x %s -o - | FileCheck --check-prefix=CHECK-0X %s
-// RUN: %clang -E %s -o - | FileCheck --check-prefix=CHECK-NO-0X %s
+// RUN: %clang_cc1 -E -std=c++0x %s -o - | FileCheck --check-prefix=CHECK-0X %s
+// RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-NO-0X %s
 
 #if __has_feature(cxx_lambdas)
 int lambdas();

Modified: cfe/trunk/test/Lexer/has_feature_exceptions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/has_feature_exceptions.cpp?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/Lexer/has_feature_exceptions.cpp (original)
+++ cfe/trunk/test/Lexer/has_feature_exceptions.cpp Tue Jun 29 11:52:24 2010
@@ -1,5 +1,5 @@
-// RUN: %clang -E -fexceptions %s -o - | FileCheck --check-prefix=CHECK-EXCEPTIONS %s
-// RUN: %clang -E -fno-exceptions %s -o - | FileCheck --check-prefix=CHECK-NO-EXCEPTIONS %s
+// RUN: %clang_cc1 -E -fexceptions %s -o - | FileCheck --check-prefix=CHECK-EXCEPTIONS %s
+// RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-NO-EXCEPTIONS %s
 
 #if __has_feature(cxx_exceptions)
 int foo();

Modified: cfe/trunk/test/Lexer/has_feature_rtti.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/has_feature_rtti.cpp?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/Lexer/has_feature_rtti.cpp (original)
+++ cfe/trunk/test/Lexer/has_feature_rtti.cpp Tue Jun 29 11:52:24 2010
@@ -1,5 +1,5 @@
-// RUN: %clang -E -frtti %s -o - | FileCheck --check-prefix=CHECK-RTTI %s
-// RUN: %clang -E -fno-rtti %s -o - | FileCheck --check-prefix=CHECK-NO-RTTI %s
+// RUN: %clang_cc1 -E %s -o - | FileCheck --check-prefix=CHECK-RTTI %s
+// RUN: %clang_cc1 -E -fno-rtti %s -o - | FileCheck --check-prefix=CHECK-NO-RTTI %s
 
 #if __has_feature(cxx_rtti)
 int foo();

Modified: cfe/trunk/test/Misc/macro-backtrace-limit.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Misc/macro-backtrace-limit.c?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/Misc/macro-backtrace-limit.c (original)
+++ cfe/trunk/test/Misc/macro-backtrace-limit.c Tue Jun 29 11:52:24 2010
@@ -1,4 +1,4 @@
-// RUN: %clang-cc1 -fsyntax-only -fmacro-backtrace-limit 5 %s > %t 2>&1 
+// RUN: %clang_cc1 -fsyntax-only -fmacro-backtrace-limit 5 %s > %t 2>&1 
 // RUN: FileCheck %s < %t
 
 #define M1(A, B) ((A) < (B))

Modified: cfe/trunk/test/SemaCXX/warn-unreachable.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/warn-unreachable.cpp?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/warn-unreachable.cpp (original)
+++ cfe/trunk/test/SemaCXX/warn-unreachable.cpp Tue Jun 29 11:52:24 2010
@@ -1,4 +1,4 @@
-// RUN: %clang %s -fsyntax-only -Xclang -verify -fblocks -Wunreachable-code -Wno-unused-value
+// RUN: %clang_cc1 %s -fsyntax-only -verify -fblocks -Wunreachable-code -Wno-unused-value
 
 int &halt() __attribute__((noreturn));
 int &live();

Modified: cfe/trunk/test/SemaObjCXX/instantiate-message.mm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjCXX/instantiate-message.mm?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjCXX/instantiate-message.mm (original)
+++ cfe/trunk/test/SemaObjCXX/instantiate-message.mm Tue Jun 29 11:52:24 2010
@@ -1,4 +1,4 @@
-// RUN: %clang -cc1 -fsyntax-only -verify %s
+// RUN: %clang_cc1 -fsyntax-only -verify %s
 
 // Test template instantiation of Objective-C message sends.
 

Modified: cfe/trunk/test/SemaTemplate/example-dynarray.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/example-dynarray.cpp?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/example-dynarray.cpp (original)
+++ cfe/trunk/test/SemaTemplate/example-dynarray.cpp Tue Jun 29 11:52:24 2010
@@ -1,4 +1,4 @@
-// RUN: %clang -emit-llvm -S -o %t %s
+// RUN: %clangxx -emit-llvm -c -o - %s
 #include <stddef.h>
 #include <stdlib.h>
 #include <assert.h>

Modified: cfe/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg?rev=107153&r1=107152&r2=107153&view=diff
==============================================================================
--- cfe/trunk/test/lit.cfg (original)
+++ cfe/trunk/test/lit.cfg Tue Jun 29 11:52:24 2010
@@ -128,7 +128,8 @@
 if not lit.quiet:
     lit.note('using clang: %r' % config.clang)
 config.substitutions.append( ('%clang_cc1', config.clang + ' -cc1') )
-config.substitutions.append( ('%clangxx', ' ' + config.clang + ' -ccc-cxx'))
+config.substitutions.append( ('%clangxx', ' ' + config.clang +
+                              ' -ccc-clang-cxx -ccc-cxx '))
 config.substitutions.append( ('%clang', ' ' + config.clang + ' ') )
 
 # FIXME: Find nicer way to prohibit this.
@@ -142,3 +143,6 @@
 config.substitutions.append(
     (' clang -cc1 ',
      """*** Do not use 'clang -cc1' in tests, use '%clang_cc1'. ***""") )
+config.substitutions.append(
+    (' %clang-cc1 ',
+     """*** invalid substitution, use '%clang_cc1'. ***""") )





More information about the cfe-commits mailing list