summaryrefslogtreecommitdiffstats
path: root/clang/test
diff options
context:
space:
mode:
Diffstat (limited to 'clang/test')
-rw-r--r--clang/test/Analysis/CFDateGC.m10
-rw-r--r--clang/test/Analysis/CFNumber.c8
-rw-r--r--clang/test/Analysis/CFRetainRelease_NSAssertionHandler.m8
-rw-r--r--clang/test/Analysis/CGColorSpace.c8
-rw-r--r--clang/test/Analysis/CheckNSError.m8
-rw-r--r--clang/test/Analysis/MissingDealloc.m2
-rw-r--r--clang/test/Analysis/NSPanel.m8
-rw-r--r--clang/test/Analysis/NSString.m8
-rw-r--r--clang/test/Analysis/NSWindow.m8
-rw-r--r--clang/test/Analysis/NoReturn.m12
-rw-r--r--clang/test/Analysis/ObjCProperties.m12
-rw-r--r--clang/test/Analysis/ObjCRetSigs.m2
-rw-r--r--clang/test/Analysis/PR2599.m8
-rw-r--r--clang/test/Analysis/PR2978.m2
-rw-r--r--clang/test/Analysis/array-struct.c10
-rw-r--r--clang/test/Analysis/casts.m4
-rw-r--r--clang/test/Analysis/cfref_PR2519.c8
-rw-r--r--clang/test/Analysis/cfref_rdar6080742.c8
-rw-r--r--clang/test/Analysis/complex.c10
-rw-r--r--clang/test/Analysis/conditional-op-missing-lhs.c2
-rw-r--r--clang/test/Analysis/dead-stores.c14
-rw-r--r--clang/test/Analysis/dead-stores.m2
-rw-r--r--clang/test/Analysis/exercise-ps.c6
-rw-r--r--clang/test/Analysis/fields.c6
-rw-r--r--clang/test/Analysis/func.c6
-rw-r--r--clang/test/Analysis/misc-ps-basic-store.m2
-rw-r--r--clang/test/Analysis/misc-ps-eager-assume.m2
-rw-r--r--clang/test/Analysis/misc-ps-region-store.m2
-rw-r--r--clang/test/Analysis/misc-ps.m8
-rw-r--r--clang/test/Analysis/no-exit-cfg.c4
-rw-r--r--clang/test/Analysis/null-deref-ps.c8
-rw-r--r--clang/test/Analysis/outofbound.c2
-rw-r--r--clang/test/Analysis/ptr-arith.c6
-rw-r--r--clang/test/Analysis/rdar-6442306-1.m4
-rw-r--r--clang/test/Analysis/rdar-6539791.c4
-rw-r--r--clang/test/Analysis/rdar-6540084.m2
-rw-r--r--clang/test/Analysis/rdar-6541136-region.c2
-rw-r--r--clang/test/Analysis/rdar-6541136.c2
-rw-r--r--clang/test/Analysis/rdar-6562655.m2
-rw-r--r--clang/test/Analysis/rdar-6582778-basic-store.c2
-rw-r--r--clang/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m2
-rw-r--r--clang/test/Analysis/refcnt_naming.m4
-rw-r--r--clang/test/Analysis/region-1.m4
-rw-r--r--clang/test/Analysis/region-only-test.c2
-rw-r--r--clang/test/Analysis/retain-release-basic-store.m2
-rw-r--r--clang/test/Analysis/retain-release-gc-only.m4
-rw-r--r--clang/test/Analysis/retain-release-region-store.m2
-rw-r--r--clang/test/Analysis/retain-release.m4
-rw-r--r--clang/test/Analysis/stack-addr-ps.c6
-rw-r--r--clang/test/Analysis/uninit-msg-expr.m6
-rw-r--r--clang/test/Analysis/uninit-ps-rdar6145427.m4
-rw-r--r--clang/test/Analysis/uninit-vals-ps-region.c2
-rw-r--r--clang/test/Analysis/uninit-vals-ps.c4
-rw-r--r--clang/test/Analysis/uninit-vals.c2
-rw-r--r--clang/test/Analysis/uninit-vals.m4
-rw-r--r--clang/test/Analysis/unused-ivars.m2
-rw-r--r--clang/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c2
-rw-r--r--clang/test/CodeGen/2008-02-07-bitfield-bug.c2
-rw-r--r--clang/test/CodeGen/2008-02-08-bitfield-bug.c2
-rw-r--r--clang/test/CodeGen/2008-02-26-inline-asm-bug.c2
-rw-r--r--clang/test/CodeGen/2008-07-17-no-emit-on-error.c2
-rw-r--r--clang/test/CodeGen/2008-07-21-mixed-var-fn-decl.c2
-rw-r--r--clang/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c2
-rw-r--r--clang/test/CodeGen/2008-07-22-packed-bitfield-access.c2
-rw-r--r--clang/test/CodeGen/2008-07-29-override-alias-decl.c2
-rw-r--r--clang/test/CodeGen/2008-07-30-implicit-initialization.c2
-rw-r--r--clang/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c2
-rw-r--r--clang/test/CodeGen/2008-07-31-asm-labels.c4
-rw-r--r--clang/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c2
-rw-r--r--clang/test/CodeGen/2008-08-04-void-pointer-arithmetic.c2
-rw-r--r--clang/test/CodeGen/2008-08-19-cast-of-typedef.c2
-rw-r--r--clang/test/CodeGen/2008-08-25-incompatible-cond-expr.m2
-rw-r--r--clang/test/CodeGen/2008-09-22-bad-switch-type.c2
-rw-r--r--clang/test/CodeGen/2008-12-02-logical-or-fold.c2
-rw-r--r--clang/test/CodeGen/2009-01-21-invalid-debug-info.m2
-rw-r--r--clang/test/CodeGen/2009-03-22-increment-bitfield.c2
-rw-r--r--clang/test/CodeGen/OpaqueStruct.c2
-rw-r--r--clang/test/CodeGen/PR2001-bitfield-reload.c2
-rw-r--r--clang/test/CodeGen/PR2413-void-address-cast-error.c2
-rw-r--r--clang/test/CodeGen/PR2643-null-store-to-bitfield.c2
-rw-r--r--clang/test/CodeGen/PR2743-reference-missing-static.c2
-rw-r--r--clang/test/CodeGen/PR3130-cond-constant.c2
-rw-r--r--clang/test/CodeGen/PR3589-freestanding-libcalls.c6
-rw-r--r--clang/test/CodeGen/PR3613-static-decl.c2
-rw-r--r--clang/test/CodeGen/PR3709-int-to-pointer-sign.c2
-rw-r--r--clang/test/CodeGen/address-space-cast.c2
-rw-r--r--clang/test/CodeGen/address-space.c10
-rw-r--r--clang/test/CodeGen/alias.c2
-rw-r--r--clang/test/CodeGen/align-local.c2
-rw-r--r--clang/test/CodeGen/alignof.c2
-rw-r--r--clang/test/CodeGen/array.c2
-rw-r--r--clang/test/CodeGen/asm.c2
-rw-r--r--clang/test/CodeGen/atomic.c2
-rw-r--r--clang/test/CodeGen/attr-nodebug.c2
-rw-r--r--clang/test/CodeGen/attr-noinline.c2
-rw-r--r--clang/test/CodeGen/attr-used.c2
-rw-r--r--clang/test/CodeGen/attributes.c2
-rw-r--r--clang/test/CodeGen/bitfield-assign.c4
-rw-r--r--clang/test/CodeGen/bitfield-init.c2
-rw-r--r--clang/test/CodeGen/bitfield.c2
-rw-r--r--clang/test/CodeGen/blocks-1.c2
-rw-r--r--clang/test/CodeGen/blocks.c2
-rw-r--r--clang/test/CodeGen/bool-bitfield.c2
-rw-r--r--clang/test/CodeGen/bool-convert.c2
-rw-r--r--clang/test/CodeGen/bool-init.c2
-rw-r--r--clang/test/CodeGen/boolassign.c2
-rw-r--r--clang/test/CodeGen/builtin-count-zeros.c4
-rw-r--r--clang/test/CodeGen/builtin-memfns.c2
-rw-r--r--clang/test/CodeGen/builtin-rename.c2
-rw-r--r--clang/test/CodeGen/builtin-stackaddress.c4
-rw-r--r--clang/test/CodeGen/builtinmemcpy.c2
-rw-r--r--clang/test/CodeGen/builtins-ffs_parity_popcount.c2
-rw-r--r--clang/test/CodeGen/builtins-powi.c2
-rw-r--r--clang/test/CodeGen/builtins-x86.c4
-rw-r--r--clang/test/CodeGen/builtins.c2
-rw-r--r--clang/test/CodeGen/builtinshufflevector.c2
-rw-r--r--clang/test/CodeGen/c-strings.c2
-rw-r--r--clang/test/CodeGen/cast-to-union.c2
-rw-r--r--clang/test/CodeGen/cast.c2
-rw-r--r--clang/test/CodeGen/cfstring.c2
-rw-r--r--clang/test/CodeGen/cfstring2.c2
-rw-r--r--clang/test/CodeGen/cleanup-stack.c2
-rw-r--r--clang/test/CodeGen/complex.c2
-rw-r--r--clang/test/CodeGen/compound-literal.c2
-rw-r--r--clang/test/CodeGen/compound.c2
-rw-r--r--clang/test/CodeGen/conditional-gnu-ext.c2
-rw-r--r--clang/test/CodeGen/conditional.c2
-rw-r--r--clang/test/CodeGen/const-init.c2
-rw-r--r--clang/test/CodeGen/const-label-addr.c2
-rw-r--r--clang/test/CodeGen/constant-comparison.c4
-rw-r--r--clang/test/CodeGen/constructor-attribute.c2
-rw-r--r--clang/test/CodeGen/cxx-condition.cpp2
-rw-r--r--clang/test/CodeGen/cxx-default-arg.cpp2
-rw-r--r--clang/test/CodeGen/cxx-value-init.cpp2
-rw-r--r--clang/test/CodeGen/debug-info.c2
-rw-r--r--clang/test/CodeGen/designated-initializers.c2
-rw-r--r--clang/test/CodeGen/dllimport-dllexport.c2
-rw-r--r--clang/test/CodeGen/dostmt.c2
-rw-r--r--clang/test/CodeGen/emit-all-decls.c4
-rw-r--r--clang/test/CodeGen/empty-union-init.c2
-rw-r--r--clang/test/CodeGen/enum.c2
-rw-r--r--clang/test/CodeGen/exprs.c2
-rw-r--r--clang/test/CodeGen/ext-vector-shuffle.c6
-rw-r--r--clang/test/CodeGen/ext-vector.c2
-rw-r--r--clang/test/CodeGen/extern-block-var.c2
-rw-r--r--clang/test/CodeGen/flexible-array-init.c8
-rw-r--r--clang/test/CodeGen/func-decl-cleanup.c2
-rw-r--r--clang/test/CodeGen/func-return-member.c2
-rw-r--r--clang/test/CodeGen/function-attributes.c2
-rw-r--r--clang/test/CodeGen/functions.c2
-rw-r--r--clang/test/CodeGen/global-decls.c2
-rw-r--r--clang/test/CodeGen/global-init.c2
-rw-r--r--clang/test/CodeGen/global-with-initialiser.c2
-rw-r--r--clang/test/CodeGen/globalinit.c2
-rw-r--r--clang/test/CodeGen/incomplete-function-type.c2
-rw-r--r--clang/test/CodeGen/indirect-goto.c2
-rw-r--r--clang/test/CodeGen/init-with-member-expr.c2
-rw-r--r--clang/test/CodeGen/init.c2
-rw-r--r--clang/test/CodeGen/int-to-pointer.c2
-rw-r--r--clang/test/CodeGen/kr-func-promote.c2
-rw-r--r--clang/test/CodeGen/libcalls.c4
-rw-r--r--clang/test/CodeGen/linkage-redecl.c2
-rw-r--r--clang/test/CodeGen/long-double-x86.c2
-rw-r--r--clang/test/CodeGen/mandel.c2
-rw-r--r--clang/test/CodeGen/mangle.c2
-rw-r--r--clang/test/CodeGen/merge-attrs.c2
-rw-r--r--clang/test/CodeGen/merge-statics.c2
-rw-r--r--clang/test/CodeGen/mmintrin-test.c4
-rw-r--r--clang/test/CodeGen/offsetof.c2
-rw-r--r--clang/test/CodeGen/opaque-pointer.c2
-rw-r--r--clang/test/CodeGen/overloadable.c2
-rw-r--r--clang/test/CodeGen/parameter-passing.c6
-rw-r--r--clang/test/CodeGen/pointer-arithmetic.c2
-rw-r--r--clang/test/CodeGen/pointer-cmp-type.c2
-rw-r--r--clang/test/CodeGen/pointer-to-int.c2
-rw-r--r--clang/test/CodeGen/private-extern.c2
-rw-r--r--clang/test/CodeGen/rdr-6098585-default-after-caserange.c2
-rw-r--r--clang/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c2
-rw-r--r--clang/test/CodeGen/rdr-6098585-empty-case-range.c2
-rw-r--r--clang/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c2
-rw-r--r--clang/test/CodeGen/rdr-6098585-unsigned-caserange.c2
-rw-r--r--clang/test/CodeGen/shared-string-literals.c2
-rw-r--r--clang/test/CodeGen/sizeof-vla.c2
-rw-r--r--clang/test/CodeGen/statements.c2
-rw-r--r--clang/test/CodeGen/static-forward-decl-fun.c2
-rw-r--r--clang/test/CodeGen/static-forward-decl.c2
-rw-r--r--clang/test/CodeGen/static-local-union.c2
-rw-r--r--clang/test/CodeGen/static-order.c2
-rw-r--r--clang/test/CodeGen/staticinit.c2
-rw-r--r--clang/test/CodeGen/stdcall-fastcall.c4
-rw-r--r--clang/test/CodeGen/string-init.c2
-rw-r--r--clang/test/CodeGen/string-literal.c2
-rw-r--r--clang/test/CodeGen/struct-comma.c2
-rw-r--r--clang/test/CodeGen/struct-copy.c2
-rw-r--r--clang/test/CodeGen/struct-init.c2
-rw-r--r--clang/test/CodeGen/struct-passing.c2
-rw-r--r--clang/test/CodeGen/struct-x86-darwin.c2
-rw-r--r--clang/test/CodeGen/struct.c2
-rw-r--r--clang/test/CodeGen/switch.c2
-rw-r--r--clang/test/CodeGen/tentative-array.c2
-rw-r--r--clang/test/CodeGen/typedef-func.c2
-rw-r--r--clang/test/CodeGen/typedef.c2
-rw-r--r--clang/test/CodeGen/types.c2
-rw-r--r--clang/test/CodeGen/union-init.c2
-rw-r--r--clang/test/CodeGen/union.c2
-rw-r--r--clang/test/CodeGen/unwind-attr.c4
-rw-r--r--clang/test/CodeGen/var-align.c2
-rw-r--r--clang/test/CodeGen/vector.c2
-rw-r--r--clang/test/CodeGen/vla.c2
-rw-r--r--clang/test/CodeGen/volatile.c2
-rw-r--r--clang/test/CodeGen/weak-global.c2
-rw-r--r--clang/test/CodeGen/whilestmt.c2
-rw-r--r--clang/test/CodeGen/writable-strings.c2
-rw-r--r--clang/test/CodeGen/x86-inline-asm.c2
-rw-r--r--clang/test/CodeGen/x86_32-arguments.c2
-rw-r--r--clang/test/CodeGen/x86_64-arguments.c2
-rw-r--r--clang/test/CodeGenCXX/__null.cpp2
-rw-r--r--clang/test/CodeGenCXX/expr.cpp2
-rw-r--r--clang/test/CodeGenCXX/mangle.cpp2
-rw-r--r--clang/test/CodeGenObjC/2008-10-23-invalid-icmp.m2
-rw-r--r--clang/test/CodeGenObjC/bitfield-1.m2
-rw-r--r--clang/test/CodeGenObjC/bitfield-ivar-metadata.m2
-rw-r--r--clang/test/CodeGenObjC/blocks-unsupported.m2
-rw-r--r--clang/test/CodeGenObjC/blocks.m2
-rw-r--r--clang/test/CodeGenObjC/category-super-class-meth.m2
-rw-r--r--clang/test/CodeGenObjC/class-getter-dotsyntax.m2
-rw-r--r--clang/test/CodeGenObjC/class-type.m2
-rw-r--r--clang/test/CodeGenObjC/compatibility-alias.m2
-rw-r--r--clang/test/CodeGenObjC/constant-strings.m2
-rw-r--r--clang/test/CodeGenObjC/continuation-class.m2
-rw-r--r--clang/test/CodeGenObjC/dot-syntax-1.m2
-rw-r--r--clang/test/CodeGenObjC/dot-syntax.m2
-rw-r--r--clang/test/CodeGenObjC/encode-test-1.m2
-rw-r--r--clang/test/CodeGenObjC/encode-test-2.m2
-rw-r--r--clang/test/CodeGenObjC/encode-test-3.m2
-rw-r--r--clang/test/CodeGenObjC/encode-test-4.m2
-rw-r--r--clang/test/CodeGenObjC/encode-test.m2
-rw-r--r--clang/test/CodeGenObjC/forward-class-impl-metadata.m2
-rw-r--r--clang/test/CodeGenObjC/hidden.m2
-rw-r--r--clang/test/CodeGenObjC/implicit-property.m4
-rw-r--r--clang/test/CodeGenObjC/link-errors.m4
-rw-r--r--clang/test/CodeGenObjC/message-arrays.m2
-rw-r--r--clang/test/CodeGenObjC/messages-2.m2
-rw-r--r--clang/test/CodeGenObjC/messages.m2
-rw-r--r--clang/test/CodeGenObjC/newproperty-nested-synthesis-1.m2
-rw-r--r--clang/test/CodeGenObjC/no-category-class.m2
-rw-r--r--clang/test/CodeGenObjC/objc-align.m4
-rw-r--r--clang/test/CodeGenObjC/objc2-property-encode.m2
-rw-r--r--clang/test/CodeGenObjC/objc2-protocol-enc.m2
-rw-r--r--clang/test/CodeGenObjC/objc2-retain-codegen.m2
-rw-r--r--clang/test/CodeGenObjC/objc2-strong-cast-1.m2
-rw-r--r--clang/test/CodeGenObjC/objc2-strong-cast.m2
-rw-r--r--clang/test/CodeGenObjC/objc2-weak-compare.m2
-rw-r--r--clang/test/CodeGenObjC/objc2-weak-ivar.m2
-rw-r--r--clang/test/CodeGenObjC/overloadable.m2
-rw-r--r--clang/test/CodeGenObjC/predefined-expr-in-method.m2
-rw-r--r--clang/test/CodeGenObjC/property-aggr-type.m2
-rw-r--r--clang/test/CodeGenObjC/property-agrr-getter.m2
-rw-r--r--clang/test/CodeGenObjC/property-getter-dot-syntax.m2
-rw-r--r--clang/test/CodeGenObjC/property-incr-decr-1.m2
-rw-r--r--clang/test/CodeGenObjC/property-setter-attr.m2
-rw-r--r--clang/test/CodeGenObjC/property.m2
-rw-r--r--clang/test/CodeGenObjC/protocols-lazy.m2
-rw-r--r--clang/test/CodeGenObjC/runtime-fns.m4
-rw-r--r--clang/test/CodeGenObjC/super-classmethod-category.m2
-rw-r--r--clang/test/CodeGenObjC/super-dotsyntax-property.m2
-rw-r--r--clang/test/CodeGenObjC/synchronized.m2
-rw-r--r--clang/test/CodeGenObjC/unname-bf-metadata.m2
-rw-r--r--clang/test/Coverage/ast-printing.c6
-rw-r--r--clang/test/Coverage/ast-printing.m6
-rw-r--r--clang/test/Coverage/codegen-gnu.m6
-rw-r--r--clang/test/Coverage/codegen-next.m4
-rw-r--r--clang/test/Coverage/codegen.c10
-rw-r--r--clang/test/Coverage/html-diagnostics.c2
-rw-r--r--clang/test/Coverage/html-print.c2
-rw-r--r--clang/test/Coverage/parse-callbacks.c4
-rw-r--r--clang/test/Coverage/parse-callbacks.m4
-rw-r--r--clang/test/Coverage/serialize.c2
-rw-r--r--clang/test/Coverage/serialize.m2
-rw-r--r--clang/test/Coverage/targets.c34
-rw-r--r--clang/test/Coverage/verbose.c2
-rw-r--r--clang/test/Driver/hello.c2
-rw-r--r--clang/test/Driver/pth.c4
-rw-r--r--clang/test/Frontend/dependency-gen.c2
-rw-r--r--clang/test/Frontend/rewrite-macros.c2
-rw-r--r--clang/test/Frontend/stdin.c2
-rw-r--r--clang/test/Lexer/11-27-2007-FloatLiterals.c4
-rw-r--r--clang/test/Lexer/badstring_in_if0.c2
-rw-r--r--clang/test/Lexer/block_cmt_end.c10
-rw-r--r--clang/test/Lexer/c90.c2
-rw-r--r--clang/test/Lexer/constants.c2
-rw-r--r--clang/test/Lexer/cxx0x_keyword.cpp2
-rw-r--r--clang/test/Lexer/cxx0x_keyword_as_cxx98.cpp2
-rw-r--r--clang/test/Lexer/digraph.c2
-rw-r--r--clang/test/Lexer/dollar-idents.c4
-rw-r--r--clang/test/Lexer/escape_newline.c6
-rw-r--r--clang/test/Lexer/multiple-include.c2
-rw-r--r--clang/test/Lexer/number.c2
-rw-r--r--clang/test/Lexer/numeric-literal-trash.c2
-rw-r--r--clang/test/Lexer/pragma-mark.c2
-rw-r--r--clang/test/Lexer/rdr-6096838-2.c2
-rw-r--r--clang/test/Lexer/rdr-6096838.c4
-rw-r--r--clang/test/Lexer/token-concat.c2
-rw-r--r--clang/test/Lexer/unknown-char.c2
-rw-r--r--clang/test/Misc/caret-diags.c2
-rw-r--r--clang/test/Misc/diag-checker.c2
-rw-r--r--clang/test/Misc/emit-html.c2
-rwxr-xr-xclang/test/Parser/2008-10-31-parse-noop-failure.c2
-rw-r--r--clang/test/Parser/CompoundStmtScope.c2
-rw-r--r--clang/test/Parser/MicrosoftExtensions.c2
-rw-r--r--clang/test/Parser/argument_qualified.c2
-rw-r--r--clang/test/Parser/argument_redef.c2
-rw-r--r--clang/test/Parser/argument_scope.c2
-rw-r--r--clang/test/Parser/asm.c2
-rw-r--r--clang/test/Parser/attributes.c2
-rw-r--r--clang/test/Parser/bad-control.c2
-rw-r--r--clang/test/Parser/block-block-storageclass.c2
-rw-r--r--clang/test/Parser/block-pointer-decl.c2
-rw-r--r--clang/test/Parser/builtin_classify_type.c2
-rw-r--r--clang/test/Parser/builtin_types_compatible.c2
-rw-r--r--clang/test/Parser/c-namespace.c2
-rw-r--r--clang/test/Parser/char-literal-printing.c2
-rw-r--r--clang/test/Parser/check-objc2-syntax-1.m2
-rw-r--r--clang/test/Parser/check-syntax-1.m2
-rw-r--r--clang/test/Parser/check_cast.c2
-rw-r--r--clang/test/Parser/compound_literal.c2
-rw-r--r--clang/test/Parser/control-scope.c4
-rw-r--r--clang/test/Parser/cxx-bool.cpp2
-rw-r--r--clang/test/Parser/cxx-casting.cpp4
-rw-r--r--clang/test/Parser/cxx-class.cpp2
-rw-r--r--clang/test/Parser/cxx-condition.cpp2
-rw-r--r--clang/test/Parser/cxx-exception-spec.cpp2
-rw-r--r--clang/test/Parser/cxx-reference.cpp2
-rw-r--r--clang/test/Parser/cxx-template-decl.cpp2
-rw-r--r--clang/test/Parser/cxx-try.cpp2
-rw-r--r--clang/test/Parser/cxx-typeid.cpp2
-rw-r--r--clang/test/Parser/cxx-typeof.cpp2
-rw-r--r--clang/test/Parser/cxx-using-directive.cpp2
-rw-r--r--clang/test/Parser/cxx-variadic-func.cpp2
-rw-r--r--clang/test/Parser/cxx0x-rvalue-reference.cpp2
-rw-r--r--clang/test/Parser/declarators.c2
-rw-r--r--clang/test/Parser/designator.c2
-rw-r--r--clang/test/Parser/encode.m2
-rw-r--r--clang/test/Parser/enhanced-proto-1.m2
-rw-r--r--clang/test/Parser/expressions.c2
-rw-r--r--clang/test/Parser/expressions.m2
-rw-r--r--clang/test/Parser/extension.c2
-rw-r--r--clang/test/Parser/function-decls.c2
-rw-r--r--clang/test/Parser/goto-ident.c2
-rw-r--r--clang/test/Parser/if-scope-c90.c2
-rw-r--r--clang/test/Parser/if-scope-c99.c2
-rw-r--r--clang/test/Parser/implicit-casts.c2
-rw-r--r--clang/test/Parser/method-prototype-1.m2
-rw-r--r--clang/test/Parser/namelookup-bug-1.c2
-rw-r--r--clang/test/Parser/namelookup-bug-2.c2
-rw-r--r--clang/test/Parser/objc-alias-printing.m2
-rw-r--r--clang/test/Parser/objc-category-neg-1.m2
-rw-r--r--clang/test/Parser/objc-forcollection-1.m2
-rw-r--r--clang/test/Parser/objc-forcollection-neg-2.m2
-rw-r--r--clang/test/Parser/objc-forcollection-neg.m2
-rw-r--r--clang/test/Parser/objc-foreach-error-1.m2
-rw-r--r--clang/test/Parser/objc-foreach-syntax.m2
-rw-r--r--clang/test/Parser/objc-init.m2
-rw-r--r--clang/test/Parser/objc-interfaces.m2
-rw-r--r--clang/test/Parser/objc-messaging-1.m2
-rw-r--r--clang/test/Parser/objc-messaging-neg-1.m2
-rw-r--r--clang/test/Parser/objc-missing-impl.m2
-rw-r--r--clang/test/Parser/objc-property-syntax.m2
-rw-r--r--clang/test/Parser/objc-quirks.m2
-rw-r--r--clang/test/Parser/objc-try-catch-1.m4
-rw-r--r--clang/test/Parser/objc-type-printing.m2
-rw-r--r--clang/test/Parser/parmvardecl_conversion.c2
-rw-r--r--clang/test/Parser/pointer-arithmetic.c2
-rw-r--r--clang/test/Parser/pointer_promotion.c2
-rw-r--r--clang/test/Parser/pragma-pack.c2
-rw-r--r--clang/test/Parser/prefix-attributes.m2
-rw-r--r--clang/test/Parser/promote_types_in_proto.c2
-rw-r--r--clang/test/Parser/recovery.c2
-rw-r--r--clang/test/Parser/selector-1.m2
-rw-r--r--clang/test/Parser/statements.c2
-rw-r--r--clang/test/Parser/struct-recursion.c2
-rw-r--r--clang/test/Parser/traditional_arg_scope.c2
-rw-r--r--clang/test/Parser/typeof.c2
-rw-r--r--clang/test/Parser/types.c2
-rw-r--r--clang/test/Preprocessor/_Pragma-dependency.c4
-rw-r--r--clang/test/Preprocessor/_Pragma-location.c2
-rw-r--r--clang/test/Preprocessor/_Pragma-physloc.c4
-rw-r--r--clang/test/Preprocessor/_Pragma-poison.c4
-rw-r--r--clang/test/Preprocessor/_Pragma-syshdr.c2
-rw-r--r--clang/test/Preprocessor/_Pragma-syshdr2.c2
-rw-r--r--clang/test/Preprocessor/assembler-with-cpp.c2
-rw-r--r--clang/test/Preprocessor/builtin_line.c4
-rw-r--r--clang/test/Preprocessor/c99-6_10_3_3_p4.c2
-rw-r--r--clang/test/Preprocessor/c99-6_10_3_4_p5.c8
-rw-r--r--clang/test/Preprocessor/c99-6_10_3_4_p6.c10
-rw-r--r--clang/test/Preprocessor/c99-6_10_3_4_p7.c4
-rw-r--r--clang/test/Preprocessor/c99-6_10_3_4_p9.c8
-rw-r--r--clang/test/Preprocessor/clang_headers.c2
-rw-r--r--clang/test/Preprocessor/comment_save.c4
-rw-r--r--clang/test/Preprocessor/comment_save_if.c2
-rw-r--r--clang/test/Preprocessor/comment_save_macro.c6
-rw-r--r--clang/test/Preprocessor/cxx_and.cpp8
-rw-r--r--clang/test/Preprocessor/cxx_bitand.cpp6
-rw-r--r--clang/test/Preprocessor/cxx_bitor.cpp10
-rw-r--r--clang/test/Preprocessor/cxx_compl.cpp6
-rw-r--r--clang/test/Preprocessor/cxx_not.cpp4
-rw-r--r--clang/test/Preprocessor/cxx_not_eq.cpp6
-rw-r--r--clang/test/Preprocessor/cxx_oper_keyword.cpp4
-rw-r--r--clang/test/Preprocessor/cxx_oper_spelling.cpp2
-rw-r--r--clang/test/Preprocessor/cxx_or.cpp8
-rw-r--r--clang/test/Preprocessor/cxx_true.cpp6
-rw-r--r--clang/test/Preprocessor/cxx_xor.cpp10
-rw-r--r--clang/test/Preprocessor/disabled-cond-diags.c2
-rw-r--r--clang/test/Preprocessor/dump_macros.c2
-rw-r--r--clang/test/Preprocessor/dumptokens_phyloc.c2
-rw-r--r--clang/test/Preprocessor/expr_comma.c4
-rw-r--r--clang/test/Preprocessor/expr_invalid_tok.c6
-rw-r--r--clang/test/Preprocessor/expr_liveness.c4
-rw-r--r--clang/test/Preprocessor/expr_usual_conversions.c2
-rw-r--r--clang/test/Preprocessor/extension-warning.c2
-rw-r--r--clang/test/Preprocessor/function_macro_file.c2
-rw-r--r--clang/test/Preprocessor/hash_line.c6
-rw-r--r--clang/test/Preprocessor/hash_space.c2
-rw-r--r--clang/test/Preprocessor/header_lookup1.c2
-rw-r--r--clang/test/Preprocessor/if_warning.c4
-rw-r--r--clang/test/Preprocessor/ifdef-recover.c2
-rw-r--r--clang/test/Preprocessor/import_self.c2
-rw-r--r--clang/test/Preprocessor/include-directive1.c2
-rw-r--r--clang/test/Preprocessor/include-directive2.c2
-rw-r--r--clang/test/Preprocessor/include-directive3.c2
-rw-r--r--clang/test/Preprocessor/include-pth.c3
-rw-r--r--clang/test/Preprocessor/indent_macro.c2
-rw-r--r--clang/test/Preprocessor/line-directive.c6
-rw-r--r--clang/test/Preprocessor/macro_arg_keyword.c2
-rw-r--r--clang/test/Preprocessor/macro_disable.c4
-rw-r--r--clang/test/Preprocessor/macro_disable2.c2
-rw-r--r--clang/test/Preprocessor/macro_disable3.c2
-rw-r--r--clang/test/Preprocessor/macro_disable4.c2
-rw-r--r--clang/test/Preprocessor/macro_expand.c2
-rw-r--r--clang/test/Preprocessor/macro_expandloc.c2
-rw-r--r--clang/test/Preprocessor/macro_expandloc2.c2
-rw-r--r--clang/test/Preprocessor/macro_fn_comma_swallow.c6
-rw-r--r--clang/test/Preprocessor/macro_fn_disable_expand.c4
-rw-r--r--clang/test/Preprocessor/macro_fn_lparen_scan.c8
-rw-r--r--clang/test/Preprocessor/macro_fn_lparen_scan2.c2
-rw-r--r--clang/test/Preprocessor/macro_fn_placemarker.c2
-rw-r--r--clang/test/Preprocessor/macro_fn_preexpand.c4
-rw-r--r--clang/test/Preprocessor/macro_fn_varargs_iso.c6
-rw-r--r--clang/test/Preprocessor/macro_fn_varargs_named.c6
-rw-r--r--clang/test/Preprocessor/macro_misc.c2
-rw-r--r--clang/test/Preprocessor/macro_not_define.c2
-rw-r--r--clang/test/Preprocessor/macro_paste_bad.c2
-rw-r--r--clang/test/Preprocessor/macro_paste_bcpl_comment.c2
-rw-r--r--clang/test/Preprocessor/macro_paste_c_block_comment.c6
-rw-r--r--clang/test/Preprocessor/macro_paste_commaext.c10
-rw-r--r--clang/test/Preprocessor/macro_paste_empty.c6
-rw-r--r--clang/test/Preprocessor/macro_paste_hard.c6
-rw-r--r--clang/test/Preprocessor/macro_paste_hashhash.c2
-rw-r--r--clang/test/Preprocessor/macro_paste_mscomment.c2
-rw-r--r--clang/test/Preprocessor/macro_paste_none.c2
-rw-r--r--clang/test/Preprocessor/macro_paste_simple.c2
-rw-r--r--clang/test/Preprocessor/macro_paste_spacing.c2
-rw-r--r--clang/test/Preprocessor/macro_rescan.c4
-rw-r--r--clang/test/Preprocessor/macro_rescan2.c4
-rw-r--r--clang/test/Preprocessor/macro_rescan_varargs.c4
-rw-r--r--clang/test/Preprocessor/macro_rparen_scan.c2
-rw-r--r--clang/test/Preprocessor/macro_rparen_scan2.c2
-rw-r--r--clang/test/Preprocessor/macro_space.c2
-rw-r--r--clang/test/Preprocessor/mi_opt.c2
-rw-r--r--clang/test/Preprocessor/objc-pp.m2
-rw-r--r--clang/test/Preprocessor/output_paste_avoid.c6
-rw-r--r--clang/test/Preprocessor/paste_bad.c4
-rw-r--r--clang/test/Preprocessor/poison.c2
-rw-r--r--clang/test/Preprocessor/poison_expansion.c2
-rw-r--r--clang/test/Preprocessor/pr2086.c2
-rw-r--r--clang/test/Preprocessor/pragma_microsoft.c2
-rw-r--r--clang/test/Preprocessor/pragma_unknown.c2
-rw-r--r--clang/test/Preprocessor/print_line_track.c10
-rw-r--r--clang/test/Preprocessor/skipping_unclean.c2
-rw-r--r--clang/test/Preprocessor/stringize_misc.c12
-rw-r--r--clang/test/Preprocessor/stringize_space.c2
-rw-r--r--clang/test/Preprocessor/stringize_space2.c2
-rw-r--r--clang/test/Preprocessor/undef-error.c2
-rw-r--r--clang/test/Preprocessor/unterminated.c2
-rw-r--r--clang/test/Rewriter/block-test.c2
-rw-r--r--clang/test/Rewriter/crash.m2
-rw-r--r--clang/test/Rewriter/finally.m2
-rw-r--r--clang/test/Rewriter/id-test-3.m2
-rw-r--r--clang/test/Rewriter/ivar-encoding-1.m2
-rw-r--r--clang/test/Rewriter/ivar-encoding-2.m2
-rw-r--r--clang/test/Rewriter/metadata-test-1.m2
-rw-r--r--clang/test/Rewriter/metadata-test-2.m2
-rw-r--r--clang/test/Rewriter/method-encoding-1.m2
-rw-r--r--clang/test/Rewriter/objc-encoding-bug-1.m2
-rw-r--r--clang/test/Rewriter/objc-ivar-receiver-1.m4
-rw-r--r--clang/test/Rewriter/objc-string-concat-1.m2
-rw-r--r--clang/test/Rewriter/objc-super-test.m2
-rw-r--r--clang/test/Rewriter/objc-synchronized-1.m2
-rw-r--r--clang/test/Rewriter/properties.m2
-rw-r--r--clang/test/Rewriter/protocol-rewrite-1.m2
-rw-r--r--clang/test/Rewriter/rewrite-api-bug.m2
-rw-r--r--clang/test/Rewriter/rewrite-foreach-1.m2
-rw-r--r--clang/test/Rewriter/rewrite-foreach-2.m2
-rw-r--r--clang/test/Rewriter/rewrite-foreach-3.m2
-rw-r--r--clang/test/Rewriter/rewrite-foreach-4.m2
-rw-r--r--clang/test/Rewriter/rewrite-foreach-5.m2
-rw-r--r--clang/test/Rewriter/rewrite-foreach-6.m2
-rw-r--r--clang/test/Rewriter/rewrite-nest.m2
-rw-r--r--clang/test/Rewriter/rewrite-protocol-type-1.m2
-rw-r--r--clang/test/Rewriter/rewrite-try-catch.m2
-rw-r--r--clang/test/Rewriter/static-type-protocol-1.m2
-rw-r--r--clang/test/Rewriter/undecl-objc-h.m2
-rw-r--r--clang/test/Rewriter/undeclared-method-1.m2
-rw-r--r--clang/test/Rewriter/undef-field-reference-1.m2
-rw-r--r--clang/test/Rewriter/va-method.m2
-rw-r--r--clang/test/Sema/128bitint.c2
-rw-r--r--clang/test/Sema/PR2727.c4
-rw-r--r--clang/test/Sema/PR2728.c4
-rw-r--r--clang/test/Sema/PR2919-builtin-types-compat-strips-crv.c2
-rw-r--r--clang/test/Sema/PR2923.c2
-rw-r--r--clang/test/Sema/PR2963-enum-constant.c2
-rw-r--r--clang/test/Sema/address-constant.c2
-rw-r--r--clang/test/Sema/address_spaces.c2
-rw-r--r--clang/test/Sema/align-x86.c2
-rw-r--r--clang/test/Sema/annotate.c2
-rw-r--r--clang/test/Sema/anonymous-struct-union.c2
-rw-r--r--clang/test/Sema/arg-duplicate.c2
-rw-r--r--clang/test/Sema/arg-scope-c99.c2
-rw-r--r--clang/test/Sema/arg-scope.c2
-rw-r--r--clang/test/Sema/array-constraint.c2
-rw-r--r--clang/test/Sema/array-declared-as-incorrect-type.c2
-rw-r--r--clang/test/Sema/array-init.c2
-rw-r--r--clang/test/Sema/asm.c2
-rw-r--r--clang/test/Sema/assign-null.c2
-rw-r--r--clang/test/Sema/assign.c2
-rw-r--r--clang/test/Sema/ast-print.c2
-rw-r--r--clang/test/Sema/attr-aligned.c2
-rw-r--r--clang/test/Sema/attr-cleanup.c2
-rw-r--r--clang/test/Sema/attr-deprecated.c2
-rw-r--r--clang/test/Sema/attr-mode.c2
-rw-r--r--clang/test/Sema/attr-nodebug.c2
-rw-r--r--clang/test/Sema/attr-noinline.c2
-rw-r--r--clang/test/Sema/attr-noreturn.c2
-rw-r--r--clang/test/Sema/attr-unused.c2
-rw-r--r--clang/test/Sema/attr-used.c2
-rw-r--r--clang/test/Sema/attr-warn_unused_result.c2
-rw-r--r--clang/test/Sema/attr-weak.c2
-rw-r--r--clang/test/Sema/bitfield-layout.c2
-rw-r--r--clang/test/Sema/bitfield.c2
-rw-r--r--clang/test/Sema/block-args.c2
-rw-r--r--clang/test/Sema/block-as-object.m2
-rw-r--r--clang/test/Sema/block-byref-args.c2
-rw-r--r--clang/test/Sema/block-call.c2
-rw-r--r--clang/test/Sema/block-explicit-return-type.c2
-rw-r--r--clang/test/Sema/block-labels.c2
-rw-r--r--clang/test/Sema/block-literal.c2
-rw-r--r--clang/test/Sema/block-misc.c2
-rw-r--r--clang/test/Sema/block-return.c2
-rw-r--r--clang/test/Sema/block-storageclass.c2
-rw-r--r--clang/test/Sema/block-syntax-error.c2
-rw-r--r--clang/test/Sema/builtin-object-size.c4
-rw-r--r--clang/test/Sema/builtin-prefetch.c2
-rw-r--r--clang/test/Sema/builtin-stackaddress.c2
-rw-r--r--clang/test/Sema/builtins.c2
-rw-r--r--clang/test/Sema/c89-2.c2
-rw-r--r--clang/test/Sema/c89.c2
-rw-r--r--clang/test/Sema/callingconv.c2
-rw-r--r--clang/test/Sema/carbon.c4
-rw-r--r--clang/test/Sema/cast-to-union.c2
-rw-r--r--clang/test/Sema/cast.c2
-rw-r--r--clang/test/Sema/check-increment.c2
-rw-r--r--clang/test/Sema/compare.c2
-rw-r--r--clang/test/Sema/complex-int.c2
-rw-r--r--clang/test/Sema/complex-promotion.c2
-rw-r--r--clang/test/Sema/compound-literal.c2
-rw-r--r--clang/test/Sema/conditional-expr.c2
-rw-r--r--clang/test/Sema/conditional.c2
-rw-r--r--clang/test/Sema/const-eval.c2
-rw-r--r--clang/test/Sema/const-ptr-int-ptr-cast.c2
-rw-r--r--clang/test/Sema/constant-builtins-2.c2
-rw-r--r--clang/test/Sema/constant-builtins.c2
-rw-r--r--clang/test/Sema/constructor-attribute.c2
-rw-r--r--clang/test/Sema/darwin-align-cast.c2
-rw-r--r--clang/test/Sema/decl-invalid.c2
-rw-r--r--clang/test/Sema/decl-type-merging.c2
-rw-r--r--clang/test/Sema/declspec.c2
-rw-r--r--clang/test/Sema/default.c2
-rw-r--r--clang/test/Sema/default1.c2
-rw-r--r--clang/test/Sema/deref.c2
-rw-r--r--clang/test/Sema/designated-initializers.c2
-rw-r--r--clang/test/Sema/dllimport-dllexport.c2
-rw-r--r--clang/test/Sema/enum.c2
-rw-r--r--clang/test/Sema/expr-address-of.c2
-rw-r--r--clang/test/Sema/expr-comma-c89.c2
-rw-r--r--clang/test/Sema/expr-comma.c2
-rw-r--r--clang/test/Sema/exprs.c2
-rw-r--r--clang/test/Sema/ext_vector_components.c2
-rw-r--r--clang/test/Sema/flexible-array-init.c2
-rw-r--r--clang/test/Sema/floating-point-compare.c2
-rw-r--r--clang/test/Sema/for.c2
-rw-r--r--clang/test/Sema/format-attribute.c2
-rw-r--r--clang/test/Sema/format-strings.c2
-rw-r--r--clang/test/Sema/function-ptr.c2
-rw-r--r--clang/test/Sema/function-redecl.c2
-rw-r--r--clang/test/Sema/function.c2
-rw-r--r--clang/test/Sema/heinous-extensions-off.c2
-rw-r--r--clang/test/Sema/heinous-extensions-on.c2
-rw-r--r--clang/test/Sema/i-c-e.c2
-rw-r--r--clang/test/Sema/if-empty-body.c2
-rw-r--r--clang/test/Sema/illegal-types.c2
-rw-r--r--clang/test/Sema/implicit-builtin-decl.c2
-rw-r--r--clang/test/Sema/implicit-builtin-freestanding.c2
-rw-r--r--clang/test/Sema/implicit-builtin-redecl.c2
-rw-r--r--clang/test/Sema/implicit-cast.c2
-rw-r--r--clang/test/Sema/implicit-decl.c2
-rw-r--r--clang/test/Sema/implicit-def.c4
-rw-r--r--clang/test/Sema/implicit-int.c2
-rw-r--r--clang/test/Sema/incompatible-sign.c2
-rw-r--r--clang/test/Sema/incomplete-call.c2
-rw-r--r--clang/test/Sema/incomplete-decl.c2
-rw-r--r--clang/test/Sema/init-struct-qualified.c2
-rw-r--r--clang/test/Sema/init.c2
-rw-r--r--clang/test/Sema/int-arith-convert.c2
-rw-r--r--clang/test/Sema/invalid-decl.c2
-rw-r--r--clang/test/Sema/invalid-init-diag.c2
-rw-r--r--clang/test/Sema/invalid-struct-init.c2
-rw-r--r--clang/test/Sema/knr-def-call.c2
-rw-r--r--clang/test/Sema/member-reference.c2
-rw-r--r--clang/test/Sema/merge-decls.c2
-rw-r--r--clang/test/Sema/ms-fuzzy-asm.c2
-rw-r--r--clang/test/Sema/nested-redef.c2
-rw-r--r--clang/test/Sema/nonnull.c2
-rw-r--r--clang/test/Sema/offsetof.c2
-rw-r--r--clang/test/Sema/overloadable-complex.c2
-rw-r--r--clang/test/Sema/overloadable.c2
-rw-r--r--clang/test/Sema/pointer-addition.c2
-rw-r--r--clang/test/Sema/pointer-subtract-compat.c2
-rw-r--r--clang/test/Sema/pragma-pack-2.c2
-rw-r--r--clang/test/Sema/pragma-pack.c2
-rw-r--r--clang/test/Sema/pragma-unused.c2
-rw-r--r--clang/test/Sema/predef.c2
-rw-r--r--clang/test/Sema/predefined-function.c2
-rw-r--r--clang/test/Sema/rdar6248119.m2
-rw-r--r--clang/test/Sema/rdr6094103-unordered-compare-promote.c2
-rw-r--r--clang/test/Sema/recover-goto.c2
-rw-r--r--clang/test/Sema/redefinition.c2
-rw-r--r--clang/test/Sema/scope-check.c2
-rw-r--r--clang/test/Sema/self-comparison.c2
-rw-r--r--clang/test/Sema/sentinel-attribute.c2
-rw-r--r--clang/test/Sema/shift.c2
-rw-r--r--clang/test/Sema/static-init.c2
-rw-r--r--clang/test/Sema/stdcall-fastcall.c2
-rw-r--r--clang/test/Sema/stmt_exprs.c2
-rw-r--r--clang/test/Sema/struct-cast.c2
-rw-r--r--clang/test/Sema/struct-compat.c2
-rw-r--r--clang/test/Sema/struct-decl.c2
-rw-r--r--clang/test/Sema/struct-packed-align.c2
-rw-r--r--clang/test/Sema/switch.c2
-rw-r--r--clang/test/Sema/tentative-decls.c2
-rw-r--r--clang/test/Sema/text-diag.c2
-rw-r--r--clang/test/Sema/transparent-union-pointer.c2
-rw-r--r--clang/test/Sema/type-spec-struct-union.c2
-rw-r--r--clang/test/Sema/typecheck-binop.c2
-rw-r--r--clang/test/Sema/typedef-prototype.c2
-rw-r--r--clang/test/Sema/typedef-redef.c2
-rw-r--r--clang/test/Sema/typedef-retain.c2
-rw-r--r--clang/test/Sema/typedef-variable-type.c2
-rw-r--r--clang/test/Sema/types.c2
-rw-r--r--clang/test/Sema/unnamed-bitfield-init.c2
-rw-r--r--clang/test/Sema/unused-expr.c2
-rw-r--r--clang/test/Sema/usual-float.c2
-rw-r--r--clang/test/Sema/va_arg_x86_64.c2
-rw-r--r--clang/test/Sema/var-redecl.c2
-rw-r--r--clang/test/Sema/varargs.c4
-rw-r--r--clang/test/Sema/vector-assign.c2
-rw-r--r--clang/test/Sema/vector-cast.c2
-rw-r--r--clang/test/Sema/vector-init.c2
-rw-r--r--clang/test/Sema/vla.c2
-rw-r--r--clang/test/Sema/void_arg.c2
-rw-r--r--clang/test/Sema/warn-freestanding-complex.c2
-rw-r--r--clang/test/Sema/wchar.c2
-rw-r--r--clang/test/SemaCXX/__null.cpp4
-rw-r--r--clang/test/SemaCXX/abstract.cpp2
-rw-r--r--clang/test/SemaCXX/addr-of-overloaded-function.cpp2
-rw-r--r--clang/test/SemaCXX/address-of.cpp2
-rw-r--r--clang/test/SemaCXX/aggregate-initialization.cpp2
-rw-r--r--clang/test/SemaCXX/anonymous-union.cpp2
-rw-r--r--clang/test/SemaCXX/attr-unavailable.cpp2
-rw-r--r--clang/test/SemaCXX/basic_lookup_argdep.cpp2
-rw-r--r--clang/test/SemaCXX/blocks.cpp2
-rw-r--r--clang/test/SemaCXX/bool.cpp2
-rw-r--r--clang/test/SemaCXX/carbon.cpp2
-rw-r--r--clang/test/SemaCXX/class-names.cpp2
-rw-r--r--clang/test/SemaCXX/class.cpp2
-rw-r--r--clang/test/SemaCXX/complex-overload.cpp2
-rw-r--r--clang/test/SemaCXX/condition.cpp2
-rw-r--r--clang/test/SemaCXX/const-cast.cpp2
-rw-r--r--clang/test/SemaCXX/constructor-initializer.cpp2
-rw-r--r--clang/test/SemaCXX/constructor.cpp2
-rw-r--r--clang/test/SemaCXX/conversion-function.cpp2
-rw-r--r--clang/test/SemaCXX/convert-to-bool.cpp2
-rw-r--r--clang/test/SemaCXX/converting-constructor.cpp2
-rw-r--r--clang/test/SemaCXX/copy-initialization.cpp2
-rw-r--r--clang/test/SemaCXX/dcl_init_aggr.cpp2
-rw-r--r--clang/test/SemaCXX/decl-expr-ambiguity.cpp2
-rw-r--r--clang/test/SemaCXX/default1.cpp2
-rw-r--r--clang/test/SemaCXX/default2.cpp2
-rw-r--r--clang/test/SemaCXX/dependent-types.cpp2
-rw-r--r--clang/test/SemaCXX/derived-to-base-ambig.cpp2
-rw-r--r--clang/test/SemaCXX/destructor.cpp2
-rw-r--r--clang/test/SemaCXX/direct-initializer.cpp2
-rw-r--r--clang/test/SemaCXX/do-while-scope.cpp2
-rw-r--r--clang/test/SemaCXX/dynamic-cast.cpp2
-rw-r--r--clang/test/SemaCXX/elaborated-type-specifier.cpp2
-rw-r--r--clang/test/SemaCXX/enum.cpp2
-rw-r--r--clang/test/SemaCXX/expressions.cpp2
-rw-r--r--clang/test/SemaCXX/fntype-decl.cpp2
-rw-r--r--clang/test/SemaCXX/function-redecl.cpp2
-rw-r--r--clang/test/SemaCXX/function-type-qual.cpp2
-rw-r--r--clang/test/SemaCXX/functional-cast.cpp2
-rw-r--r--clang/test/SemaCXX/i-c-e-cxx.cpp2
-rw-r--r--clang/test/SemaCXX/implicit-int.cpp2
-rw-r--r--clang/test/SemaCXX/inherit.cpp2
-rw-r--r--clang/test/SemaCXX/linkage-spec.cpp2
-rw-r--r--clang/test/SemaCXX/member-expr.cpp2
-rw-r--r--clang/test/SemaCXX/member-name-lookup.cpp2
-rw-r--r--clang/test/SemaCXX/member-pointer.cpp2
-rw-r--r--clang/test/SemaCXX/ms-exception-spec.cpp2
-rw-r--r--clang/test/SemaCXX/namespace.cpp2
-rw-r--r--clang/test/SemaCXX/nested-name-spec.cpp2
-rw-r--r--clang/test/SemaCXX/new-delete.cpp2
-rw-r--r--clang/test/SemaCXX/no-implicit-builtin-decls.cpp2
-rw-r--r--clang/test/SemaCXX/overload-call-copycon.cpp2
-rw-r--r--clang/test/SemaCXX/overload-call.cpp2
-rw-r--r--clang/test/SemaCXX/overload-decl.cpp2
-rw-r--r--clang/test/SemaCXX/overload-member-call.cpp2
-rw-r--r--clang/test/SemaCXX/overloaded-builtin-operators.cpp2
-rw-r--r--clang/test/SemaCXX/overloaded-operator-decl.cpp2
-rw-r--r--clang/test/SemaCXX/overloaded-operator.cpp2
-rw-r--r--clang/test/SemaCXX/qualification-conversion.cpp2
-rw-r--r--clang/test/SemaCXX/qualified-id-lookup.cpp2
-rw-r--r--clang/test/SemaCXX/qualified-names-diag.cpp2
-rw-r--r--clang/test/SemaCXX/qualified-names-print.cpp2
-rw-r--r--clang/test/SemaCXX/references.cpp2
-rw-r--r--clang/test/SemaCXX/reinterpret-cast.cpp2
-rw-r--r--clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp2
-rw-r--r--clang/test/SemaCXX/return-stack-addr.cpp2
-rw-r--r--clang/test/SemaCXX/rval-references.cpp2
-rw-r--r--clang/test/SemaCXX/statements.cpp2
-rw-r--r--clang/test/SemaCXX/static-assert.cpp2
-rw-r--r--clang/test/SemaCXX/static-cast.cpp2
-rw-r--r--clang/test/SemaCXX/static-initializers.cpp2
-rw-r--r--clang/test/SemaCXX/template-specialization.cpp2
-rw-r--r--clang/test/SemaCXX/this.cpp2
-rw-r--r--clang/test/SemaCXX/try-catch.cpp2
-rw-r--r--clang/test/SemaCXX/type-convert-construct.cpp2
-rw-r--r--clang/test/SemaCXX/type-dependent-exprs.cpp2
-rw-r--r--clang/test/SemaCXX/type-traits.cpp2
-rw-r--r--clang/test/SemaCXX/typedef-redecl.cpp2
-rw-r--r--clang/test/SemaCXX/typeid.cpp2
-rw-r--r--clang/test/SemaCXX/user-defined-conversions.cpp2
-rw-r--r--clang/test/SemaCXX/using-directive.cpp2
-rw-r--r--clang/test/SemaCXX/vararg-non-pod.cpp2
-rw-r--r--clang/test/SemaCXX/virtuals.cpp2
-rw-r--r--clang/test/SemaCXX/warn-for-var-in-else.cpp2
-rw-r--r--clang/test/SemaCXX/wchar_t.cpp2
-rw-r--r--clang/test/SemaObjC/DoubleMethod.m2
-rw-r--r--clang/test/SemaObjC/access-property-getter.m2
-rw-r--r--clang/test/SemaObjC/alias-test-1.m2
-rw-r--r--clang/test/SemaObjC/alias-test-2.m2
-rw-r--r--clang/test/SemaObjC/argument-checking.m2
-rw-r--r--clang/test/SemaObjC/at-defs.m2
-rw-r--r--clang/test/SemaObjC/attr-cleanup.m2
-rw-r--r--clang/test/SemaObjC/attr-deprecated.m2
-rw-r--r--clang/test/SemaObjC/attr-objc-exception.m2
-rw-r--r--clang/test/SemaObjC/attr-objc-gc.m2
-rw-r--r--clang/test/SemaObjC/bad-receiver-1.m2
-rw-r--r--clang/test/SemaObjC/block-ivar.m2
-rw-r--r--clang/test/SemaObjC/blocks.m2
-rw-r--r--clang/test/SemaObjC/call-super-2.m2
-rw-r--r--clang/test/SemaObjC/catch-stmt.m2
-rw-r--r--clang/test/SemaObjC/category-1.m2
-rw-r--r--clang/test/SemaObjC/category-method-lookup-2.m4
-rw-r--r--clang/test/SemaObjC/category-method-lookup.m2
-rw-r--r--clang/test/SemaObjC/check-dup-decl-methods-1.m2
-rw-r--r--clang/test/SemaObjC/check-dup-objc-decls-1.m2
-rw-r--r--clang/test/SemaObjC/class-bitfield.m2
-rw-r--r--clang/test/SemaObjC/class-conforming-protocol-1.m2
-rw-r--r--clang/test/SemaObjC/class-def-test-1.m2
-rw-r--r--clang/test/SemaObjC/class-extension-dup-methods.m2
-rw-r--r--clang/test/SemaObjC/class-impl-1.m2
-rw-r--r--clang/test/SemaObjC/class-method-lookup.m2
-rw-r--r--clang/test/SemaObjC/class-proto-1.m2
-rw-r--r--clang/test/SemaObjC/cocoa.m10
-rw-r--r--clang/test/SemaObjC/compare-qualified-id.m2
-rw-r--r--clang/test/SemaObjC/compatible-protocol-qualified-types.m2
-rw-r--r--clang/test/SemaObjC/comptypes-1.m2
-rw-r--r--clang/test/SemaObjC/comptypes-2.m2
-rw-r--r--clang/test/SemaObjC/comptypes-3.m2
-rw-r--r--clang/test/SemaObjC/comptypes-4.m2
-rw-r--r--clang/test/SemaObjC/comptypes-5.m2
-rw-r--r--clang/test/SemaObjC/comptypes-6.m2
-rw-r--r--clang/test/SemaObjC/comptypes-7.m2
-rw-r--r--clang/test/SemaObjC/comptypes-8.m2
-rw-r--r--clang/test/SemaObjC/comptypes-9.m2
-rw-r--r--clang/test/SemaObjC/comptypes-a.m2
-rw-r--r--clang/test/SemaObjC/comptypes-legal.m2
-rw-r--r--clang/test/SemaObjC/conditional-expr-2.m2
-rw-r--r--clang/test/SemaObjC/conditional-expr-3.m4
-rw-r--r--clang/test/SemaObjC/conditional-expr-4.m2
-rw-r--r--clang/test/SemaObjC/conditional-expr.m2
-rw-r--r--clang/test/SemaObjC/conflicting-ivar-test-1.m2
-rw-r--r--clang/test/SemaObjC/continuation-class-err.m2
-rw-r--r--clang/test/SemaObjC/duplicate-ivar-check.m2
-rw-r--r--clang/test/SemaObjC/enhanced-proto-2.m2
-rw-r--r--clang/test/SemaObjC/error-property-gc-attr.m2
-rw-r--r--clang/test/SemaObjC/exprs.m4
-rw-r--r--clang/test/SemaObjC/foreach-1.m2
-rw-r--r--clang/test/SemaObjC/format-strings-objc.m2
-rw-r--r--clang/test/SemaObjC/forward-class-1.m2
-rw-r--r--clang/test/SemaObjC/gcc-cast-ext.m2
-rw-r--r--clang/test/SemaObjC/id-1.m2
-rw-r--r--clang/test/SemaObjC/id_builtin.m2
-rw-r--r--clang/test/SemaObjC/incompatible-protocol-qualified-types.m2
-rw-r--r--clang/test/SemaObjC/interface-1.m2
-rw-r--r--clang/test/SemaObjC/interface-layout-2.m2
-rw-r--r--clang/test/SemaObjC/interface-layout.m2
-rw-r--r--clang/test/SemaObjC/interface-scope-2.m2
-rw-r--r--clang/test/SemaObjC/interface-scope.m2
-rw-r--r--clang/test/SemaObjC/interface-tu-variable.m2
-rw-r--r--clang/test/SemaObjC/invalid-code.m2
-rw-r--r--clang/test/SemaObjC/invalid-objc-decls-1.m2
-rw-r--r--clang/test/SemaObjC/invalid-receiver.m2
-rw-r--r--clang/test/SemaObjC/invalid-typename.m2
-rw-r--r--clang/test/SemaObjC/ivar-access-tests.m2
-rw-r--r--clang/test/SemaObjC/ivar-lookup.m2
-rw-r--r--clang/test/SemaObjC/ivar-ref-misuse.m2
-rw-r--r--clang/test/SemaObjC/ivar-sem-check-1.m2
-rw-r--r--clang/test/SemaObjC/legacy-implementation-1.m2
-rw-r--r--clang/test/SemaObjC/message.m2
-rw-r--r--clang/test/SemaObjC/method-arg-decay.m2
-rw-r--r--clang/test/SemaObjC/method-attributes.m2
-rw-r--r--clang/test/SemaObjC/method-bad-param.m2
-rw-r--r--clang/test/SemaObjC/method-conflict.m4
-rw-r--r--clang/test/SemaObjC/method-def-1.m2
-rw-r--r--clang/test/SemaObjC/method-def-2.m2
-rw-r--r--clang/test/SemaObjC/method-encoding-2.m2
-rw-r--r--clang/test/SemaObjC/method-lookup-2.m2
-rw-r--r--clang/test/SemaObjC/method-lookup-3.m2
-rw-r--r--clang/test/SemaObjC/method-lookup-4.m2
-rw-r--r--clang/test/SemaObjC/method-lookup.m2
-rw-r--r--clang/test/SemaObjC/method-no-context.m2
-rw-r--r--clang/test/SemaObjC/method-not-defined.m2
-rw-r--r--clang/test/SemaObjC/method-typecheck-1.m2
-rw-r--r--clang/test/SemaObjC/method-undef-category-warn-1.m2
-rw-r--r--clang/test/SemaObjC/method-undef-extension-warn-1.m2
-rw-r--r--clang/test/SemaObjC/method-undefined-warn-1.m2
-rw-r--r--clang/test/SemaObjC/missing-method-context.m2
-rw-r--r--clang/test/SemaObjC/newproperty-class-method-1.m2
-rw-r--r--clang/test/SemaObjC/nsobject-attribute.m2
-rw-r--r--clang/test/SemaObjC/objc2-warn-weak-decl.m2
-rw-r--r--clang/test/SemaObjC/property-1.m2
-rw-r--r--clang/test/SemaObjC/property-10.m2
-rw-r--r--clang/test/SemaObjC/property-11.m2
-rw-r--r--clang/test/SemaObjC/property-12.m2
-rw-r--r--clang/test/SemaObjC/property-13.m2
-rw-r--r--clang/test/SemaObjC/property-2.m2
-rw-r--r--clang/test/SemaObjC/property-3.m2
-rw-r--r--clang/test/SemaObjC/property-4.m2
-rw-r--r--clang/test/SemaObjC/property-5.m2
-rw-r--r--clang/test/SemaObjC/property-6.m2
-rw-r--r--clang/test/SemaObjC/property-7.m2
-rw-r--r--clang/test/SemaObjC/property-8.m2
-rw-r--r--clang/test/SemaObjC/property-9-impl-method.m2
-rw-r--r--clang/test/SemaObjC/property-9.m2
-rw-r--r--clang/test/SemaObjC/property-category-1.m2
-rw-r--r--clang/test/SemaObjC/property-category-2.m2
-rw-r--r--clang/test/SemaObjC/property-category-3.m2
-rw-r--r--clang/test/SemaObjC/property-error-readonly-assign.m2
-rw-r--r--clang/test/SemaObjC/property-impl-misuse.m2
-rw-r--r--clang/test/SemaObjC/property-inherited.m2
-rw-r--r--clang/test/SemaObjC/property-ivar-mismatch.m2
-rw-r--r--clang/test/SemaObjC/property-missing.m2
-rw-r--r--clang/test/SemaObjC/property-nonfragile-abi.m2
-rw-r--r--clang/test/SemaObjC/property-noprotocol-warning.m2
-rw-r--r--clang/test/SemaObjC/property-redundant-decl-accessor.m2
-rw-r--r--clang/test/SemaObjC/property-typecheck-1.m2
-rw-r--r--clang/test/SemaObjC/property-user-setter.m2
-rw-r--r--clang/test/SemaObjC/property-weak.m2
-rw-r--r--clang/test/SemaObjC/props-on-prots.m2
-rw-r--r--clang/test/SemaObjC/protocol-archane.m2
-rw-r--r--clang/test/SemaObjC/protocol-atttribute-1.m2
-rw-r--r--clang/test/SemaObjC/protocol-expr-1.m2
-rw-r--r--clang/test/SemaObjC/protocol-expr-neg-1.m2
-rw-r--r--clang/test/SemaObjC/protocol-forward-circular.m2
-rw-r--r--clang/test/SemaObjC/protocol-id-test-1.m2
-rw-r--r--clang/test/SemaObjC/protocol-id-test-2.m2
-rw-r--r--clang/test/SemaObjC/protocol-id-test-3.m2
-rw-r--r--clang/test/SemaObjC/protocol-implementation-inherited.m2
-rw-r--r--clang/test/SemaObjC/protocol-lookup-2.m2
-rw-r--r--clang/test/SemaObjC/protocol-lookup.m2
-rw-r--r--clang/test/SemaObjC/protocol-test-1.m2
-rw-r--r--clang/test/SemaObjC/protocol-test-2.m2
-rw-r--r--clang/test/SemaObjC/protocol-typecheck.m2
-rw-r--r--clang/test/SemaObjC/protocol-undef.m2
-rw-r--r--clang/test/SemaObjC/rdr-6211479-array-property.m2
-rw-r--r--clang/test/SemaObjC/selector-1.m2
-rw-r--r--clang/test/SemaObjC/selector-overload.m2
-rw-r--r--clang/test/SemaObjC/static-ivar-ref-1.m2
-rw-r--r--clang/test/SemaObjC/string.m4
-rw-r--r--clang/test/SemaObjC/super-cat-prot.m2
-rw-r--r--clang/test/SemaObjC/super-property-notation.m2
-rw-r--r--clang/test/SemaObjC/super.m2
-rw-r--r--clang/test/SemaObjC/synchronized.m2
-rw-r--r--clang/test/SemaObjC/try-catch.m2
-rw-r--r--clang/test/SemaObjC/typedef-class.m2
-rw-r--r--clang/test/SemaObjC/undef-class-messagin-error.m2
-rw-r--r--clang/test/SemaObjC/undef-protocol-methods-1.m2
-rw-r--r--clang/test/SemaObjC/undef-superclass-1.m2
-rw-r--r--clang/test/SemaObjC/undefined-protocol-type-1.m2
-rw-r--r--clang/test/SemaObjC/unused.m2
-rw-r--r--clang/test/SemaObjC/va-method-1.m2
-rw-r--r--clang/test/SemaObjC/warn-selector-selection.m2
-rw-r--r--clang/test/SemaObjC/warn-weak-field.m2
-rw-r--r--clang/test/SemaObjC/weak-attr-ivar.m2
-rw-r--r--clang/test/SemaObjCXX/blocks.mm2
-rw-r--r--clang/test/SemaObjCXX/cocoa.mm5
-rw-r--r--clang/test/SemaObjCXX/linkage-spec.mm2
-rw-r--r--clang/test/SemaObjCXX/objc-decls-inside-namespace.mm2
-rw-r--r--clang/test/SemaObjCXX/overload.mm2
-rw-r--r--clang/test/SemaObjCXX/protocol-lookup.mm2
-rw-r--r--clang/test/SemaObjCXX/reserved-keyword-selectors.mm2
-rw-r--r--clang/test/SemaObjCXX/vararg-non-pod.mm2
-rw-r--r--clang/test/SemaObjCXX/void_to_obj.mm2
-rw-r--r--clang/test/SemaTemplate/class-template-decl.cpp2
-rw-r--r--clang/test/SemaTemplate/class-template-id-2.cpp2
-rw-r--r--clang/test/SemaTemplate/class-template-id.cpp2
-rw-r--r--clang/test/SemaTemplate/class-template-spec.cpp2
-rw-r--r--clang/test/SemaTemplate/default-arguments.cpp2
-rw-r--r--clang/test/SemaTemplate/fibonacci.cpp2
-rw-r--r--clang/test/SemaTemplate/fun-template-def.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiate-array.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiate-enum.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiate-expr-1.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiate-expr-2.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiate-field.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiate-method.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiate-typedef.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiation-backtrace.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiation-default-1.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiation-default-2.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiation-default-3.cpp2
-rw-r--r--clang/test/SemaTemplate/instantiation-depth.cpp2
-rw-r--r--clang/test/SemaTemplate/nested-name-spec-template.cpp2
-rw-r--r--clang/test/SemaTemplate/qualified-names-diag.cpp2
-rw-r--r--clang/test/SemaTemplate/right-angle-brackets-0x.cpp2
-rw-r--r--clang/test/SemaTemplate/right-angle-brackets-98.cpp2
-rw-r--r--clang/test/SemaTemplate/temp_arg.cpp2
-rw-r--r--clang/test/SemaTemplate/temp_arg_nontype.cpp2
-rw-r--r--clang/test/SemaTemplate/temp_arg_template.cpp2
-rw-r--r--clang/test/SemaTemplate/temp_arg_type.cpp2
-rw-r--r--clang/test/SemaTemplate/temp_param.cpp2
962 files changed, 1228 insertions, 1224 deletions
diff --git a/clang/test/Analysis/CFDateGC.m b/clang/test/Analysis/CFDateGC.m
index 43ec99dc3bc..dfc736627bf 100644
--- a/clang/test/Analysis/CFDateGC.m
+++ b/clang/test/Analysis/CFDateGC.m
@@ -1,8 +1,8 @@
-// RUN: clang -analyze -checker-cfref -verify -fobjc-gc -analyzer-constraints=basic %s &&
-// RUN: clang -analyze -checker-cfref -verify -fobjc-gc -analyzer-constraints=range %s &&
-// RUN: clang -analyze -checker-cfref -verify -fobjc-gc -disable-free %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify -fobjc-gc %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify -fobjc-gc %s
+// RUN: clang-cc -analyze -checker-cfref -verify -fobjc-gc -analyzer-constraints=basic %s &&
+// RUN: clang-cc -analyze -checker-cfref -verify -fobjc-gc -analyzer-constraints=range %s &&
+// RUN: clang-cc -analyze -checker-cfref -verify -fobjc-gc -disable-free %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify -fobjc-gc %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify -fobjc-gc %s
//===----------------------------------------------------------------------===//
// The following code is reduced using delta-debugging from
diff --git a/clang/test/Analysis/CFNumber.c b/clang/test/Analysis/CFNumber.c
index 40b6a91af76..f62d2ab569d 100644
--- a/clang/test/Analysis/CFNumber.c
+++ b/clang/test/Analysis/CFNumber.c
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify -triple x86_64-apple-darwin9 %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify -triple x86_64-apple-darwin9 %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify -triple x86_64-apple-darwin9 %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify -triple x86_64-apple-darwin9 %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify -triple x86_64-apple-darwin9 %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify -triple x86_64-apple-darwin9 %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify -triple x86_64-apple-darwin9 %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify -triple x86_64-apple-darwin9 %s
typedef signed long CFIndex;
typedef const struct __CFAllocator * CFAllocatorRef;
diff --git a/clang/test/Analysis/CFRetainRelease_NSAssertionHandler.m b/clang/test/Analysis/CFRetainRelease_NSAssertionHandler.m
index 119a05e35bb..1ff950725c0 100644
--- a/clang/test/Analysis/CFRetainRelease_NSAssertionHandler.m
+++ b/clang/test/Analysis/CFRetainRelease_NSAssertionHandler.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -verify %s -analyzer-constraints=basic -analyzer-store=basic &&
-// RUN: clang -analyze -checker-cfref -verify %s -analyzer-constraints=range -analyzer-store=basic &&
-// RUN: clang -analyze -checker-cfref -verify %s -analyzer-constraints=basic -analyzer-store=region &&
-// RUN: clang -analyze -checker-cfref -verify %s -analyzer-constraints=range -analyzer-store=region
+// RUN: clang-cc -analyze -checker-cfref -verify %s -analyzer-constraints=basic -analyzer-store=basic &&
+// RUN: clang-cc -analyze -checker-cfref -verify %s -analyzer-constraints=range -analyzer-store=basic &&
+// RUN: clang-cc -analyze -checker-cfref -verify %s -analyzer-constraints=basic -analyzer-store=region &&
+// RUN: clang-cc -analyze -checker-cfref -verify %s -analyzer-constraints=range -analyzer-store=region
typedef struct objc_selector *SEL;
typedef signed char BOOL;
diff --git a/clang/test/Analysis/CGColorSpace.c b/clang/test/Analysis/CGColorSpace.c
index c405a10e369..2887d47c511 100644
--- a/clang/test/Analysis/CGColorSpace.c
+++ b/clang/test/Analysis/CGColorSpace.c
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
typedef struct CGColorSpace *CGColorSpaceRef;
extern CGColorSpaceRef CGColorSpaceCreateDeviceRGB(void);
diff --git a/clang/test/Analysis/CheckNSError.m b/clang/test/Analysis/CheckNSError.m
index 10f79e8c2f1..28435727eb7 100644
--- a/clang/test/Analysis/CheckNSError.m
+++ b/clang/test/Analysis/CheckNSError.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
typedef signed char BOOL;
diff --git a/clang/test/Analysis/MissingDealloc.m b/clang/test/Analysis/MissingDealloc.m
index b06c63d426e..41498e56ec1 100644
--- a/clang/test/Analysis/MissingDealloc.m
+++ b/clang/test/Analysis/MissingDealloc.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-objc-missing-dealloc '-DIBOutlet=__attribute__((iboutlet))' %s --verify
+// RUN: clang-cc -analyze -warn-objc-missing-dealloc '-DIBOutlet=__attribute__((iboutlet))' %s --verify
typedef signed char BOOL;
@protocol NSObject
- (BOOL)isEqual:(id)object;
diff --git a/clang/test/Analysis/NSPanel.m b/clang/test/Analysis/NSPanel.m
index b7ecfef87d0..8f8f5626b3f 100644
--- a/clang/test/Analysis/NSPanel.m
+++ b/clang/test/Analysis/NSPanel.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
// BEGIN delta-debugging reduced header stuff
diff --git a/clang/test/Analysis/NSString.m b/clang/test/Analysis/NSString.m
index 29e332402ed..3e2155b7c12 100644
--- a/clang/test/Analysis/NSString.m
+++ b/clang/test/Analysis/NSString.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
//===----------------------------------------------------------------------===//
// The following code is reduced using delta-debugging from
diff --git a/clang/test/Analysis/NSWindow.m b/clang/test/Analysis/NSWindow.m
index 6bddaeb695c..9609c5260f5 100644
--- a/clang/test/Analysis/NSWindow.m
+++ b/clang/test/Analysis/NSWindow.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -warn-dead-stores -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -warn-dead-stores -analyzer-store=region -analyzer-constraints=range -verify %s
// These declarations were reduced using Delta-Debugging from Foundation.h
// on Mac OS X. The test cases are below.
diff --git a/clang/test/Analysis/NoReturn.m b/clang/test/Analysis/NoReturn.m
index 9a0e48403f0..a43f99bdd79 100644
--- a/clang/test/Analysis/NoReturn.m
+++ b/clang/test/Analysis/NoReturn.m
@@ -1,9 +1,9 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
#include <stdarg.h>
diff --git a/clang/test/Analysis/ObjCProperties.m b/clang/test/Analysis/ObjCProperties.m
index adee5e2e581..7787a1d6ecd 100644
--- a/clang/test/Analysis/ObjCProperties.m
+++ b/clang/test/Analysis/ObjCProperties.m
@@ -1,9 +1,9 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic %s -verify &&
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range %s -verify &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic %s -verify &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range %s -verify &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic %s -verify &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range %s -verify
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic %s -verify &&
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range %s -verify &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic %s -verify &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range %s -verify &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic %s -verify &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range %s -verify
// The point of this test cases is to exercise properties in the static
// analyzer
diff --git a/clang/test/Analysis/ObjCRetSigs.m b/clang/test/Analysis/ObjCRetSigs.m
index 2d1aa80d125..0d699168a55 100644
--- a/clang/test/Analysis/ObjCRetSigs.m
+++ b/clang/test/Analysis/ObjCRetSigs.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-objc-methodsigs -verify %s
+// RUN: clang-cc -analyze -warn-objc-methodsigs -verify %s
#include <stdio.h>
diff --git a/clang/test/Analysis/PR2599.m b/clang/test/Analysis/PR2599.m
index 6f107df35d2..098bfe8e853 100644
--- a/clang/test/Analysis/PR2599.m
+++ b/clang/test/Analysis/PR2599.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -analyzer-constraints=basic -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
-// RUN: clang -analyze -analyzer-constraints=range -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
-// RUN: clang -analyze -analyzer-constraints=basic -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
-// RUN: clang -analyze -analyzer-constraints=range -analyzer-store=region -checker-cfref -fobjc-gc -verify %s
+// RUN: clang-cc -analyze -analyzer-constraints=basic -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
+// RUN: clang-cc -analyze -analyzer-constraints=range -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
+// RUN: clang-cc -analyze -analyzer-constraints=basic -analyzer-store=basic -checker-cfref -fobjc-gc -verify %s &&
+// RUN: clang-cc -analyze -analyzer-constraints=range -analyzer-store=region -checker-cfref -fobjc-gc -verify %s
typedef const void * CFTypeRef;
typedef const struct __CFString * CFStringRef;
diff --git a/clang/test/Analysis/PR2978.m b/clang/test/Analysis/PR2978.m
index e2a031dd068..2b4c9177745 100644
--- a/clang/test/Analysis/PR2978.m
+++ b/clang/test/Analysis/PR2978.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-objc-missing-dealloc %s -verify
+// RUN: clang-cc -analyze -warn-objc-missing-dealloc %s -verify
// Tests for the checker which checks missing/extra ivar 'release' calls
// in dealloc.
diff --git a/clang/test/Analysis/array-struct.c b/clang/test/Analysis/array-struct.c
index 60a3d3118d7..7e5e6243c6a 100644
--- a/clang/test/Analysis/array-struct.c
+++ b/clang/test/Analysis/array-struct.c
@@ -1,8 +1,8 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
struct s {
int data;
diff --git a/clang/test/Analysis/casts.m b/clang/test/Analysis/casts.m
index 68de2c8ef7c..82c29fac904 100644
--- a/clang/test/Analysis/casts.m
+++ b/clang/test/Analysis/casts.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic --verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region --verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic --verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region --verify %s
// Test function pointer casts. Currently we track function addresses using
// loc::FunctionVal. Because casts can be arbitrary, do we need to model
diff --git a/clang/test/Analysis/cfref_PR2519.c b/clang/test/Analysis/cfref_PR2519.c
index a37af6d64fb..695123b5334 100644
--- a/clang/test/Analysis/cfref_PR2519.c
+++ b/clang/test/Analysis/cfref_PR2519.c
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range -verify %s
typedef unsigned char Boolean;
typedef signed long CFIndex;
diff --git a/clang/test/Analysis/cfref_rdar6080742.c b/clang/test/Analysis/cfref_rdar6080742.c
index c088ec426f8..5d957615d0d 100644
--- a/clang/test/Analysis/cfref_rdar6080742.c
+++ b/clang/test/Analysis/cfref_rdar6080742.c
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
// This test case was reported in <rdar:problem/6080742>.
// It tests path-sensitivity with respect to '!(cfstring != 0)' (negation of inequality).
diff --git a/clang/test/Analysis/complex.c b/clang/test/Analysis/complex.c
index eed3ed44f33..f29fc70c494 100644
--- a/clang/test/Analysis/complex.c
+++ b/clang/test/Analysis/complex.c
@@ -1,8 +1,8 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -verify %s
#include <stdint.h>
diff --git a/clang/test/Analysis/conditional-op-missing-lhs.c b/clang/test/Analysis/conditional-op-missing-lhs.c
index 4854c28c7d9..bebf155f464 100644
--- a/clang/test/Analysis/conditional-op-missing-lhs.c
+++ b/clang/test/Analysis/conditional-op-missing-lhs.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-dead-stores -warn-uninit-values -verify %s
+// RUN: clang-cc -analyze -warn-dead-stores -warn-uninit-values -verify %s
void f1()
{
diff --git a/clang/test/Analysis/dead-stores.c b/clang/test/Analysis/dead-stores.c
index c151057096e..d632c695a90 100644
--- a/clang/test/Analysis/dead-stores.c
+++ b/clang/test/Analysis/dead-stores.c
@@ -1,10 +1,10 @@
-// RUN: clang -analyze -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -warn-dead-stores -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -warn-dead-stores -verify %s
+// RUN: clang-cc -analyze -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=basic -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=basic -analyzer-constraints=range -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=basic -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -analyzer-constraints=range -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=basic -warn-dead-stores -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -analyzer-constraints=range -warn-dead-stores -verify %s
void f1() {
int k, y;
diff --git a/clang/test/Analysis/dead-stores.m b/clang/test/Analysis/dead-stores.m
index ee948538858..218cb445858 100644
--- a/clang/test/Analysis/dead-stores.m
+++ b/clang/test/Analysis/dead-stores.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-dead-stores -verify %s
+// RUN: clang-cc -analyze -warn-dead-stores -verify %s
typedef signed char BOOL;
typedef unsigned int NSUInteger;
diff --git a/clang/test/Analysis/exercise-ps.c b/clang/test/Analysis/exercise-ps.c
index 1b001ec3cbe..08842b1b8db 100644
--- a/clang/test/Analysis/exercise-ps.c
+++ b/clang/test/Analysis/exercise-ps.c
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-simple -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
//
// Just exercise the analyzer on code that has at one point caused issues
// (i.e., no assertions or crashes).
diff --git a/clang/test/Analysis/fields.c b/clang/test/Analysis/fields.c
index aa7acf26d11..d6bf73f9af1 100644
--- a/clang/test/Analysis/fields.c
+++ b/clang/test/Analysis/fields.c
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-cfref %s --analyzer-store=basic -verify &&
-// RUN: clang -analyze -checker-cfref %s --analyzer-store=region -verify &&
-// RUN: clang -analyze -checker-simple %s -verify
+// RUN: clang-cc -analyze -checker-cfref %s --analyzer-store=basic -verify &&
+// RUN: clang-cc -analyze -checker-cfref %s --analyzer-store=region -verify &&
+// RUN: clang-cc -analyze -checker-simple %s -verify
unsigned foo();
typedef struct bf { unsigned x:2; } bf;
diff --git a/clang/test/Analysis/func.c b/clang/test/Analysis/func.c
index 94ca2694fea..ac067a98103 100644
--- a/clang/test/Analysis/func.c
+++ b/clang/test/Analysis/func.c
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-simple -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
void f(void) {
void (*p)(void);
diff --git a/clang/test/Analysis/misc-ps-basic-store.m b/clang/test/Analysis/misc-ps-basic-store.m
index 00183e7b8dc..1207f8663e9 100644
--- a/clang/test/Analysis/misc-ps-basic-store.m
+++ b/clang/test/Analysis/misc-ps-basic-store.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref --analyzer-store=basic --verify -fblocks %s
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=basic --verify -fblocks %s
//---------------------------------------------------------------------------
// Test case 'checkaccess_union' differs for region store and basic store.
diff --git a/clang/test/Analysis/misc-ps-eager-assume.m b/clang/test/Analysis/misc-ps-eager-assume.m
index 4dd8f2536c4..818922eba92 100644
--- a/clang/test/Analysis/misc-ps-eager-assume.m
+++ b/clang/test/Analysis/misc-ps-eager-assume.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range --verify -fblocks %s -analyzer-eagerly-assume
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range --verify -fblocks %s -analyzer-eagerly-assume
// Delta-reduced header stuff (needed for test cases).
typedef signed char BOOL;
diff --git a/clang/test/Analysis/misc-ps-region-store.m b/clang/test/Analysis/misc-ps-region-store.m
index 486d7ac2aab..8c8815ea63e 100644
--- a/clang/test/Analysis/misc-ps-region-store.m
+++ b/clang/test/Analysis/misc-ps-region-store.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref --analyzer-store=region --verify -fblocks %s
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region --verify -fblocks %s
typedef struct objc_selector *SEL;
typedef signed char BOOL;
diff --git a/clang/test/Analysis/misc-ps.m b/clang/test/Analysis/misc-ps.m
index 1f4b7632bc7..0ee47ce67db 100644
--- a/clang/test/Analysis/misc-ps.m
+++ b/clang/test/Analysis/misc-ps.m
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=basic --verify -fblocks %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=range --verify -fblocks %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=basic --verify -fblocks %s &&
-// RUN: clang -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range --verify -fblocks %s
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=basic --verify -fblocks %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=basic -analyzer-constraints=range --verify -fblocks %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=basic --verify -fblocks %s &&
+// RUN: clang-cc -analyze -checker-cfref --analyzer-store=region -analyzer-constraints=range --verify -fblocks %s
typedef struct objc_selector *SEL;
typedef signed char BOOL;
diff --git a/clang/test/Analysis/no-exit-cfg.c b/clang/test/Analysis/no-exit-cfg.c
index 6752008d67b..cad2127b208 100644
--- a/clang/test/Analysis/no-exit-cfg.c
+++ b/clang/test/Analysis/no-exit-cfg.c
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
// This is a test case for the issue reported in PR 2819:
// http://llvm.org/bugs/show_bug.cgi?id=2819
diff --git a/clang/test/Analysis/null-deref-ps.c b/clang/test/Analysis/null-deref-ps.c
index fe94d6fe7c8..bd63c7edf0e 100644
--- a/clang/test/Analysis/null-deref-ps.c
+++ b/clang/test/Analysis/null-deref-ps.c
@@ -1,7 +1,7 @@
-// RUN: clang -analyze -std=gnu99 -checker-simple -verify %s &&
-// RUN: clang -analyze -std=gnu99 -checker-simple -verify %s -analyzer-constraints=range &&
-// RUN: clang -analyze -std=gnu99 -checker-simple -analyzer-store=region -analyzer-purge-dead=false -verify %s &&
-// RUN: clang -analyze -std=gnu99 -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -std=gnu99 -checker-simple -verify %s &&
+// RUN: clang-cc -analyze -std=gnu99 -checker-simple -verify %s -analyzer-constraints=range &&
+// RUN: clang-cc -analyze -std=gnu99 -checker-simple -analyzer-store=region -analyzer-purge-dead=false -verify %s &&
+// RUN: clang-cc -analyze -std=gnu99 -checker-cfref -analyzer-store=region -verify %s
#include<stdint.h>
#include <assert.h>
diff --git a/clang/test/Analysis/outofbound.c b/clang/test/Analysis/outofbound.c
index 4ab2326fcd8..953075fe03d 100644
--- a/clang/test/Analysis/outofbound.c
+++ b/clang/test/Analysis/outofbound.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=region -verify %s
char f1() {
char* s = "abcd";
diff --git a/clang/test/Analysis/ptr-arith.c b/clang/test/Analysis/ptr-arith.c
index 87c3eb8dfef..ea8b7f56661 100644
--- a/clang/test/Analysis/ptr-arith.c
+++ b/clang/test/Analysis/ptr-arith.c
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=region -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify -triple x86_64-apple-darwin9 %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify -triple i686-apple-darwin9 %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=region -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify -triple x86_64-apple-darwin9 %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify -triple i686-apple-darwin9 %s
void f1() {
int a[10];
diff --git a/clang/test/Analysis/rdar-6442306-1.m b/clang/test/Analysis/rdar-6442306-1.m
index e53b09411c6..15d34988409 100644
--- a/clang/test/Analysis/rdar-6442306-1.m
+++ b/clang/test/Analysis/rdar-6442306-1.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref %s --analyzer-store=basic -verify &&
-// RUN: clang -analyze -checker-cfref %s --analyzer-store=region -verify
+// RUN: clang-cc -analyze -checker-cfref %s --analyzer-store=basic -verify &&
+// RUN: clang-cc -analyze -checker-cfref %s --analyzer-store=region -verify
typedef int bar_return_t;
typedef struct {
diff --git a/clang/test/Analysis/rdar-6539791.c b/clang/test/Analysis/rdar-6539791.c
index 5fe2d293c1c..c1c98915433 100644
--- a/clang/test/Analysis/rdar-6539791.c
+++ b/clang/test/Analysis/rdar-6539791.c
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
typedef const struct __CFAllocator * CFAllocatorRef;
typedef struct __CFDictionary * CFMutableDictionaryRef;
diff --git a/clang/test/Analysis/rdar-6540084.m b/clang/test/Analysis/rdar-6540084.m
index e1347d92eb5..c788543bf39 100644
--- a/clang/test/Analysis/rdar-6540084.m
+++ b/clang/test/Analysis/rdar-6540084.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-dead-stores -verify %s
+// RUN: clang-cc -analyze -warn-dead-stores -verify %s
//
// This test exercises the live variables analysis (LiveVariables.cpp).
// The case originally identified a non-termination bug.
diff --git a/clang/test/Analysis/rdar-6541136-region.c b/clang/test/Analysis/rdar-6541136-region.c
index 270fa33fbc6..90960dd4f61 100644
--- a/clang/test/Analysis/rdar-6541136-region.c
+++ b/clang/test/Analysis/rdar-6541136-region.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -analyze -checker-cfref -analyzer-store=region %s
+// RUN: clang-cc -verify -analyze -checker-cfref -analyzer-store=region %s
struct tea_cheese { unsigned magic; };
typedef struct tea_cheese kernel_tea_cheese_t;
diff --git a/clang/test/Analysis/rdar-6541136.c b/clang/test/Analysis/rdar-6541136.c
index f90837c7dc2..6e6a479136b 100644
--- a/clang/test/Analysis/rdar-6541136.c
+++ b/clang/test/Analysis/rdar-6541136.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -analyze -checker-cfref -analyzer-store=basic %s
+// RUN: clang-cc -verify -analyze -checker-cfref -analyzer-store=basic %s
struct tea_cheese { unsigned magic; };
typedef struct tea_cheese kernel_tea_cheese_t;
diff --git a/clang/test/Analysis/rdar-6562655.m b/clang/test/Analysis/rdar-6562655.m
index bb9afabd7dd..581d6eacf08 100644
--- a/clang/test/Analysis/rdar-6562655.m
+++ b/clang/test/Analysis/rdar-6562655.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref -analyzer-constraints=basic -analyzer-store=basic -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-constraints=basic -analyzer-store=basic -verify %s
//
// This test case mainly checks that the retain/release checker doesn't crash
// on this file.
diff --git a/clang/test/Analysis/rdar-6582778-basic-store.c b/clang/test/Analysis/rdar-6582778-basic-store.c
index 0e1c9055b06..9ec38ef7a5f 100644
--- a/clang/test/Analysis/rdar-6582778-basic-store.c
+++ b/clang/test/Analysis/rdar-6582778-basic-store.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s
typedef const void * CFTypeRef;
typedef double CFTimeInterval;
diff --git a/clang/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m b/clang/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m
index 881addf2d4f..d1f0802abf8 100644
--- a/clang/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m
+++ b/clang/test/Analysis/rdar-6600344-nil-receiver-undefined-struct-ret.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref -analyzer-constraints=basic -analyzer-store=basic %s -verify
+// RUN: clang-cc -analyze -checker-cfref -analyzer-constraints=basic -analyzer-store=basic %s -verify
typedef struct Foo { int x; } Bar;
diff --git a/clang/test/Analysis/refcnt_naming.m b/clang/test/Analysis/refcnt_naming.m
index 5af3711d254..bea404799ba 100644
--- a/clang/test/Analysis/refcnt_naming.m
+++ b/clang/test/Analysis/refcnt_naming.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
typedef const struct __CFString * CFStringRef;
typedef const struct __CFAllocator * CFAllocatorRef;
diff --git a/clang/test/Analysis/region-1.m b/clang/test/Analysis/region-1.m
index 2d44091a5fe..f9905079eb5 100644
--- a/clang/test/Analysis/region-1.m
+++ b/clang/test/Analysis/region-1.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
//
// This test case simply should not crash. It evaluates the logic of not
// using MemRegion::getRValueType in incorrect places.
diff --git a/clang/test/Analysis/region-only-test.c b/clang/test/Analysis/region-only-test.c
index 701da72f82e..fdc740488a2 100644
--- a/clang/test/Analysis/region-only-test.c
+++ b/clang/test/Analysis/region-only-test.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=region -verify %s
// Region store must be enabled for tests in this file.
diff --git a/clang/test/Analysis/retain-release-basic-store.m b/clang/test/Analysis/retain-release-basic-store.m
index 651135a72f9..b16c231ce23 100644
--- a/clang/test/Analysis/retain-release-basic-store.m
+++ b/clang/test/Analysis/retain-release-basic-store.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s
//===----------------------------------------------------------------------===//
// The following code is reduced using delta-debugging from
diff --git a/clang/test/Analysis/retain-release-gc-only.m b/clang/test/Analysis/retain-release-gc-only.m
index 231eec9aa69..b378b048ce4 100644
--- a/clang/test/Analysis/retain-release-gc-only.m
+++ b/clang/test/Analysis/retain-release-gc-only.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -verify -fobjc-gc-only %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -fobjc-gc-only -verify %s
+// RUN: clang-cc -analyze -checker-cfref -verify -fobjc-gc-only %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -fobjc-gc-only -verify %s
//===----------------------------------------------------------------------===//
// Header stuff.
diff --git a/clang/test/Analysis/retain-release-region-store.m b/clang/test/Analysis/retain-release-region-store.m
index 651ffa76dfb..66950e2190e 100644
--- a/clang/test/Analysis/retain-release-region-store.m
+++ b/clang/test/Analysis/retain-release-region-store.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
//===----------------------------------------------------------------------===//
// The following code is reduced using delta-debugging from
diff --git a/clang/test/Analysis/retain-release.m b/clang/test/Analysis/retain-release.m
index 9fd15d3e7a5..6e75b0d3219 100644
--- a/clang/test/Analysis/retain-release.m
+++ b/clang/test/Analysis/retain-release.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
//===----------------------------------------------------------------------===//
diff --git a/clang/test/Analysis/stack-addr-ps.c b/clang/test/Analysis/stack-addr-ps.c
index 3ee2063e246..aa3c135f374 100644
--- a/clang/test/Analysis/stack-addr-ps.c
+++ b/clang/test/Analysis/stack-addr-ps.c
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-simple -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
#include <stdlib.h>
diff --git a/clang/test/Analysis/uninit-msg-expr.m b/clang/test/Analysis/uninit-msg-expr.m
index aad1a721f14..161ab8041de 100644
--- a/clang/test/Analysis/uninit-msg-expr.m
+++ b/clang/test/Analysis/uninit-msg-expr.m
@@ -1,6 +1,6 @@
-// RUN: clang -analyze -checker-simple -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
//===----------------------------------------------------------------------===//
// The following code is reduced using delta-debugging from
diff --git a/clang/test/Analysis/uninit-ps-rdar6145427.m b/clang/test/Analysis/uninit-ps-rdar6145427.m
index 126a5940235..49eb26984a0 100644
--- a/clang/test/Analysis/uninit-ps-rdar6145427.m
+++ b/clang/test/Analysis/uninit-ps-rdar6145427.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -verify -analyzer-store=basic -checker-cfref %s &&
-// RUN: clang -analyze -verify -analyzer-store=region -checker-cfref %s
+// RUN: clang-cc -analyze -verify -analyzer-store=basic -checker-cfref %s &&
+// RUN: clang-cc -analyze -verify -analyzer-store=region -checker-cfref %s
// Delta-Debugging reduced preamble.
typedef signed char BOOL;
diff --git a/clang/test/Analysis/uninit-vals-ps-region.c b/clang/test/Analysis/uninit-vals-ps-region.c
index 7e3d711bae8..6f3762ee10b 100644
--- a/clang/test/Analysis/uninit-vals-ps-region.c
+++ b/clang/test/Analysis/uninit-vals-ps-region.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -checker-simple -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-simple -analyzer-store=region -verify %s
struct s {
int data;
diff --git a/clang/test/Analysis/uninit-vals-ps.c b/clang/test/Analysis/uninit-vals-ps.c
index 659bee748f1..37075a2ef85 100644
--- a/clang/test/Analysis/uninit-vals-ps.c
+++ b/clang/test/Analysis/uninit-vals-ps.c
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
struct FPRec {
void (*my_func)(int * x);
diff --git a/clang/test/Analysis/uninit-vals.c b/clang/test/Analysis/uninit-vals.c
index 2f2c33d67d7..bb0b8a49e74 100644
--- a/clang/test/Analysis/uninit-vals.c
+++ b/clang/test/Analysis/uninit-vals.c
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-uninit-values -verify %s
+// RUN: clang-cc -analyze -warn-uninit-values -verify %s
int f1() {
int x;
diff --git a/clang/test/Analysis/uninit-vals.m b/clang/test/Analysis/uninit-vals.m
index 85efe5700b2..7be247e7ca9 100644
--- a/clang/test/Analysis/uninit-vals.m
+++ b/clang/test/Analysis/uninit-vals.m
@@ -1,5 +1,5 @@
-// RUN: clang -analyze -checker-cfref -analyzer-store=basic -verify %s &&
-// RUN: clang -analyze -checker-cfref -analyzer-store=region -verify %s
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=basic -verify %s &&
+// RUN: clang-cc -analyze -checker-cfref -analyzer-store=region -verify %s
typedef unsigned int NSUInteger;
diff --git a/clang/test/Analysis/unused-ivars.m b/clang/test/Analysis/unused-ivars.m
index f1568dacc18..632b395c3e0 100644
--- a/clang/test/Analysis/unused-ivars.m
+++ b/clang/test/Analysis/unused-ivars.m
@@ -1,4 +1,4 @@
-// RUN: clang -analyze -warn-objc-unused-ivars %s -verify
+// RUN: clang-cc -analyze -warn-objc-unused-ivars %s -verify
@interface A
{
diff --git a/clang/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c b/clang/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c
index 74203c5b1e7..3b158241c68 100644
--- a/clang/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c
+++ b/clang/test/CodeGen/2007-11-29-ArraySizeFromInitializer.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
int array[] = {1, 2, 3, 4, 5};
diff --git a/clang/test/CodeGen/2008-02-07-bitfield-bug.c b/clang/test/CodeGen/2008-02-07-bitfield-bug.c
index 65f54115425..dc2ebb75d59 100644
--- a/clang/test/CodeGen/2008-02-07-bitfield-bug.c
+++ b/clang/test/CodeGen/2008-02-07-bitfield-bug.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
// PR1990
struct test {
diff --git a/clang/test/CodeGen/2008-02-08-bitfield-bug.c b/clang/test/CodeGen/2008-02-08-bitfield-bug.c
index 3818e961c73..fc69e58ed3c 100644
--- a/clang/test/CodeGen/2008-02-08-bitfield-bug.c
+++ b/clang/test/CodeGen/2008-02-08-bitfield-bug.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
struct test {
unsigned a:1;
diff --git a/clang/test/CodeGen/2008-02-26-inline-asm-bug.c b/clang/test/CodeGen/2008-02-26-inline-asm-bug.c
index 668b06c0d18..a6816f5de8f 100644
--- a/clang/test/CodeGen/2008-02-26-inline-asm-bug.c
+++ b/clang/test/CodeGen/2008-02-26-inline-asm-bug.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep "\$0,\$1"
+// RUN: clang-cc -emit-llvm < %s | grep "\$0,\$1"
void f() {
int d1, d2;
diff --git a/clang/test/CodeGen/2008-07-17-no-emit-on-error.c b/clang/test/CodeGen/2008-07-17-no-emit-on-error.c
index 1d3c87be912..89aeb18d9d1 100644
--- a/clang/test/CodeGen/2008-07-17-no-emit-on-error.c
+++ b/clang/test/CodeGen/2008-07-17-no-emit-on-error.c
@@ -1,5 +1,5 @@
// RUN: rm -f %t1.bc
-// RUN: not clang %s -emit-llvm-bc -o %t1.bc
+// RUN: not clang-cc %s -emit-llvm-bc -o %t1.bc
// RUN: not test -f %t1.bc
void f() {
diff --git a/clang/test/CodeGen/2008-07-21-mixed-var-fn-decl.c b/clang/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
index a7d09765134..c55c86b2fc6 100644
--- a/clang/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
+++ b/clang/test/CodeGen/2008-07-21-mixed-var-fn-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s | grep -e "@g[0-9] " | count 2
+// RUN: clang-cc -emit-llvm -o - %s | grep -e "@g[0-9] " | count 2
int g0, f0();
int f1(), g1;
diff --git a/clang/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c b/clang/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
index a9708516fbc..19bf9a2b078 100644
--- a/clang/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
+++ b/clang/test/CodeGen/2008-07-22-bitfield-init-after-zero-len-array.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm -o %t %s &&
+// RUN: clang-cc --emit-llvm -o %t %s &&
// RUN: grep "i8 52" %t | count 1
struct et7 {
diff --git a/clang/test/CodeGen/2008-07-22-packed-bitfield-access.c b/clang/test/CodeGen/2008-07-22-packed-bitfield-access.c
index b41b5e0e40d..437a4be156b 100644
--- a/clang/test/CodeGen/2008-07-22-packed-bitfield-access.c
+++ b/clang/test/CodeGen/2008-07-22-packed-bitfield-access.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
int main () {
struct foo {
diff --git a/clang/test/CodeGen/2008-07-29-override-alias-decl.c b/clang/test/CodeGen/2008-07-29-override-alias-decl.c
index 115cc33b04e..43f4e3eceda 100644
--- a/clang/test/CodeGen/2008-07-29-override-alias-decl.c
+++ b/clang/test/CodeGen/2008-07-29-override-alias-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s | grep -e "^@f" | count 1
+// RUN: clang-cc -emit-llvm -o - %s | grep -e "^@f" | count 1
int x() {}
diff --git a/clang/test/CodeGen/2008-07-30-implicit-initialization.c b/clang/test/CodeGen/2008-07-30-implicit-initialization.c
index 9dd05bffbf2..2f4c14eb728 100644
--- a/clang/test/CodeGen/2008-07-30-implicit-initialization.c
+++ b/clang/test/CodeGen/2008-07-30-implicit-initialization.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
// RUN: grep "ret i32" %t | count 2 &&
// RUN: grep "ret i32 0" %t | count 2
// <rdar://problem/6113085>
diff --git a/clang/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c b/clang/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
index f7c2908d98f..c374f8d0084 100644
--- a/clang/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
+++ b/clang/test/CodeGen/2008-07-30-redef-of-bitcasted-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm -o - %s
+// RUN: clang-cc --emit-llvm -o - %s
// <rdar://problem/6108358>
/* For posterity, the issue here begins initial "char []" decl for
diff --git a/clang/test/CodeGen/2008-07-31-asm-labels.c b/clang/test/CodeGen/2008-07-31-asm-labels.c
index 8aba2d39a72..f114f65eded 100644
--- a/clang/test/CodeGen/2008-07-31-asm-labels.c
+++ b/clang/test/CodeGen/2008-07-31-asm-labels.c
@@ -1,9 +1,9 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
// RUN: grep "@pipe()" %t | count 0 &&
// RUN: grep '_thisIsNotAPipe' %t | count 3 &&
// RUN: grep 'g0' %t | count 0 &&
// RUN: grep '_renamed' %t | count 2 &&
-// RUN: clang -DUSE_DEF -emit-llvm -o %t %s &&
+// RUN: clang-cc -DUSE_DEF -emit-llvm -o %t %s &&
// RUN: grep "@pipe()" %t | count 0 &&
// RUN: grep '_thisIsNotAPipe' %t | count 3
// <rdr://6116729>
diff --git a/clang/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c b/clang/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
index f1243dcbdec..0ce4ba66ca1 100644
--- a/clang/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
+++ b/clang/test/CodeGen/2008-07-31-promotion-of-compound-pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis | grep "ret i32 1" | count 3
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis | grep "ret i32 1" | count 3
// <rdr://6115726>
int f0() {
diff --git a/clang/test/CodeGen/2008-08-04-void-pointer-arithmetic.c b/clang/test/CodeGen/2008-08-04-void-pointer-arithmetic.c
index fc54dcac5e7..22815f32ccc 100644
--- a/clang/test/CodeGen/2008-08-04-void-pointer-arithmetic.c
+++ b/clang/test/CodeGen/2008-08-04-void-pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm -o - %s
+// RUN: clang-cc --emit-llvm -o - %s
// <rdar://problem/6122967>
int f0(void *a, void *b) {
diff --git a/clang/test/CodeGen/2008-08-19-cast-of-typedef.c b/clang/test/CodeGen/2008-08-19-cast-of-typedef.c
index 581c79356b6..3db5e903090 100644
--- a/clang/test/CodeGen/2008-08-19-cast-of-typedef.c
+++ b/clang/test/CodeGen/2008-08-19-cast-of-typedef.c
@@ -1,4 +1,4 @@
-// RUN: clang --emit-llvm -o %t %s
+// RUN: clang-cc --emit-llvm -o %t %s
typedef short T[4];
struct s {
diff --git a/clang/test/CodeGen/2008-08-25-incompatible-cond-expr.m b/clang/test/CodeGen/2008-08-25-incompatible-cond-expr.m
index c58935590b8..3cc42d89f6f 100644
--- a/clang/test/CodeGen/2008-08-25-incompatible-cond-expr.m
+++ b/clang/test/CodeGen/2008-08-25-incompatible-cond-expr.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
@protocol P0
@end
diff --git a/clang/test/CodeGen/2008-09-22-bad-switch-type.c b/clang/test/CodeGen/2008-09-22-bad-switch-type.c
index 62a420eed3d..2526dd9289c 100644
--- a/clang/test/CodeGen/2008-09-22-bad-switch-type.c
+++ b/clang/test/CodeGen/2008-09-22-bad-switch-type.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
// PR2817
void f0(void) {
diff --git a/clang/test/CodeGen/2008-12-02-logical-or-fold.c b/clang/test/CodeGen/2008-12-02-logical-or-fold.c
index ba8f86c4fc5..d54bf287d2e 100644
--- a/clang/test/CodeGen/2008-12-02-logical-or-fold.c
+++ b/clang/test/CodeGen/2008-12-02-logical-or-fold.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s | grep "store i32 1"
+// RUN: clang-cc -emit-llvm -o - %s | grep "store i32 1"
// PR3150
int a() {return 1||1;}
diff --git a/clang/test/CodeGen/2009-01-21-invalid-debug-info.m b/clang/test/CodeGen/2009-01-21-invalid-debug-info.m
index 509a6fb4ed4..9a955a1c0d9 100644
--- a/clang/test/CodeGen/2009-01-21-invalid-debug-info.m
+++ b/clang/test/CodeGen/2009-01-21-invalid-debug-info.m
@@ -1,4 +1,4 @@
-// RUN: clang -S -g -o %t.s %s
+// RUN: clang-cc -S -g -o %t.s %s
// FIXME: This test case can be removed at some point (since it will
// no longer effectively test anything). The reason it was causing
diff --git a/clang/test/CodeGen/2009-03-22-increment-bitfield.c b/clang/test/CodeGen/2009-03-22-increment-bitfield.c
index 7a18cea28d4..f0aaafda60e 100644
--- a/clang/test/CodeGen/2009-03-22-increment-bitfield.c
+++ b/clang/test/CodeGen/2009-03-22-increment-bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -O1 < %s | grep "ret i32 0"
+// RUN: clang-cc -emit-llvm -O1 < %s | grep "ret i32 0"
int a(void) {
return ++(struct x {unsigned x : 2;}){3}.x;
diff --git a/clang/test/CodeGen/OpaqueStruct.c b/clang/test/CodeGen/OpaqueStruct.c
index f005f2a0e5f..b994c300024 100644
--- a/clang/test/CodeGen/OpaqueStruct.c
+++ b/clang/test/CodeGen/OpaqueStruct.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
typedef struct a b;
b* x;
diff --git a/clang/test/CodeGen/PR2001-bitfield-reload.c b/clang/test/CodeGen/PR2001-bitfield-reload.c
index 7474f3e5c0e..797b494cf82 100644
--- a/clang/test/CodeGen/PR2001-bitfield-reload.c
+++ b/clang/test/CodeGen/PR2001-bitfield-reload.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt --std-compile-opts | llvm-dis > %t &&
// RUN: grep "ret i32" %t | count 1 &&
// RUN: grep "ret i32 1" %t | count 1
// PR2001
diff --git a/clang/test/CodeGen/PR2413-void-address-cast-error.c b/clang/test/CodeGen/PR2413-void-address-cast-error.c
index 9a66471b89e..95a4c6d80fc 100644
--- a/clang/test/CodeGen/PR2413-void-address-cast-error.c
+++ b/clang/test/CodeGen/PR2413-void-address-cast-error.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
void f()
{
void *addr;
diff --git a/clang/test/CodeGen/PR2643-null-store-to-bitfield.c b/clang/test/CodeGen/PR2643-null-store-to-bitfield.c
index 4fef84255a5..6a5b0e92f66 100644
--- a/clang/test/CodeGen/PR2643-null-store-to-bitfield.c
+++ b/clang/test/CodeGen/PR2643-null-store-to-bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s
+// RUN: clang-cc -emit-llvm -o - %s
// PR2643
void foo() {
diff --git a/clang/test/CodeGen/PR2743-reference-missing-static.c b/clang/test/CodeGen/PR2743-reference-missing-static.c
index 007a22f6ee8..e152c525852 100644
--- a/clang/test/CodeGen/PR2743-reference-missing-static.c
+++ b/clang/test/CodeGen/PR2743-reference-missing-static.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
// PR2743
// <rdr://6094512>
diff --git a/clang/test/CodeGen/PR3130-cond-constant.c b/clang/test/CodeGen/PR3130-cond-constant.c
index 7aa2ce1bc06..e488eeb37f6 100644
--- a/clang/test/CodeGen/PR3130-cond-constant.c
+++ b/clang/test/CodeGen/PR3130-cond-constant.c
@@ -1,3 +1,3 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
int a = 2.0 ? 1 : 2;
diff --git a/clang/test/CodeGen/PR3589-freestanding-libcalls.c b/clang/test/CodeGen/PR3589-freestanding-libcalls.c
index 61852e3c49b..90b5fff1620 100644
--- a/clang/test/CodeGen/PR3589-freestanding-libcalls.c
+++ b/clang/test/CodeGen/PR3589-freestanding-libcalls.c
@@ -1,6 +1,6 @@
-// RUN: clang -emit-llvm %s -o - | grep 'declare i32 @printf' | count 1 &&
-// RUN: clang -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 1 &&
-// RUN: clang -ffreestanding -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 0
+// RUN: clang-cc -emit-llvm %s -o - | grep 'declare i32 @printf' | count 1 &&
+// RUN: clang-cc -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 1 &&
+// RUN: clang-cc -ffreestanding -O2 -emit-llvm %s -o - | grep 'declare i32 @puts' | count 0
#include <stdio.h>
diff --git a/clang/test/CodeGen/PR3613-static-decl.c b/clang/test/CodeGen/PR3613-static-decl.c
index 6dcaa183d3f..365b9b2be05 100644
--- a/clang/test/CodeGen/PR3613-static-decl.c
+++ b/clang/test/CodeGen/PR3613-static-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o %t %s &&
// RUN: grep '@g0 = internal global .struct.s0 <{ i32 3 }>' %t | count 1
struct s0 {
diff --git a/clang/test/CodeGen/PR3709-int-to-pointer-sign.c b/clang/test/CodeGen/PR3709-int-to-pointer-sign.c
index 85944a37948..24c42f649bb 100644
--- a/clang/test/CodeGen/PR3709-int-to-pointer-sign.c
+++ b/clang/test/CodeGen/PR3709-int-to-pointer-sign.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - -O1 -triple=x86_64-gnu-linux | grep "i64 -1"
+// RUN: clang-cc -emit-llvm %s -o - -O1 -triple=x86_64-gnu-linux | grep "i64 -1"
// PR3709
long long a() { return (long long)(int*)-1;}
diff --git a/clang/test/CodeGen/address-space-cast.c b/clang/test/CodeGen/address-space-cast.c
index 473c8e0e81c..2fba5ecd7dc 100644
--- a/clang/test/CodeGen/address-space-cast.c
+++ b/clang/test/CodeGen/address-space-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s
+// RUN: clang-cc -emit-llvm < %s
volatile unsigned char* const __attribute__((address_space(1))) serial_ctrl = 0x02;
diff --git a/clang/test/CodeGen/address-space.c b/clang/test/CodeGen/address-space.c
index 46b194e3146..3b6a8e65416 100644
--- a/clang/test/CodeGen/address-space.c
+++ b/clang/test/CodeGen/address-space.c
@@ -1,8 +1,8 @@
-// RUN: clang -emit-llvm < %s | grep '@foo.*global.*addrspace(1)' &&
-// RUN: clang -emit-llvm < %s | grep '@ban.*global.*addrspace(1)' &&
-// RUN: clang -emit-llvm < %s | grep 'load.*addrspace(1)' | count 2 &&
-// RUN: clang -emit-llvm < %s | grep 'load.*addrspace(2).. @A' &&
-// RUN: clang -emit-llvm < %s | grep 'load.*addrspace(2).. @B'
+// RUN: clang-cc -emit-llvm < %s | grep '@foo.*global.*addrspace(1)' &&
+// RUN: clang-cc -emit-llvm < %s | grep '@ban.*global.*addrspace(1)' &&
+// RUN: clang-cc -emit-llvm < %s | grep 'load.*addrspace(1)' | count 2 &&
+// RUN: clang-cc -emit-llvm < %s | grep 'load.*addrspace(2).. @A' &&
+// RUN: clang-cc -emit-llvm < %s | grep 'load.*addrspace(2).. @B'
int foo __attribute__((address_space(1)));
int ban[10] __attribute__((address_space(1)));
diff --git a/clang/test/CodeGen/alias.c b/clang/test/CodeGen/alias.c
index 8fa788a6a21..c1a3baa9293 100644
--- a/clang/test/CodeGen/alias.c
+++ b/clang/test/CodeGen/alias.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-pc-linux-gnu -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o %t %s &&
// RUN: grep '@g0 = common global i32 0' %t &&
// RUN: grep '@f1 = alias void ()\* @f0' %t &&
// RUN: grep '@g1 = alias i32\* @g0' %t &&
diff --git a/clang/test/CodeGen/align-local.c b/clang/test/CodeGen/align-local.c
index 46f83fab8db..afbe1d5dd0d 100644
--- a/clang/test/CodeGen/align-local.c
+++ b/clang/test/CodeGen/align-local.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep "align 16" | count 2
+// RUN: clang-cc -emit-llvm < %s | grep "align 16" | count 2
typedef struct __attribute((aligned(16))) {int x[4];} ff;
diff --git a/clang/test/CodeGen/alignof.c b/clang/test/CodeGen/alignof.c
index edeb0db771e..d39f4e418eb 100644
--- a/clang/test/CodeGen/alignof.c
+++ b/clang/test/CodeGen/alignof.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -O1 -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -O1 -emit-llvm -o %t %s &&
// RUN: grep 'ret i32 4' %t
enum e0 { E0 };
diff --git a/clang/test/CodeGen/array.c b/clang/test/CodeGen/array.c
index ed56b5be63d..5bcc26ecf38 100644
--- a/clang/test/CodeGen/array.c
+++ b/clang/test/CodeGen/array.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
int f() {
int a[2];
diff --git a/clang/test/CodeGen/asm.c b/clang/test/CodeGen/asm.c
index d6030a64ba8..91d6320ac54 100644
--- a/clang/test/CodeGen/asm.c
+++ b/clang/test/CodeGen/asm.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t -arch=i386 &&
+// RUN: clang-cc -emit-llvm %s -o %t -arch=i386 &&
void t1(int len) {
__asm__ volatile("" : "=&r"(len), "+&r"(len));
}
diff --git a/clang/test/CodeGen/atomic.c b/clang/test/CodeGen/atomic.c
index bfebd345829..0e2d850dbb1 100644
--- a/clang/test/CodeGen/atomic.c
+++ b/clang/test/CodeGen/atomic.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - > %t1 &&
+// RUN: clang-cc %s -emit-llvm -o - > %t1 &&
// RUN: grep @llvm.atomic.load.add.i32 %t1 &&
// RUN: grep @llvm.atomic.load.sub.i32 %t1 &&
// RUN: grep @llvm.atomic.load.min.i32 %t1 &&
diff --git a/clang/test/CodeGen/attr-nodebug.c b/clang/test/CodeGen/attr-nodebug.c
index c9778c47f22..b96ad26d6d0 100644
--- a/clang/test/CodeGen/attr-nodebug.c
+++ b/clang/test/CodeGen/attr-nodebug.c
@@ -1,4 +1,4 @@
-// RUN: clang -g -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -emit-llvm -o %t %s &&
// RUN: not grep 'call void @llvm.dbg.func.start' %t
void t1() __attribute__((nodebug));
diff --git a/clang/test/CodeGen/attr-noinline.c b/clang/test/CodeGen/attr-noinline.c
index 5aacf64a944..199c2918d42 100644
--- a/clang/test/CodeGen/attr-noinline.c
+++ b/clang/test/CodeGen/attr-noinline.c
@@ -1,4 +1,4 @@
-// RUN: clang -g -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -emit-llvm -o %t %s &&
// RUN: grep 'noinline' %t
void t1() __attribute__((noinline));
diff --git a/clang/test/CodeGen/attr-used.c b/clang/test/CodeGen/attr-used.c
index c7f67600c0b..8521ffd2e4b 100644
--- a/clang/test/CodeGen/attr-used.c
+++ b/clang/test/CodeGen/attr-used.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
// RUN: grep '@llvm.used = .*@g0' %t &&
// RUN: grep '@llvm.used = .*@f0' %t &&
// RUN: grep '@llvm.used = .*@f1.l0' %t
diff --git a/clang/test/CodeGen/attributes.c b/clang/test/CodeGen/attributes.c
index 25b9fd064df..d45d5124b01 100644
--- a/clang/test/CodeGen/attributes.c
+++ b/clang/test/CodeGen/attributes.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
// RUN: grep 't1.*noreturn' %t &&
// RUN: grep 't2.*nounwind' %t &&
// RUN: grep 'weak.*t3' %t &&
diff --git a/clang/test/CodeGen/bitfield-assign.c b/clang/test/CodeGen/bitfield-assign.c
index 0453d77ba04..05d4dda353c 100644
--- a/clang/test/CodeGen/bitfield-assign.c
+++ b/clang/test/CodeGen/bitfield-assign.c
@@ -4,12 +4,12 @@
/* Check that we get one load for each simple assign and two for the
compound assign (load the old value before the add then load again
to store back). Also check that our g0 pattern is good. */
-// RUN: clang -triple i386-unknown-unknown -O0 -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -O0 -emit-llvm -o %t %s &&
// RUN: grep 'load ' %t | count 5 &&
// RUN: grep "@g0" %t | count 4 &&
// Check that we got the right value.
-// RUN: clang -triple i386-unknown-unknown -O3 -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -O3 -emit-llvm -o %t %s &&
// RUN: grep 'load ' %t | count 0 &&
// RUN: grep "@g0" %t | count 0
diff --git a/clang/test/CodeGen/bitfield-init.c b/clang/test/CodeGen/bitfield-init.c
index 1749bd3ff4d..f0cc0b15680 100644
--- a/clang/test/CodeGen/bitfield-init.c
+++ b/clang/test/CodeGen/bitfield-init.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
typedef struct { unsigned int i: 1; } c;
const c d = { 1 };
diff --git a/clang/test/CodeGen/bitfield.c b/clang/test/CodeGen/bitfield.c
index 6473d0760f8..da9a14884e2 100644
--- a/clang/test/CodeGen/bitfield.c
+++ b/clang/test/CodeGen/bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis > %t &&
// RUN: grep "ret i32" %t | count 4 &&
// RUN: grep "ret i32 1" %t | count 4
diff --git a/clang/test/CodeGen/blocks-1.c b/clang/test/CodeGen/blocks-1.c
index 54a83515680..5fbe76c15df 100644
--- a/clang/test/CodeGen/blocks-1.c
+++ b/clang/test/CodeGen/blocks-1.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t -fblocks -f__block &&
+// RUN: clang-cc %s -emit-llvm -o %t -fblocks -f__block &&
// RUN: grep "_Block_object_dispose" %t | count 15 &&
// RUN: grep "__copy_helper_block_" %t | count 12 &&
// RUN: grep "__destroy_helper_block_" %t | count 12 &&
diff --git a/clang/test/CodeGen/blocks.c b/clang/test/CodeGen/blocks.c
index d3d4cefacc4..4dfe553aecb 100644
--- a/clang/test/CodeGen/blocks.c
+++ b/clang/test/CodeGen/blocks.c
@@ -1,2 +1,2 @@
-// RUN: clang %s -emit-llvm -o %t -fblocks
+// RUN: clang-cc %s -emit-llvm -o %t -fblocks
void (^f)(void) = ^{};
diff --git a/clang/test/CodeGen/bool-bitfield.c b/clang/test/CodeGen/bool-bitfield.c
index d50927f9f33..50990a47c28 100644
--- a/clang/test/CodeGen/bool-bitfield.c
+++ b/clang/test/CodeGen/bool-bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
// From GCC PR19331
struct SysParams
diff --git a/clang/test/CodeGen/bool-convert.c b/clang/test/CodeGen/bool-convert.c
index 5e8bae1a93a..4df81bb82d7 100644
--- a/clang/test/CodeGen/bool-convert.c
+++ b/clang/test/CodeGen/bool-convert.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep i1 | count 1
+// RUN: clang-cc -emit-llvm < %s | grep i1 | count 1
// All of these should uses the memory representation of _Bool
struct teststruct1 {_Bool a, b;} test1;
_Bool* test2;
diff --git a/clang/test/CodeGen/bool-init.c b/clang/test/CodeGen/bool-init.c
index 2e5d56a0a1c..7d331ed07eb 100644
--- a/clang/test/CodeGen/bool-init.c
+++ b/clang/test/CodeGen/bool-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep i1 | count 1
+// RUN: clang-cc -emit-llvm < %s | grep i1 | count 1
// Check that the type of this global isn't i1
_Bool test = &test;
diff --git a/clang/test/CodeGen/boolassign.c b/clang/test/CodeGen/boolassign.c
index 0d4bf490ed6..2d14f8c1de1 100644
--- a/clang/test/CodeGen/boolassign.c
+++ b/clang/test/CodeGen/boolassign.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
int testBoolAssign(void) {
int ss;
diff --git a/clang/test/CodeGen/builtin-count-zeros.c b/clang/test/CodeGen/builtin-count-zeros.c
index 5453cb1d890..374acc43ae5 100644
--- a/clang/test/CodeGen/builtin-count-zeros.c
+++ b/clang/test/CodeGen/builtin-count-zeros.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | grep 'cttz' | count 2 &&
-// RUN: clang -emit-llvm %s -o - | grep 'ctlz' | count 2
+// RUN: clang-cc -emit-llvm %s -o - | grep 'cttz' | count 2 &&
+// RUN: clang-cc -emit-llvm %s -o - | grep 'ctlz' | count 2
int a(int a) {return __builtin_ctz(a) + __builtin_clz(a);}
diff --git a/clang/test/CodeGen/builtin-memfns.c b/clang/test/CodeGen/builtin-memfns.c
index 52b3a1d174a..e9e239624e6 100644
--- a/clang/test/CodeGen/builtin-memfns.c
+++ b/clang/test/CodeGen/builtin-memfns.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -emit-llvm -o %t %s &&
+// RUN: clang-cc -arch i386 -emit-llvm -o %t %s &&
// RUN: grep '@llvm.memset.i32' %t &&
// RUN: grep '@llvm.memcpy.i32' %t &&
// RUN: grep '@llvm.memmove.i32' %t &&
diff --git a/clang/test/CodeGen/builtin-rename.c b/clang/test/CodeGen/builtin-rename.c
index b5e4fef61f7..d0b5c2472de 100644
--- a/clang/test/CodeGen/builtin-rename.c
+++ b/clang/test/CodeGen/builtin-rename.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - | grep 'declare.*printf' | count 1
+// RUN: clang-cc %s -emit-llvm -o - | grep 'declare.*printf' | count 1
// PR3612
int printf(const char *, ...);
diff --git a/clang/test/CodeGen/builtin-stackaddress.c b/clang/test/CodeGen/builtin-stackaddress.c
index ddfb9dc790a..5c6d540172a 100644
--- a/clang/test/CodeGen/builtin-stackaddress.c
+++ b/clang/test/CodeGen/builtin-stackaddress.c
@@ -1,5 +1,5 @@
-// RUN: clang -emit-llvm < %s | grep "llvm.returnaddress" &&
-// RUN: clang -emit-llvm < %s | grep "llvm.frameaddress"
+// RUN: clang-cc -emit-llvm < %s | grep "llvm.returnaddress" &&
+// RUN: clang-cc -emit-llvm < %s | grep "llvm.frameaddress"
void* a(unsigned x) {
return __builtin_return_address(0);
}
diff --git a/clang/test/CodeGen/builtinmemcpy.c b/clang/test/CodeGen/builtinmemcpy.c
index 8600d986965..d1fdebbe828 100644
--- a/clang/test/CodeGen/builtinmemcpy.c
+++ b/clang/test/CodeGen/builtinmemcpy.c
@@ -1,3 +1,3 @@
-// RUN: clang -emit-llvm < %s -o - | grep "llvm.memcpy"
+// RUN: clang-cc -emit-llvm < %s -o - | grep "llvm.memcpy"
char* x(char* a, char* b) {return __builtin_memcpy(a, b, 4);}
diff --git a/clang/test/CodeGen/builtins-ffs_parity_popcount.c b/clang/test/CodeGen/builtins-ffs_parity_popcount.c
index 19a5cf9a679..47469985eed 100644
--- a/clang/test/CodeGen/builtins-ffs_parity_popcount.c
+++ b/clang/test/CodeGen/builtins-ffs_parity_popcount.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s > %t
+// RUN: clang-cc -emit-llvm -o - %s > %t
// RUN: ! grep "__builtin" %t
#include <stdio.h>
diff --git a/clang/test/CodeGen/builtins-powi.c b/clang/test/CodeGen/builtins-powi.c
index 6d82f8af51f..73f752f5e80 100644
--- a/clang/test/CodeGen/builtins-powi.c
+++ b/clang/test/CodeGen/builtins-powi.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s > %t
+// RUN: clang-cc -emit-llvm -o - %s > %t
// RUN: ! grep "__builtin" %t
#include <stdio.h>
diff --git a/clang/test/CodeGen/builtins-x86.c b/clang/test/CodeGen/builtins-x86.c
index 5e1aea4c620..17c2840a49a 100644
--- a/clang/test/CodeGen/builtins-x86.c
+++ b/clang/test/CodeGen/builtins-x86.c
@@ -1,5 +1,5 @@
-// RUN: clang -DUSE_64 -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -DUSE_ALL -triple x86_64-unknown-unknown -fsyntax-only -o %t %s
+// RUN: clang-cc -DUSE_64 -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -DUSE_ALL -triple x86_64-unknown-unknown -fsyntax-only -o %t %s
#ifdef USE_ALL
#define USE_3DNOW
diff --git a/clang/test/CodeGen/builtins.c b/clang/test/CodeGen/builtins.c
index 7a5e5d938d3..d14a29e572c 100644
--- a/clang/test/CodeGen/builtins.c
+++ b/clang/test/CodeGen/builtins.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
// RUN: not grep __builtin %t
#include <stdio.h>
diff --git a/clang/test/CodeGen/builtinshufflevector.c b/clang/test/CodeGen/builtinshufflevector.c
index de499f85280..9a3ae610282 100644
--- a/clang/test/CodeGen/builtinshufflevector.c
+++ b/clang/test/CodeGen/builtinshufflevector.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep 'shufflevector' | count 1
+// RUN: clang-cc -emit-llvm < %s | grep 'shufflevector' | count 1
typedef int v4si __attribute__ ((vector_size (16)));
v4si a(v4si x, v4si y) {return __builtin_shufflevector(x, y, 3, 2, 5, 7);}
diff --git a/clang/test/CodeGen/c-strings.c b/clang/test/CodeGen/c-strings.c
index a5a7ccd3b9c..ee85f60ed15 100644
--- a/clang/test/CodeGen/c-strings.c
+++ b/clang/test/CodeGen/c-strings.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
// RUN: grep "hello" %t | count 3 &&
// RUN: grep 'c"hello\\00"' %t | count 2 &&
// RUN: grep 'c"hello\\00\\00\\00"' %t | count 1 &&
diff --git a/clang/test/CodeGen/cast-to-union.c b/clang/test/CodeGen/cast-to-union.c
index 9f0b080d950..03aee3e30c4 100644
--- a/clang/test/CodeGen/cast-to-union.c
+++ b/clang/test/CodeGen/cast-to-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s -o %t &&
+// RUN: clang-cc -emit-llvm < %s -o %t &&
// RUN: grep "store i32 351, i32*" %t &&
// RUN: grep "w = global %0 <{ i32 2, i8 0, i8 0, i8 0, i8 0 }>" %t &&
// RUN: grep "y = global %1 <{ double 7.300000e+01 }>" %t
diff --git a/clang/test/CodeGen/cast.c b/clang/test/CodeGen/cast.c
index 00dd4c880d1..6fb2b116d47 100644
--- a/clang/test/CodeGen/cast.c
+++ b/clang/test/CodeGen/cast.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
extern void go(const void *p);
float v[2] = { 0.0, 1.0 };
diff --git a/clang/test/CodeGen/cfstring.c b/clang/test/CodeGen/cfstring.c
index 3bd1a2d1834..a78dfdaf650 100644
--- a/clang/test/CodeGen/cfstring.c
+++ b/clang/test/CodeGen/cfstring.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
#define CFSTR __builtin___CFStringMakeConstantString
void f() {
diff --git a/clang/test/CodeGen/cfstring2.c b/clang/test/CodeGen/cfstring2.c
index f92dc8c1771..7b808b4aab4 100644
--- a/clang/test/CodeGen/cfstring2.c
+++ b/clang/test/CodeGen/cfstring2.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
#ifdef __APPLE__
#include <Carbon/Carbon.h>
diff --git a/clang/test/CodeGen/cleanup-stack.c b/clang/test/CodeGen/cleanup-stack.c
index cc734e6a36e..3a134329a13 100644
--- a/clang/test/CodeGen/cleanup-stack.c
+++ b/clang/test/CodeGen/cleanup-stack.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t &&
+// RUN: clang-cc -emit-llvm %s -o %t &&
// RUN: grep "store i32 0, i32\* %cleanup" %t | count 2
void f(int n) {
int a[n];
diff --git a/clang/test/CodeGen/complex.c b/clang/test/CodeGen/complex.c
index 9c0e3d5fc5f..75fae79715e 100644
--- a/clang/test/CodeGen/complex.c
+++ b/clang/test/CodeGen/complex.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s
+// RUN: clang-cc -emit-llvm < %s
int main(void)
{
diff --git a/clang/test/CodeGen/compound-literal.c b/clang/test/CodeGen/compound-literal.c
index a99ffe81704..ef0436744da 100644
--- a/clang/test/CodeGen/compound-literal.c
+++ b/clang/test/CodeGen/compound-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm
+// RUN: clang-cc < %s -emit-llvm
int* a = &(int){1};
struct s {int a, b, c;} * b = &(struct s) {1, 2, 3};
diff --git a/clang/test/CodeGen/compound.c b/clang/test/CodeGen/compound.c
index c8afceef760..c5460070533 100644
--- a/clang/test/CodeGen/compound.c
+++ b/clang/test/CodeGen/compound.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm
+// RUN: clang-cc < %s -emit-llvm
int A;
long long B;
int C;
diff --git a/clang/test/CodeGen/conditional-gnu-ext.c b/clang/test/CodeGen/conditional-gnu-ext.c
index c3ff2bdccc5..1483d8af859 100644
--- a/clang/test/CodeGen/conditional-gnu-ext.c
+++ b/clang/test/CodeGen/conditional-gnu-ext.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
// PR1824
int foo(int x, short y) {
diff --git a/clang/test/CodeGen/conditional.c b/clang/test/CodeGen/conditional.c
index 81e5ff525c9..22286705c89 100644
--- a/clang/test/CodeGen/conditional.c
+++ b/clang/test/CodeGen/conditional.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
float test1(int cond, float a, float b)
{
diff --git a/clang/test/CodeGen/const-init.c b/clang/test/CodeGen/const-init.c
index 30fc7552465..e7b83a33ce3 100644
--- a/clang/test/CodeGen/const-init.c
+++ b/clang/test/CodeGen/const-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -verify -emit-llvm -o %t %s &&
+// RUN: clang-cc -arch i386 -verify -emit-llvm -o %t %s &&
#include <stdint.h>
diff --git a/clang/test/CodeGen/const-label-addr.c b/clang/test/CodeGen/const-label-addr.c
index 1ae74e5ad06..f8c35c67678 100644
--- a/clang/test/CodeGen/const-label-addr.c
+++ b/clang/test/CodeGen/const-label-addr.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
int a() {
A:;static void* a = &&A;
}
diff --git a/clang/test/CodeGen/constant-comparison.c b/clang/test/CodeGen/constant-comparison.c
index b7b2a0ed5ab..ea3e8962b33 100644
--- a/clang/test/CodeGen/constant-comparison.c
+++ b/clang/test/CodeGen/constant-comparison.c
@@ -1,5 +1,5 @@
-// RUN: clang -emit-llvm %s -o - 2>&1 | not grep warning &&
-// RUN: clang -emit-llvm %s -o - | grep @b | count 1
+// RUN: clang-cc -emit-llvm %s -o - 2>&1 | not grep warning &&
+// RUN: clang-cc -emit-llvm %s -o - | grep @b | count 1
int a, b;
int *c1 = 1 < 2 ? &a : &b;
diff --git a/clang/test/CodeGen/constructor-attribute.c b/clang/test/CodeGen/constructor-attribute.c
index f75fa4f7fac..9a1fa76c622 100644
--- a/clang/test/CodeGen/constructor-attribute.c
+++ b/clang/test/CodeGen/constructor-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
// RUN: grep -e "global_ctors.*@A" %t &&
// RUN: grep -e "global_dtors.*@B" %t &&
// RUN: grep -e "global_ctors.*@C" %t &&
diff --git a/clang/test/CodeGen/cxx-condition.cpp b/clang/test/CodeGen/cxx-condition.cpp
index 746aadda552..330a17a10a4 100644
--- a/clang/test/CodeGen/cxx-condition.cpp
+++ b/clang/test/CodeGen/cxx-condition.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
void f() {
int a;
diff --git a/clang/test/CodeGen/cxx-default-arg.cpp b/clang/test/CodeGen/cxx-default-arg.cpp
index 017b17d2c99..8391b9ccae1 100644
--- a/clang/test/CodeGen/cxx-default-arg.cpp
+++ b/clang/test/CodeGen/cxx-default-arg.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
// Note: define CLANG_GENERATE_KNOWN_GOOD and compile to generate code
// that makes all of the defaulted arguments explicit. The resulting
diff --git a/clang/test/CodeGen/cxx-value-init.cpp b/clang/test/CodeGen/cxx-value-init.cpp
index 50e08dba02d..e23869879fb 100644
--- a/clang/test/CodeGen/cxx-value-init.cpp
+++ b/clang/test/CodeGen/cxx-value-init.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
enum E {};
int v1 = E();
diff --git a/clang/test/CodeGen/debug-info.c b/clang/test/CodeGen/debug-info.c
index 2ecae9fa6d5..0cb01a34cdc 100644
--- a/clang/test/CodeGen/debug-info.c
+++ b/clang/test/CodeGen/debug-info.c
@@ -1,4 +1,4 @@
-// RUN: clang -o %t --emit-llvm -g %s
+// RUN: clang-cc -o %t --emit-llvm -g %s
// PR3023
void convert(void) {
diff --git a/clang/test/CodeGen/designated-initializers.c b/clang/test/CodeGen/designated-initializers.c
index 617c4287d56..94d446c4e0e 100644
--- a/clang/test/CodeGen/designated-initializers.c
+++ b/clang/test/CodeGen/designated-initializers.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown %s -emit-llvm -o - | grep "<{ i8\* null, i32 1024 }>"
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o - | grep "<{ i8\* null, i32 1024 }>"
struct foo {
void *a;
diff --git a/clang/test/CodeGen/dllimport-dllexport.c b/clang/test/CodeGen/dllimport-dllexport.c
index 306f4ee26ab..fe49ae7a32a 100644
--- a/clang/test/CodeGen/dllimport-dllexport.c
+++ b/clang/test/CodeGen/dllimport-dllexport.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s -o %t &&
+// RUN: clang-cc -emit-llvm < %s -o %t &&
// RUN: grep 'dllexport' %t | count 1 &&
// RUN: not grep 'dllimport' %t
diff --git a/clang/test/CodeGen/dostmt.c b/clang/test/CodeGen/dostmt.c
index 63547da328c..4fb3dcdee9b 100644
--- a/clang/test/CodeGen/dostmt.c
+++ b/clang/test/CodeGen/dostmt.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
int bar();
int test0() {
diff --git a/clang/test/CodeGen/emit-all-decls.c b/clang/test/CodeGen/emit-all-decls.c
index 68b6aecd670..775cb6f118a 100644
--- a/clang/test/CodeGen/emit-all-decls.c
+++ b/clang/test/CodeGen/emit-all-decls.c
@@ -1,6 +1,6 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
// RUN: not grep "@foo" %t &&
-// RUN: clang -femit-all-decls -emit-llvm -o %t %s &&
+// RUN: clang-cc -femit-all-decls -emit-llvm -o %t %s &&
// RUN: grep "@foo" %t
static void foo() {
diff --git a/clang/test/CodeGen/empty-union-init.c b/clang/test/CodeGen/empty-union-init.c
index 82ff84d0deb..8448b3ded79 100644
--- a/clang/test/CodeGen/empty-union-init.c
+++ b/clang/test/CodeGen/empty-union-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s -o -
+// RUN: clang-cc -emit-llvm < %s -o -
// PR2419
struct Mem {
diff --git a/clang/test/CodeGen/enum.c b/clang/test/CodeGen/enum.c
index 50b558d250c..172d308c2b0 100644
--- a/clang/test/CodeGen/enum.c
+++ b/clang/test/CodeGen/enum.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis | grep 'ret i32 6'
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm-bc -o - | opt -std-compile-opts | llvm-dis | grep 'ret i32 6'
static enum { foo, bar = 1U } z;
diff --git a/clang/test/CodeGen/exprs.c b/clang/test/CodeGen/exprs.c
index dbc14997d4e..808db178ef8 100644
--- a/clang/test/CodeGen/exprs.c
+++ b/clang/test/CodeGen/exprs.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
// PR1895
// sizeof function
diff --git a/clang/test/CodeGen/ext-vector-shuffle.c b/clang/test/CodeGen/ext-vector-shuffle.c
index dfeffac7a98..37d3ed42d06 100644
--- a/clang/test/CodeGen/ext-vector-shuffle.c
+++ b/clang/test/CodeGen/ext-vector-shuffle.c
@@ -1,6 +1,6 @@
-// RUN: clang %s -emit-llvm -o - | not grep 'extractelement'
-// RUN: clang %s -emit-llvm -o - | not grep 'insertelement'
-// RUN: clang %s -emit-llvm -o - | grep 'shufflevector'
+// RUN: clang-cc %s -emit-llvm -o - | not grep 'extractelement'
+// RUN: clang-cc %s -emit-llvm -o - | not grep 'insertelement'
+// RUN: clang-cc %s -emit-llvm -o - | grep 'shufflevector'
typedef __attribute__(( ext_vector_type(2) )) float float2;
typedef __attribute__(( ext_vector_type(4) )) float float4;
diff --git a/clang/test/CodeGen/ext-vector.c b/clang/test/CodeGen/ext-vector.c
index 0a57397d7cd..249142a5104 100644
--- a/clang/test/CodeGen/ext-vector.c
+++ b/clang/test/CodeGen/ext-vector.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
typedef __attribute__(( ext_vector_type(4) )) float float4;
typedef __attribute__(( ext_vector_type(2) )) float float2;
diff --git a/clang/test/CodeGen/extern-block-var.c b/clang/test/CodeGen/extern-block-var.c
index 35136384913..e8de3e7f11f 100644
--- a/clang/test/CodeGen/extern-block-var.c
+++ b/clang/test/CodeGen/extern-block-var.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
int f() {
extern int a;
diff --git a/clang/test/CodeGen/flexible-array-init.c b/clang/test/CodeGen/flexible-array-init.c
index 0e2fcc69d11..fb98a8ec07a 100644
--- a/clang/test/CodeGen/flexible-array-init.c
+++ b/clang/test/CodeGen/flexible-array-init.c
@@ -1,7 +1,7 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o - %s | grep 7 | count 1 &&
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o - %s | grep 11 | count 1 &&
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o - %s | grep 13 | count 1 &&
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o - %s | grep 15 | count 1
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o - %s | grep 7 | count 1 &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o - %s | grep 11 | count 1 &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o - %s | grep 13 | count 1 &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o - %s | grep 15 | count 1
struct { int x; int y[]; } a = { 1, 7, 11 };
diff --git a/clang/test/CodeGen/func-decl-cleanup.c b/clang/test/CodeGen/func-decl-cleanup.c
index fa1e3d69b16..4808e12fdfc 100644
--- a/clang/test/CodeGen/func-decl-cleanup.c
+++ b/clang/test/CodeGen/func-decl-cleanup.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
// PR2360
diff --git a/clang/test/CodeGen/func-return-member.c b/clang/test/CodeGen/func-return-member.c
index f31a53afcee..e6fc5623904 100644
--- a/clang/test/CodeGen/func-return-member.c
+++ b/clang/test/CodeGen/func-return-member.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s 2>&1 | not grep 'cannot codegen this l-value expression yet'
+// RUN: clang-cc -emit-llvm < %s 2>&1 | not grep 'cannot codegen this l-value expression yet'
struct frk { float _Complex c; int x; };
struct faz { struct frk f; };
diff --git a/clang/test/CodeGen/function-attributes.c b/clang/test/CodeGen/function-attributes.c
index eb8b1e33249..373eb63b700 100644
--- a/clang/test/CodeGen/function-attributes.c
+++ b/clang/test/CodeGen/function-attributes.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o %t %s &&
// RUN: grep 'define signext i8 @f0(i32 %x) nounwind' %t &&
// RUN: grep 'define zeroext i8 @f1(i32 %x) nounwind' %t &&
// RUN: grep 'define void @f2(i8 signext %x) nounwind' %t &&
diff --git a/clang/test/CodeGen/functions.c b/clang/test/CodeGen/functions.c
index 3b50df79f6d..55f580b303c 100644
--- a/clang/test/CodeGen/functions.c
+++ b/clang/test/CodeGen/functions.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t &&
+// RUN: clang-cc %s -emit-llvm -o %t &&
int g();
diff --git a/clang/test/CodeGen/global-decls.c b/clang/test/CodeGen/global-decls.c
index b0e35bd7a6d..f08a7dc13fd 100644
--- a/clang/test/CodeGen/global-decls.c
+++ b/clang/test/CodeGen/global-decls.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -emit-llvm -o %t %s &&
+// RUN: clang-cc -arch i386 -emit-llvm -o %t %s &&
// RUN: grep '@g0_ext = extern_weak global i32' %t &&
extern int g0_ext __attribute__((weak));
diff --git a/clang/test/CodeGen/global-init.c b/clang/test/CodeGen/global-init.c
index 133a3b5373f..4b769f8ccbb 100644
--- a/clang/test/CodeGen/global-init.c
+++ b/clang/test/CodeGen/global-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s | not grep "common"
+// RUN: clang-cc -emit-llvm -o - %s | not grep "common"
// This checks that the global won't be marked as common.
// (It shouldn't because it's being initialized).
diff --git a/clang/test/CodeGen/global-with-initialiser.c b/clang/test/CodeGen/global-with-initialiser.c
index be12c24f81d..29b4e21b912 100644
--- a/clang/test/CodeGen/global-with-initialiser.c
+++ b/clang/test/CodeGen/global-with-initialiser.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
const int globalInt = 1;
int globalIntWithFloat = 1.5f;
diff --git a/clang/test/CodeGen/globalinit.c b/clang/test/CodeGen/globalinit.c
index 1bcb3e48f50..2798cae712a 100644
--- a/clang/test/CodeGen/globalinit.c
+++ b/clang/test/CodeGen/globalinit.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
int A[10] = { 1,2,3,4,5 };
diff --git a/clang/test/CodeGen/incomplete-function-type.c b/clang/test/CodeGen/incomplete-function-type.c
index 09e08d729c2..a641268cf50 100644
--- a/clang/test/CodeGen/incomplete-function-type.c
+++ b/clang/test/CodeGen/incomplete-function-type.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | not grep opaque
+// RUN: clang-cc -emit-llvm %s -o - | not grep opaque
enum teste1 test1f(void), (*test1)(void) = test1f;
struct tests2 test2f(), (*test2)() = test2f;
diff --git a/clang/test/CodeGen/indirect-goto.c b/clang/test/CodeGen/indirect-goto.c
index 62c2726d695..b9a60195387 100644
--- a/clang/test/CodeGen/indirect-goto.c
+++ b/clang/test/CodeGen/indirect-goto.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
// RUN: grep "ret i32" %t | count 1 &&
// RUN: grep "ret i32 210" %t | count 1
diff --git a/clang/test/CodeGen/init-with-member-expr.c b/clang/test/CodeGen/init-with-member-expr.c
index 606f9dc8d00..7750dbf9869 100644
--- a/clang/test/CodeGen/init-with-member-expr.c
+++ b/clang/test/CodeGen/init-with-member-expr.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm
+// RUN: clang-cc < %s -emit-llvm
struct test {
int a;
};
diff --git a/clang/test/CodeGen/init.c b/clang/test/CodeGen/init.c
index b53b81edb8b..2e239cf5438 100644
--- a/clang/test/CodeGen/init.c
+++ b/clang/test/CodeGen/init.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm %s -o %t &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm %s -o %t &&
void f1() {
// Scalars in braces.
diff --git a/clang/test/CodeGen/int-to-pointer.c b/clang/test/CodeGen/int-to-pointer.c
index e427e73f6d5..7cefc3902eb 100644
--- a/clang/test/CodeGen/int-to-pointer.c
+++ b/clang/test/CodeGen/int-to-pointer.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
void *test(int i)
{
diff --git a/clang/test/CodeGen/kr-func-promote.c b/clang/test/CodeGen/kr-func-promote.c
index 2b55a39be02..d4c3851909a 100644
--- a/clang/test/CodeGen/kr-func-promote.c
+++ b/clang/test/CodeGen/kr-func-promote.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown %s -emit-llvm -o - | grep "i32 @a(i32)"
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o - | grep "i32 @a(i32)"
int a();
int a(x) short x; {return x;}
diff --git a/clang/test/CodeGen/libcalls.c b/clang/test/CodeGen/libcalls.c
index 9224fe10c75..695321622fe 100644
--- a/clang/test/CodeGen/libcalls.c
+++ b/clang/test/CodeGen/libcalls.c
@@ -1,7 +1,7 @@
-// RUN: clang -fmath-errno=1 -emit-llvm -o %t %s &&
+// RUN: clang-cc -fmath-errno=1 -emit-llvm -o %t %s &&
// RUN: grep "declare " %t | count 6 &&
// RUN: grep "declare " %t | grep "@llvm." | count 1 &&
-// RUN: clang -fmath-errno=0 -emit-llvm -o %t %s &&
+// RUN: clang-cc -fmath-errno=0 -emit-llvm -o %t %s &&
// RUN: grep "declare " %t | count 6 &&
// RUN: grep "declare " %t | grep -v "@llvm." | count 0
diff --git a/clang/test/CodeGen/linkage-redecl.c b/clang/test/CodeGen/linkage-redecl.c
index df8a9939499..b015ca85473 100644
--- a/clang/test/CodeGen/linkage-redecl.c
+++ b/clang/test/CodeGen/linkage-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - |grep internal
+// RUN: clang-cc -emit-llvm %s -o - |grep internal
// C99 6.2.2p3
// PR3425
diff --git a/clang/test/CodeGen/long-double-x86.c b/clang/test/CodeGen/long-double-x86.c
index 8954042afd9..b01ce0b93ec 100644
--- a/clang/test/CodeGen/long-double-x86.c
+++ b/clang/test/CodeGen/long-double-x86.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep x86_fp80
+// RUN: clang-cc %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep x86_fp80
long double x = 0;
int checksize[sizeof(x) == 16 ? 1 : -1];
diff --git a/clang/test/CodeGen/mandel.c b/clang/test/CodeGen/mandel.c
index 388e922e010..6f46ee407f5 100644
--- a/clang/test/CodeGen/mandel.c
+++ b/clang/test/CodeGen/mandel.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
/* Sparc is not C99-compliant */
#if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
diff --git a/clang/test/CodeGen/mangle.c b/clang/test/CodeGen/mangle.c
index 89e0e8a79a8..6571a4b7873 100644
--- a/clang/test/CodeGen/mangle.c
+++ b/clang/test/CodeGen/mangle.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -emit-llvm -o %t %s &&
+// RUN: clang-cc -arch i386 -emit-llvm -o %t %s &&
// RUN: grep '@_Z2f0i' %t &&
// RUN: grep '@_Z2f0l' %t &&
diff --git a/clang/test/CodeGen/merge-attrs.c b/clang/test/CodeGen/merge-attrs.c
index 3c1d62aeca3..1aab47a3a30 100644
--- a/clang/test/CodeGen/merge-attrs.c
+++ b/clang/test/CodeGen/merge-attrs.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
void *malloc(__SIZE_TYPE__ size) __attribute__ ((__nothrow__));
diff --git a/clang/test/CodeGen/merge-statics.c b/clang/test/CodeGen/merge-statics.c
index 1e0d6891221..c442669e642 100644
--- a/clang/test/CodeGen/merge-statics.c
+++ b/clang/test/CodeGen/merge-statics.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm | grep internal | count 1
+// RUN: clang-cc < %s -emit-llvm | grep internal | count 1
// The two decls for 'a' should merge into one llvm GlobalVariable.
diff --git a/clang/test/CodeGen/mmintrin-test.c b/clang/test/CodeGen/mmintrin-test.c
index 6d68a75ff2d..97f3b3b67c6 100644
--- a/clang/test/CodeGen/mmintrin-test.c
+++ b/clang/test/CodeGen/mmintrin-test.c
@@ -1,6 +1,6 @@
-// RUN: clang -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
// RUN: grep define %t | count 1 &&
-// RUN: clang -triple i386-apple-darwin9 -g -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-apple-darwin9 -g -emit-llvm -o %t %s &&
// RUN: grep define %t | count 1
#include <mmintrin.h>
diff --git a/clang/test/CodeGen/offsetof.c b/clang/test/CodeGen/offsetof.c
index 7b6f5039f8c..b0f5727a92d 100644
--- a/clang/test/CodeGen/offsetof.c
+++ b/clang/test/CodeGen/offsetof.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
// PR2910
struct sockaddr_un {
diff --git a/clang/test/CodeGen/opaque-pointer.c b/clang/test/CodeGen/opaque-pointer.c
index ba307f4d193..7f78b91fb17 100644
--- a/clang/test/CodeGen/opaque-pointer.c
+++ b/clang/test/CodeGen/opaque-pointer.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
struct test;
typedef void (*my_func) (struct test *);
diff --git a/clang/test/CodeGen/overloadable.c b/clang/test/CodeGen/overloadable.c
index 4e24c91a79f..4b58c825462 100644
--- a/clang/test/CodeGen/overloadable.c
+++ b/clang/test/CodeGen/overloadable.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | grep _Z1fPA10_1X
+// RUN: clang-cc -emit-llvm %s -o - | grep _Z1fPA10_1X
int __attribute__((overloadable)) f(int x) { return x; }
float __attribute__((overloadable)) f(float x) { return x; }
double __attribute__((overloadable)) f(double x) { return x; }
diff --git a/clang/test/CodeGen/parameter-passing.c b/clang/test/CodeGen/parameter-passing.c
index f9ff8a86912..2ace299ef77 100644
--- a/clang/test/CodeGen/parameter-passing.c
+++ b/clang/test/CodeGen/parameter-passing.c
@@ -5,13 +5,13 @@
// We also check _Bool and empty structures, as these can have annoying
// corner cases.
-// RUN: clang %s -triple i386-unknown-unknown -O3 -emit-llvm -o %t &&
+// RUN: clang-cc %s -triple i386-unknown-unknown -O3 -emit-llvm -o %t &&
// RUN: not grep '@g0' %t &&
-// RUN: clang %s -triple x86_64-unknown-unknown -O3 -emit-llvm -o %t &&
+// RUN: clang-cc %s -triple x86_64-unknown-unknown -O3 -emit-llvm -o %t &&
// RUN: not grep '@g0' %t &&
-// RUN: clang %s -triple ppc-unknown-unknown -O3 -emit-llvm -o %t &&
+// RUN: clang-cc %s -triple ppc-unknown-unknown -O3 -emit-llvm -o %t &&
// RUN: not grep '@g0' %t &&
// RUN: true
diff --git a/clang/test/CodeGen/pointer-arithmetic.c b/clang/test/CodeGen/pointer-arithmetic.c
index b1436b92492..5049875dd3e 100644
--- a/clang/test/CodeGen/pointer-arithmetic.c
+++ b/clang/test/CodeGen/pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang -S %s -o -
+// RUN: clang-cc -S %s -o -
typedef int Int;
diff --git a/clang/test/CodeGen/pointer-cmp-type.c b/clang/test/CodeGen/pointer-cmp-type.c
index 02fc4c76759..d88c0911ba4 100644
--- a/clang/test/CodeGen/pointer-cmp-type.c
+++ b/clang/test/CodeGen/pointer-cmp-type.c
@@ -1,3 +1,3 @@
-// RUN: clang -emit-llvm %s -o - | grep "icmp ult"
+// RUN: clang-cc -emit-llvm %s -o - | grep "icmp ult"
int a(char* a, char* b) {return a<b;}
diff --git a/clang/test/CodeGen/pointer-to-int.c b/clang/test/CodeGen/pointer-to-int.c
index a3eaf91bc16..e40bd91d8f9 100644
--- a/clang/test/CodeGen/pointer-to-int.c
+++ b/clang/test/CodeGen/pointer-to-int.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
int test(void* i)
{
diff --git a/clang/test/CodeGen/private-extern.c b/clang/test/CodeGen/private-extern.c
index 8cf963da256..f3ffe5461d0 100644
--- a/clang/test/CodeGen/private-extern.c
+++ b/clang/test/CodeGen/private-extern.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s &&
+// RUN: clang-cc -emit-llvm -o %t %s &&
// RUN: grep '@g0 = external hidden constant i32' %t &&
// RUN: grep '@g1 = hidden constant i32 1' %t
diff --git a/clang/test/CodeGen/rdr-6098585-default-after-caserange.c b/clang/test/CodeGen/rdr-6098585-default-after-caserange.c
index c6dbb1ce184..3a11ad64299 100644
--- a/clang/test/CodeGen/rdr-6098585-default-after-caserange.c
+++ b/clang/test/CodeGen/rdr-6098585-default-after-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
// RUN: grep "ret i32" %t | count 1 &&
// RUN: grep "ret i32 10" %t | count 1
diff --git a/clang/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c b/clang/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
index bad9889de6b..f1d15dcd4fd 100644
--- a/clang/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
+++ b/clang/test/CodeGen/rdr-6098585-default-fallthrough-to-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
// RUN: grep "ret i32 10" %t
// Ensure that this doesn't compile to infinite loop in g() due to
diff --git a/clang/test/CodeGen/rdr-6098585-empty-case-range.c b/clang/test/CodeGen/rdr-6098585-empty-case-range.c
index 6da76bdf243..ca5ff1b7122 100644
--- a/clang/test/CodeGen/rdr-6098585-empty-case-range.c
+++ b/clang/test/CodeGen/rdr-6098585-empty-case-range.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
// RUN: grep "ret i32" %t | count 2 &&
// RUN: grep "ret i32 3" %t | count 2
diff --git a/clang/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c b/clang/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
index e0fcc803918..b3474497061 100644
--- a/clang/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
+++ b/clang/test/CodeGen/rdr-6098585-fallthrough-to-empty-range.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
// RUN: grep "ret i32 %" %t
// Make sure return is not constant (if empty range is skipped or miscompiled)
diff --git a/clang/test/CodeGen/rdr-6098585-unsigned-caserange.c b/clang/test/CodeGen/rdr-6098585-unsigned-caserange.c
index 1fa44c0a2e6..80035982e1f 100644
--- a/clang/test/CodeGen/rdr-6098585-unsigned-caserange.c
+++ b/clang/test/CodeGen/rdr-6098585-unsigned-caserange.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
+// RUN: clang-cc -triple i386-unknown-unknown --emit-llvm-bc -o - %s | opt -std-compile-opts | llvm-dis > %t &&
// RUN: grep "ret i32" %t | count 1 &&
// RUN: grep "ret i32 3" %t | count 1
diff --git a/clang/test/CodeGen/shared-string-literals.c b/clang/test/CodeGen/shared-string-literals.c
index 2e8269b2a38..a05975b4aeb 100644
--- a/clang/test/CodeGen/shared-string-literals.c
+++ b/clang/test/CodeGen/shared-string-literals.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t
+// RUN: clang-cc -emit-llvm %s -o %t
char *globalString = "abc";
char *globalStringArray[5] = { "123", "abc" };
diff --git a/clang/test/CodeGen/sizeof-vla.c b/clang/test/CodeGen/sizeof-vla.c
index d49bf120975..af5088553e4 100644
--- a/clang/test/CodeGen/sizeof-vla.c
+++ b/clang/test/CodeGen/sizeof-vla.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s
// PR3442
diff --git a/clang/test/CodeGen/statements.c b/clang/test/CodeGen/statements.c
index 40921213935..1ff7601adf6 100644
--- a/clang/test/CodeGen/statements.c
+++ b/clang/test/CodeGen/statements.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm
+// RUN: clang-cc < %s -emit-llvm
void test1(int x) {
switch (x) {
diff --git a/clang/test/CodeGen/static-forward-decl-fun.c b/clang/test/CodeGen/static-forward-decl-fun.c
index 69080e3a038..a945df3d3b3 100644
--- a/clang/test/CodeGen/static-forward-decl-fun.c
+++ b/clang/test/CodeGen/static-forward-decl-fun.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
static int staticfun(void);
int (*staticuse1)(void) = staticfun;
diff --git a/clang/test/CodeGen/static-forward-decl.c b/clang/test/CodeGen/static-forward-decl.c
index 8e0825cb6c8..f12c22fb41a 100644
--- a/clang/test/CodeGen/static-forward-decl.c
+++ b/clang/test/CodeGen/static-forward-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep "global i32 10"
+// RUN: clang-cc %s -emit-llvm -o - -triple=i686-apple-darwin9 | grep "global i32 10"
static int i;
int*j=&i;
diff --git a/clang/test/CodeGen/static-local-union.c b/clang/test/CodeGen/static-local-union.c
index 9515a316d62..f276b200eb1 100644
--- a/clang/test/CodeGen/static-local-union.c
+++ b/clang/test/CodeGen/static-local-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s
+// RUN: clang-cc -emit-llvm < %s
int a() {static union{int a;} r[2] = {1,2};return r[1].a;}
diff --git a/clang/test/CodeGen/static-order.c b/clang/test/CodeGen/static-order.c
index c63f4ed892a..243e96bf3e6 100644
--- a/clang/test/CodeGen/static-order.c
+++ b/clang/test/CodeGen/static-order.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s | not grep "zeroinitializer"
+// RUN: clang-cc -emit-llvm -o - %s | not grep "zeroinitializer"
struct s {
int a;
diff --git a/clang/test/CodeGen/staticinit.c b/clang/test/CodeGen/staticinit.c
index 384ddbff1ef..fa3e736d31f 100644
--- a/clang/test/CodeGen/staticinit.c
+++ b/clang/test/CodeGen/staticinit.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -emit-llvm -o %t %s &&
+// RUN: clang-cc -arch i386 -emit-llvm -o %t %s &&
// RUN: grep "g.b = internal global i8. getelementptr" %t &&
struct AStruct {
diff --git a/clang/test/CodeGen/stdcall-fastcall.c b/clang/test/CodeGen/stdcall-fastcall.c
index a599405d279..11b652178ca 100644
--- a/clang/test/CodeGen/stdcall-fastcall.c
+++ b/clang/test/CodeGen/stdcall-fastcall.c
@@ -1,5 +1,5 @@
-// RUN: clang -emit-llvm < %s | grep 'fastcallcc' | count 4
-// RUN: clang -emit-llvm < %s | grep 'stdcallcc' | count 4
+// RUN: clang-cc -emit-llvm < %s | grep 'fastcallcc' | count 4
+// RUN: clang-cc -emit-llvm < %s | grep 'stdcallcc' | count 4
void __attribute__((fastcall)) f1(void);
void __attribute__((stdcall)) f2(void);
diff --git a/clang/test/CodeGen/string-init.c b/clang/test/CodeGen/string-init.c
index b2b10dcf94d..38c7ec05759 100644
--- a/clang/test/CodeGen/string-init.c
+++ b/clang/test/CodeGen/string-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t &&
+// RUN: clang-cc -emit-llvm %s -o %t &&
// RUN: grep 'internal constant \[10 x i8\]' %t &&
// RUN: not grep -F "[5 x i8]" %t &&
// RUN: not grep "store " %t
diff --git a/clang/test/CodeGen/string-literal.c b/clang/test/CodeGen/string-literal.c
index ea28f1a7cbc..a4011938c10 100644
--- a/clang/test/CodeGen/string-literal.c
+++ b/clang/test/CodeGen/string-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
int main() {
char a[10] = "abc";
diff --git a/clang/test/CodeGen/struct-comma.c b/clang/test/CodeGen/struct-comma.c
index 29305292107..d7f50da1312 100644
--- a/clang/test/CodeGen/struct-comma.c
+++ b/clang/test/CodeGen/struct-comma.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
struct S {int a, b;} x;
void a(struct S* b) {*b = (r(), x);}
diff --git a/clang/test/CodeGen/struct-copy.c b/clang/test/CodeGen/struct-copy.c
index a45e37a30f4..62c29aba6c9 100644
--- a/clang/test/CodeGen/struct-copy.c
+++ b/clang/test/CodeGen/struct-copy.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | grep 'call.*llvm.memcpy'
+// RUN: clang-cc -emit-llvm %s -o - | grep 'call.*llvm.memcpy'
struct x { int a[100]; };
diff --git a/clang/test/CodeGen/struct-init.c b/clang/test/CodeGen/struct-init.c
index 7d9d7082a76..a38442b1a88 100644
--- a/clang/test/CodeGen/struct-init.c
+++ b/clang/test/CodeGen/struct-init.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
typedef struct _zend_ini_entry zend_ini_entry;
struct _zend_ini_entry {
diff --git a/clang/test/CodeGen/struct-passing.c b/clang/test/CodeGen/struct-passing.c
index 305101d9062..9a4f47651b7 100644
--- a/clang/test/CodeGen/struct-passing.c
+++ b/clang/test/CodeGen/struct-passing.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-pc-linux-gnu -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-pc-linux-gnu -emit-llvm -o %t %s &&
// RUN: grep 'declare i32 @f0() readnone$' %t &&
// RUN: grep 'declare i32 @f1() readonly$' %t &&
// RUN: grep 'declare void @f2(.* noalias sret)$' %t &&
diff --git a/clang/test/CodeGen/struct-x86-darwin.c b/clang/test/CodeGen/struct-x86-darwin.c
index 7a2e7de36b1..050e26dcab9 100644
--- a/clang/test/CodeGen/struct-x86-darwin.c
+++ b/clang/test/CodeGen/struct-x86-darwin.c
@@ -1,4 +1,4 @@
-// RUN: clang < %s -emit-llvm > %t1 -triple=i686-apple-darwin9
+// RUN: clang-cc < %s -emit-llvm > %t1 -triple=i686-apple-darwin9
// Run grep "STest1 = type <{ i32, \[4 x i16\], double }>" %t1 &&
// RUN: grep "STest2 = type <{ i16, i16, i32, i32 }>" %t1 &&
// RUN: grep "STest3 = type <{ i8, i8, i16, i32 }>" %t1 &&
diff --git a/clang/test/CodeGen/struct.c b/clang/test/CodeGen/struct.c
index 4b0cc3e79ea..ed3684280e8 100644
--- a/clang/test/CodeGen/struct.c
+++ b/clang/test/CodeGen/struct.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-unknown-unknown %s -emit-llvm -o -
+// RUN: clang-cc -triple i386-unknown-unknown %s -emit-llvm -o -
struct {
int x;
diff --git a/clang/test/CodeGen/switch.c b/clang/test/CodeGen/switch.c
index 056337465bc..3254fbf3c93 100644
--- a/clang/test/CodeGen/switch.c
+++ b/clang/test/CodeGen/switch.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm-bc -o - | opt -std-compile-opts -disable-output
+// RUN: clang-cc %s -emit-llvm-bc -o - | opt -std-compile-opts -disable-output
int foo(int i) {
int j = 0;
diff --git a/clang/test/CodeGen/tentative-array.c b/clang/test/CodeGen/tentative-array.c
index 71231237faf..6879d0f07d7 100644
--- a/clang/test/CodeGen/tentative-array.c
+++ b/clang/test/CodeGen/tentative-array.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s -triple=i686-apple-darwin9 | grep "global \[1 x i32\]"
+// RUN: clang-cc -emit-llvm < %s -triple=i686-apple-darwin9 | grep "global \[1 x i32\]"
int r[];
int (*a)[] = &r;
diff --git a/clang/test/CodeGen/typedef-func.c b/clang/test/CodeGen/typedef-func.c
index c14a42c1e8a..a64426ddb27 100644
--- a/clang/test/CodeGen/typedef-func.c
+++ b/clang/test/CodeGen/typedef-func.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s
+// RUN: clang-cc -emit-llvm < %s
// PR2414
struct mad_frame{};
diff --git a/clang/test/CodeGen/typedef.c b/clang/test/CodeGen/typedef.c
index a615285620d..3bdd52f6c57 100644
--- a/clang/test/CodeGen/typedef.c
+++ b/clang/test/CodeGen/typedef.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
typedef struct { int i; } Value;
typedef Value *PValue;
diff --git a/clang/test/CodeGen/types.c b/clang/test/CodeGen/types.c
index c542a758b8d..75cb851c259 100644
--- a/clang/test/CodeGen/types.c
+++ b/clang/test/CodeGen/types.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm <%s
+// RUN: clang-cc -emit-llvm <%s
struct FileName {
struct FileName *next;
diff --git a/clang/test/CodeGen/union-init.c b/clang/test/CodeGen/union-init.c
index 9a515a72d92..c882d3180c7 100644
--- a/clang/test/CodeGen/union-init.c
+++ b/clang/test/CodeGen/union-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s -o -
+// RUN: clang-cc -emit-llvm < %s -o -
// A nice and complicated initialization example with unions from Python
typedef int Py_ssize_t;
diff --git a/clang/test/CodeGen/union.c b/clang/test/CodeGen/union.c
index 4b09a845b5d..4884690f3fd 100644
--- a/clang/test/CodeGen/union.c
+++ b/clang/test/CodeGen/union.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
union u_tag {
int a;
diff --git a/clang/test/CodeGen/unwind-attr.c b/clang/test/CodeGen/unwind-attr.c
index 92f43ecc9ae..b2890c4c10d 100644
--- a/clang/test/CodeGen/unwind-attr.c
+++ b/clang/test/CodeGen/unwind-attr.c
@@ -1,5 +1,5 @@
-// RUN: clang -fexceptions -emit-llvm -o - %s | grep "@foo() {" | count 1 &&
-// RUN: clang -emit-llvm -o - %s | grep "@foo() nounwind {" | count 1
+// RUN: clang-cc -fexceptions -emit-llvm -o - %s | grep "@foo() {" | count 1 &&
+// RUN: clang-cc -emit-llvm -o - %s | grep "@foo() nounwind {" | count 1
int foo(void) {
}
diff --git a/clang/test/CodeGen/var-align.c b/clang/test/CodeGen/var-align.c
index be585c052e8..b0b62ae2647 100644
--- a/clang/test/CodeGen/var-align.c
+++ b/clang/test/CodeGen/var-align.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | grep "align 16" | count 2
+// RUN: clang-cc -emit-llvm %s -o - | grep "align 16" | count 2
__attribute((aligned(16))) float a[128];
union {int a[4]; __attribute((aligned(16))) float b[4];} u;
diff --git a/clang/test/CodeGen/vector.c b/clang/test/CodeGen/vector.c
index 528afdfe5e8..c92d2ca2b60 100644
--- a/clang/test/CodeGen/vector.c
+++ b/clang/test/CodeGen/vector.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o -
+// RUN: clang-cc -emit-llvm %s -o -
typedef short __v4hi __attribute__ ((__vector_size__ (8)));
void f()
diff --git a/clang/test/CodeGen/vla.c b/clang/test/CodeGen/vla.c
index beb928b0668..3666d5ee0d7 100644
--- a/clang/test/CodeGen/vla.c
+++ b/clang/test/CodeGen/vla.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
int b(char* x);
diff --git a/clang/test/CodeGen/volatile.c b/clang/test/CodeGen/volatile.c
index ed0a33e9862..9ee4de601ce 100644
--- a/clang/test/CodeGen/volatile.c
+++ b/clang/test/CodeGen/volatile.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep volatile | count 25
+// RUN: clang-cc -emit-llvm < %s | grep volatile | count 25
// The number 26 comes from the current codegen for volatile loads;
// if this number changes, it's not necessarily something wrong, but
diff --git a/clang/test/CodeGen/weak-global.c b/clang/test/CodeGen/weak-global.c
index d19dd612917..d4ee52f4895 100644
--- a/clang/test/CodeGen/weak-global.c
+++ b/clang/test/CodeGen/weak-global.c
@@ -1,3 +1,3 @@
-// RUN: clang -emit-llvm < %s | grep common
+// RUN: clang-cc -emit-llvm < %s | grep common
int i;
diff --git a/clang/test/CodeGen/whilestmt.c b/clang/test/CodeGen/whilestmt.c
index fe17e1b2f19..95e18f4d21f 100644
--- a/clang/test/CodeGen/whilestmt.c
+++ b/clang/test/CodeGen/whilestmt.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o -
+// RUN: clang-cc %s -emit-llvm -o -
int bar();
int foo() {
diff --git a/clang/test/CodeGen/writable-strings.c b/clang/test/CodeGen/writable-strings.c
index a2a8f3cc402..c8b70d5f054 100644
--- a/clang/test/CodeGen/writable-strings.c
+++ b/clang/test/CodeGen/writable-strings.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - -fwritable-strings %s
+// RUN: clang-cc -emit-llvm -o - -fwritable-strings %s
int main() {
char *str = "abc";
diff --git a/clang/test/CodeGen/x86-inline-asm.c b/clang/test/CodeGen/x86-inline-asm.c
index 7bdea973382..d12f26c0df8 100644
--- a/clang/test/CodeGen/x86-inline-asm.c
+++ b/clang/test/CodeGen/x86-inline-asm.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -triple=i686-pc-linux-gnu -emit-llvm -o - > %t1
+// RUN: clang-cc %s -triple=i686-pc-linux-gnu -emit-llvm -o - > %t1
// RUN: grep "ax" %t1 &&
// RUN: grep "bx" %t1 &&
// RUN: grep "cx" %t1 &&
diff --git a/clang/test/CodeGen/x86_32-arguments.c b/clang/test/CodeGen/x86_32-arguments.c
index d7663072e32..632949e7631 100644
--- a/clang/test/CodeGen/x86_32-arguments.c
+++ b/clang/test/CodeGen/x86_32-arguments.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
// RUN: grep 'define signext i8 @f0()' %t &&
// RUN: grep 'define signext i16 @f1()' %t &&
// RUN: grep 'define i32 @f2()' %t &&
diff --git a/clang/test/CodeGen/x86_64-arguments.c b/clang/test/CodeGen/x86_64-arguments.c
index eed4eb696f3..860caff7de8 100644
--- a/clang/test/CodeGen/x86_64-arguments.c
+++ b/clang/test/CodeGen/x86_64-arguments.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
// RUN: grep 'define signext i8 @f0()' %t &&
// RUN: grep 'define signext i16 @f1()' %t &&
// RUN: grep 'define i32 @f2()' %t &&
diff --git a/clang/test/CodeGenCXX/__null.cpp b/clang/test/CodeGenCXX/__null.cpp
index 29416ced023..476b0ad083b 100644
--- a/clang/test/CodeGenCXX/__null.cpp
+++ b/clang/test/CodeGenCXX/__null.cpp
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o %t
+// RUN: clang-cc %s -emit-llvm -o %t
int* a = __null;
int b = __null;
diff --git a/clang/test/CodeGenCXX/expr.cpp b/clang/test/CodeGenCXX/expr.cpp
index 5b8efacdd77..ae5b0e644f2 100644
--- a/clang/test/CodeGenCXX/expr.cpp
+++ b/clang/test/CodeGenCXX/expr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -x c++ < %s
+// RUN: clang-cc -emit-llvm -x c++ < %s
void f(int x) {
if (x != 0) return;
diff --git a/clang/test/CodeGenCXX/mangle.cpp b/clang/test/CodeGenCXX/mangle.cpp
index 5c38d172113..855a2ae0a46 100644
--- a/clang/test/CodeGenCXX/mangle.cpp
+++ b/clang/test/CodeGenCXX/mangle.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o %t &&
+// RUN: clang-cc -emit-llvm %s -o %t &&
// FIXME: This test is intentionally trivial, because we can't yet
// CodeGen anything real in C++.
diff --git a/clang/test/CodeGenObjC/2008-10-23-invalid-icmp.m b/clang/test/CodeGenObjC/2008-10-23-invalid-icmp.m
index abfe6afcc7c..2c58b921767 100644
--- a/clang/test/CodeGenObjC/2008-10-23-invalid-icmp.m
+++ b/clang/test/CodeGenObjC/2008-10-23-invalid-icmp.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
@protocol P @end
diff --git a/clang/test/CodeGenObjC/bitfield-1.m b/clang/test/CodeGenObjC/bitfield-1.m
index d4a63d3d0e0..d7396b1dd2e 100644
--- a/clang/test/CodeGenObjC/bitfield-1.m
+++ b/clang/test/CodeGenObjC/bitfield-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
@interface Object
- (id) alloc;
diff --git a/clang/test/CodeGenObjC/bitfield-ivar-metadata.m b/clang/test/CodeGenObjC/bitfield-ivar-metadata.m
index c73fa6717f1..542a2424caa 100644
--- a/clang/test/CodeGenObjC/bitfield-ivar-metadata.m
+++ b/clang/test/CodeGenObjC/bitfield-ivar-metadata.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
@interface INTF
{
diff --git a/clang/test/CodeGenObjC/blocks-unsupported.m b/clang/test/CodeGenObjC/blocks-unsupported.m
index bd224e50b77..e3faea995e6 100644
--- a/clang/test/CodeGenObjC/blocks-unsupported.m
+++ b/clang/test/CodeGenObjC/blocks-unsupported.m
@@ -1,4 +1,4 @@
-// RUN: clang -fblocks -fno-__block -fnext-runtime --emit-llvm -o %t %s -verify
+// RUN: clang-cc -fblocks -fno-__block -fnext-runtime --emit-llvm -o %t %s -verify
@class Foo;
@protocol P;
diff --git a/clang/test/CodeGenObjC/blocks.m b/clang/test/CodeGenObjC/blocks.m
index e9ca2238bab..da115612956 100644
--- a/clang/test/CodeGenObjC/blocks.m
+++ b/clang/test/CodeGenObjC/blocks.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -fblocks -S -o - %s
+// RUN: clang-cc -emit-llvm -fblocks -S -o - %s
// rdar://6676764
struct S {
diff --git a/clang/test/CodeGenObjC/category-super-class-meth.m b/clang/test/CodeGenObjC/category-super-class-meth.m
index 82ced633186..95d8b3103c9 100644
--- a/clang/test/CodeGenObjC/category-super-class-meth.m
+++ b/clang/test/CodeGenObjC/category-super-class-meth.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
@interface BASE
+ (int) BaseMeth;
diff --git a/clang/test/CodeGenObjC/class-getter-dotsyntax.m b/clang/test/CodeGenObjC/class-getter-dotsyntax.m
index 54ed890cc4d..3c82f78d08b 100644
--- a/clang/test/CodeGenObjC/class-getter-dotsyntax.m
+++ b/clang/test/CodeGenObjC/class-getter-dotsyntax.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
@interface Test { }
+ (Test *)crash;
diff --git a/clang/test/CodeGenObjC/class-type.m b/clang/test/CodeGenObjC/class-type.m
index 12a8a31b9d6..c8a1c18b9c9 100644
--- a/clang/test/CodeGenObjC/class-type.m
+++ b/clang/test/CodeGenObjC/class-type.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s
@interface I0 {
struct { int a; } a;
diff --git a/clang/test/CodeGenObjC/compatibility-alias.m b/clang/test/CodeGenObjC/compatibility-alias.m
index 0982a90b708..11e5a27ab71 100644
--- a/clang/test/CodeGenObjC/compatibility-alias.m
+++ b/clang/test/CodeGenObjC/compatibility-alias.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
@interface Int1 @end
diff --git a/clang/test/CodeGenObjC/constant-strings.m b/clang/test/CodeGenObjC/constant-strings.m
index 879f91a4324..d4fefd90365 100644
--- a/clang/test/CodeGenObjC/constant-strings.m
+++ b/clang/test/CodeGenObjC/constant-strings.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
id a = @"Hello World!";
diff --git a/clang/test/CodeGenObjC/continuation-class.m b/clang/test/CodeGenObjC/continuation-class.m
index 9ac51c70bf0..925f3cd0c50 100644
--- a/clang/test/CodeGenObjC/continuation-class.m
+++ b/clang/test/CodeGenObjC/continuation-class.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
@interface Object
- (id)new;
diff --git a/clang/test/CodeGenObjC/dot-syntax-1.m b/clang/test/CodeGenObjC/dot-syntax-1.m
index cd12d85c0ec..6c4dcbbef0d 100644
--- a/clang/test/CodeGenObjC/dot-syntax-1.m
+++ b/clang/test/CodeGenObjC/dot-syntax-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
#include <stdio.h>
diff --git a/clang/test/CodeGenObjC/dot-syntax.m b/clang/test/CodeGenObjC/dot-syntax.m
index 39e9c49309c..68c8ad0b758 100644
--- a/clang/test/CodeGenObjC/dot-syntax.m
+++ b/clang/test/CodeGenObjC/dot-syntax.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
#include <stdio.h>
diff --git a/clang/test/CodeGenObjC/encode-test-1.m b/clang/test/CodeGenObjC/encode-test-1.m
index 3646fef23b3..b4f3b0f9c33 100644
--- a/clang/test/CodeGenObjC/encode-test-1.m
+++ b/clang/test/CodeGenObjC/encode-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
// RUN: grep -e "{Base=b2b3b4b5}" %t | count 1 &&
// RUN: grep -e "{Derived=b2b3b4b5b5b4b3}" %t | count 1
diff --git a/clang/test/CodeGenObjC/encode-test-2.m b/clang/test/CodeGenObjC/encode-test-2.m
index 0df54ca0bac..6901168b1d0 100644
--- a/clang/test/CodeGenObjC/encode-test-2.m
+++ b/clang/test/CodeGenObjC/encode-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
// RUN: grep -e "@\\\22<X>\\\22" %t &&
// RUN: grep -e "@\\\22<X><Y>\\\22" %t &&
// RUN: grep -e "@\\\22<X><Y><Z>\\\22" %t &&
diff --git a/clang/test/CodeGenObjC/encode-test-3.m b/clang/test/CodeGenObjC/encode-test-3.m
index 698be50c57a..116e825e32a 100644
--- a/clang/test/CodeGenObjC/encode-test-3.m
+++ b/clang/test/CodeGenObjC/encode-test-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
// RUN: grep -e "\^i" %t | count 1 &&
// RUN: grep -e "\[0i\]" %t | count 1
diff --git a/clang/test/CodeGenObjC/encode-test-4.m b/clang/test/CodeGenObjC/encode-test-4.m
index 4d39a532d2e..90b300200a0 100644
--- a/clang/test/CodeGenObjC/encode-test-4.m
+++ b/clang/test/CodeGenObjC/encode-test-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o - %s -O2 | grep "ret i32 1"
+// RUN: clang-cc -emit-llvm -o - %s -O2 | grep "ret i32 1"
int a() {
return @encode(int) == @encode(int);
diff --git a/clang/test/CodeGenObjC/encode-test.m b/clang/test/CodeGenObjC/encode-test.m
index 8d307e8f5e4..6d2f64e4363 100644
--- a/clang/test/CodeGenObjC/encode-test.m
+++ b/clang/test/CodeGenObjC/encode-test.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
// RUN: grep -e "\^{Innermost=CC}" %t | count 1 &&
// RUN: grep -e "{Derived=#ib32b8b3b8sb16b8b8b2b8ccb6}" %t | count 1 &&
// RUN: grep -e "{B1=#@c}" %t | count 1 &&
diff --git a/clang/test/CodeGenObjC/forward-class-impl-metadata.m b/clang/test/CodeGenObjC/forward-class-impl-metadata.m
index c502aa4e748..b3976d64584 100644
--- a/clang/test/CodeGenObjC/forward-class-impl-metadata.m
+++ b/clang/test/CodeGenObjC/forward-class-impl-metadata.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s
@interface BASE {
@private
diff --git a/clang/test/CodeGenObjC/hidden.m b/clang/test/CodeGenObjC/hidden.m
index 2cc3aefde49..6b86ca0581c 100644
--- a/clang/test/CodeGenObjC/hidden.m
+++ b/clang/test/CodeGenObjC/hidden.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
__attribute__((visibility("hidden")))
@interface Hidden
diff --git a/clang/test/CodeGenObjC/implicit-property.m b/clang/test/CodeGenObjC/implicit-property.m
index 11d2a5603b8..206d496252d 100644
--- a/clang/test/CodeGenObjC/implicit-property.m
+++ b/clang/test/CodeGenObjC/implicit-property.m
@@ -1,5 +1,5 @@
-// RUN: clang -emit-llvm -triple=i686-apple-darwin8 -o %t %s
-// RUNX: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -triple=i686-apple-darwin8 -o %t %s
+// RUNX: clang-cc -emit-llvm -o %t %s
@interface A
-(void) setOk:(int)arg;
diff --git a/clang/test/CodeGenObjC/link-errors.m b/clang/test/CodeGenObjC/link-errors.m
index c25fe675ce5..b50d93993fc 100644
--- a/clang/test/CodeGenObjC/link-errors.m
+++ b/clang/test/CodeGenObjC/link-errors.m
@@ -1,8 +1,8 @@
-// RUN: clang -triple i386-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
// RUN: grep '.lazy_reference .objc_class_name_A' %t | count 1 &&
// RUN: grep '.lazy_reference .objc_class_name_Unknown' %t | count 1 &&
// RUN: grep '.lazy_reference .objc_class_name_Protocol' %t | count 1 &&
-// RUN: clang -triple i386-apple-darwin9 -DWITH_IMPL -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-apple-darwin9 -DWITH_IMPL -fnext-runtime -emit-llvm -o %t %s &&
// RUN: grep '.lazy_reference .objc_class_name_Root' %t | count 1
@interface Root
diff --git a/clang/test/CodeGenObjC/message-arrays.m b/clang/test/CodeGenObjC/message-arrays.m
index aed841e06fd..c618672feab 100644
--- a/clang/test/CodeGenObjC/message-arrays.m
+++ b/clang/test/CodeGenObjC/message-arrays.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
void f0(id a) {
// This should have an implicit cast
diff --git a/clang/test/CodeGenObjC/messages-2.m b/clang/test/CodeGenObjC/messages-2.m
index dcea93b8616..ca0eb949338 100644
--- a/clang/test/CodeGenObjC/messages-2.m
+++ b/clang/test/CodeGenObjC/messages-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
#include <stdio.h>
diff --git a/clang/test/CodeGenObjC/messages.m b/clang/test/CodeGenObjC/messages.m
index fab3c5d8580..b2bda672158 100644
--- a/clang/test/CodeGenObjC/messages.m
+++ b/clang/test/CodeGenObjC/messages.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
typedef struct {
int x;
diff --git a/clang/test/CodeGenObjC/newproperty-nested-synthesis-1.m b/clang/test/CodeGenObjC/newproperty-nested-synthesis-1.m
index 208b162b50f..5196b8244db 100644
--- a/clang/test/CodeGenObjC/newproperty-nested-synthesis-1.m
+++ b/clang/test/CodeGenObjC/newproperty-nested-synthesis-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
@interface Object
- (id) new;
diff --git a/clang/test/CodeGenObjC/no-category-class.m b/clang/test/CodeGenObjC/no-category-class.m
index c0f0efa941d..34bf603da57 100644
--- a/clang/test/CodeGenObjC/no-category-class.m
+++ b/clang/test/CodeGenObjC/no-category-class.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s
@interface NSObject
@end
diff --git a/clang/test/CodeGenObjC/objc-align.m b/clang/test/CodeGenObjC/objc-align.m
index 33d7f30db58..eca5959a392 100644
--- a/clang/test/CodeGenObjC/objc-align.m
+++ b/clang/test/CodeGenObjC/objc-align.m
@@ -1,7 +1,7 @@
// 32-bit
// RUNX: llvm-gcc -m32 -emit-llvm -S -o %t %s &&
-// RUN: clang -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
// RUN: grep '@"\\01L_OBJC_CATEGORY_A_Cat" = internal global .*, section "__OBJC,__category,regular,no_dead_strip", align 4' %t &&
// RUN: grep '@"\\01L_OBJC_CLASS_A" = internal global .*, section "__OBJC,__class,regular,no_dead_strip", align 4' %t &&
// RUN: grep '@"\\01L_OBJC_CLASS_C" = internal global .*, section "__OBJC,__class,regular,no_dead_strip", align 4' %t &&
@@ -14,7 +14,7 @@
// 64-bit
-// RUNX: clang -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
+// RUNX: clang-cc -triple i386-apple-darwin9 -emit-llvm -o %t %s &&
// RUNX: grep '@"OBJC_CLASS_$_A" = global' %t &&
// RUNX: grep '@"OBJC_CLASS_$_C" = global' %t &&
// RUNX: grep '@"OBJC_METACLASS_$_A" = global' %t &&
diff --git a/clang/test/CodeGenObjC/objc2-property-encode.m b/clang/test/CodeGenObjC/objc2-property-encode.m
index deae4b722b4..2bff2fc1a4e 100644
--- a/clang/test/CodeGenObjC/objc2-property-encode.m
+++ b/clang/test/CodeGenObjC/objc2-property-encode.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
// RUN: grep -e "T@\\\\22NSString\\\\22" %t
@interface NSString @end
diff --git a/clang/test/CodeGenObjC/objc2-protocol-enc.m b/clang/test/CodeGenObjC/objc2-protocol-enc.m
index b0c1e7ad575..559b0b8c76a 100644
--- a/clang/test/CodeGenObjC/objc2-protocol-enc.m
+++ b/clang/test/CodeGenObjC/objc2-protocol-enc.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple=i686-apple-darwin9 -fnext-runtime -emit-llvm -o %t %s &&
// RUN: grep -e "T@\\\22<X>\\\22" %t &&
// RUN: grep -e "T@\\\22<X><Y>\\\22" %t &&
// RUN: grep -e "T@\\\22<X><Y><Z>\\\22" %t &&
diff --git a/clang/test/CodeGenObjC/objc2-retain-codegen.m b/clang/test/CodeGenObjC/objc2-retain-codegen.m
index b2872496246..d78bc366d39 100644
--- a/clang/test/CodeGenObjC/objc2-retain-codegen.m
+++ b/clang/test/CodeGenObjC/objc2-retain-codegen.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -fobjc-gc-only -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -fobjc-gc-only -emit-llvm -o %t %s
@interface I0 {
I0 *_f0;
diff --git a/clang/test/CodeGenObjC/objc2-strong-cast-1.m b/clang/test/CodeGenObjC/objc2-strong-cast-1.m
index 7e62146f9c0..8cad08c88a6 100644
--- a/clang/test/CodeGenObjC/objc2-strong-cast-1.m
+++ b/clang/test/CodeGenObjC/objc2-strong-cast-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -fobjc-gc -emit-llvm -o %t %s
@interface I {
__attribute__((objc_gc(strong))) int *i_IdocumentIDs;
diff --git a/clang/test/CodeGenObjC/objc2-strong-cast.m b/clang/test/CodeGenObjC/objc2-strong-cast.m
index 60fd37392ab..d0fcb6ced92 100644
--- a/clang/test/CodeGenObjC/objc2-strong-cast.m
+++ b/clang/test/CodeGenObjC/objc2-strong-cast.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
@interface I {
__attribute__((objc_gc(strong))) signed long *_documentIDs;
diff --git a/clang/test/CodeGenObjC/objc2-weak-compare.m b/clang/test/CodeGenObjC/objc2-weak-compare.m
index 5889b1ff8db..7a9381d2b40 100644
--- a/clang/test/CodeGenObjC/objc2-weak-compare.m
+++ b/clang/test/CodeGenObjC/objc2-weak-compare.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -fobjc-gc -emit-llvm -o %t %s
@interface PBXTarget
{
diff --git a/clang/test/CodeGenObjC/objc2-weak-ivar.m b/clang/test/CodeGenObjC/objc2-weak-ivar.m
index 611bffd1e9b..134e3a976fe 100644
--- a/clang/test/CodeGenObjC/objc2-weak-ivar.m
+++ b/clang/test/CodeGenObjC/objc2-weak-ivar.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple x86_64-unknown-unknown -fobjc-gc -emit-llvm -o %t %s
+// RUN: clang-cc -triple x86_64-unknown-unknown -fobjc-gc -emit-llvm -o %t %s
@class NSObject;
@interface Foo {
diff --git a/clang/test/CodeGenObjC/overloadable.m b/clang/test/CodeGenObjC/overloadable.m
index fe00fadb879..5a5868e7b4d 100644
--- a/clang/test/CodeGenObjC/overloadable.m
+++ b/clang/test/CodeGenObjC/overloadable.m
@@ -1,5 +1,5 @@
// rdar://6657613
-// RUN: clang -emit-llvm %s -o %t &&
+// RUN: clang-cc -emit-llvm %s -o %t &&
@class C;
diff --git a/clang/test/CodeGenObjC/predefined-expr-in-method.m b/clang/test/CodeGenObjC/predefined-expr-in-method.m
index d835ed827b3..812ef97252d 100644
--- a/clang/test/CodeGenObjC/predefined-expr-in-method.m
+++ b/clang/test/CodeGenObjC/predefined-expr-in-method.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
@interface A
@end
diff --git a/clang/test/CodeGenObjC/property-aggr-type.m b/clang/test/CodeGenObjC/property-aggr-type.m
index 486cfa0b704..0cb7a5e2f40 100644
--- a/clang/test/CodeGenObjC/property-aggr-type.m
+++ b/clang/test/CodeGenObjC/property-aggr-type.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
@interface Object
- (id) new;
diff --git a/clang/test/CodeGenObjC/property-agrr-getter.m b/clang/test/CodeGenObjC/property-agrr-getter.m
index 518250eaa60..0a1df123bff 100644
--- a/clang/test/CodeGenObjC/property-agrr-getter.m
+++ b/clang/test/CodeGenObjC/property-agrr-getter.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
typedef struct {
unsigned f0;
diff --git a/clang/test/CodeGenObjC/property-getter-dot-syntax.m b/clang/test/CodeGenObjC/property-getter-dot-syntax.m
index 962862b5366..d98e9bab6da 100644
--- a/clang/test/CodeGenObjC/property-getter-dot-syntax.m
+++ b/clang/test/CodeGenObjC/property-getter-dot-syntax.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
@protocol NSObject
- (void *)description;
diff --git a/clang/test/CodeGenObjC/property-incr-decr-1.m b/clang/test/CodeGenObjC/property-incr-decr-1.m
index ef55342514c..772e872a214 100644
--- a/clang/test/CodeGenObjC/property-incr-decr-1.m
+++ b/clang/test/CodeGenObjC/property-incr-decr-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
@interface Object
- (id) new;
diff --git a/clang/test/CodeGenObjC/property-setter-attr.m b/clang/test/CodeGenObjC/property-setter-attr.m
index edc80554cdc..390392415d7 100644
--- a/clang/test/CodeGenObjC/property-setter-attr.m
+++ b/clang/test/CodeGenObjC/property-setter-attr.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -triple=i686-apple-darwin8 -o %t %s
+// RUN: clang-cc -emit-llvm -triple=i686-apple-darwin8 -o %t %s
// RUN: grep -e "SiSetOtherThings:" %t
@interface A
diff --git a/clang/test/CodeGenObjC/property.m b/clang/test/CodeGenObjC/property.m
index 91d3659dcde..264adf1106e 100644
--- a/clang/test/CodeGenObjC/property.m
+++ b/clang/test/CodeGenObjC/property.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime --emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime --emit-llvm -o %t %s
#include <stdio.h>
diff --git a/clang/test/CodeGenObjC/protocols-lazy.m b/clang/test/CodeGenObjC/protocols-lazy.m
index f92d9c4667c..e91cc0aea83 100644
--- a/clang/test/CodeGenObjC/protocols-lazy.m
+++ b/clang/test/CodeGenObjC/protocols-lazy.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -triple=i686-apple-darwin8 -o %t %s &&
+// RUN: clang-cc -emit-llvm -triple=i686-apple-darwin8 -o %t %s &&
// RUNX: llvm-gcc -S -emit-llvm -o %t %s &&
// No object generated
diff --git a/clang/test/CodeGenObjC/runtime-fns.m b/clang/test/CodeGenObjC/runtime-fns.m
index f132b5420f5..c53b0a32133 100644
--- a/clang/test/CodeGenObjC/runtime-fns.m
+++ b/clang/test/CodeGenObjC/runtime-fns.m
@@ -1,6 +1,6 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s &&
// RUN: grep -e "^de.*objc_msgSend[0-9]*(" %t | count 1 &&
-// RUN: clang -DWITHDEF -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -DWITHDEF -fnext-runtime -emit-llvm -o %t %s &&
// RUN: grep -e "^de.*objc_msgSend[0-9]*(" %t | count 1
id objc_msgSend(int x);
diff --git a/clang/test/CodeGenObjC/super-classmethod-category.m b/clang/test/CodeGenObjC/super-classmethod-category.m
index 2e9efde4382..27cdbf6aed4 100644
--- a/clang/test/CodeGenObjC/super-classmethod-category.m
+++ b/clang/test/CodeGenObjC/super-classmethod-category.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
@interface SUPER
+ (void)Meth;
diff --git a/clang/test/CodeGenObjC/super-dotsyntax-property.m b/clang/test/CodeGenObjC/super-dotsyntax-property.m
index cd0d5652d43..6e4f176724c 100644
--- a/clang/test/CodeGenObjC/super-dotsyntax-property.m
+++ b/clang/test/CodeGenObjC/super-dotsyntax-property.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -o %t %s
+// RUN: clang-cc -emit-llvm -o %t %s
@interface B
{
diff --git a/clang/test/CodeGenObjC/synchronized.m b/clang/test/CodeGenObjC/synchronized.m
index 3e59449e0bb..5c1d3979d39 100644
--- a/clang/test/CodeGenObjC/synchronized.m
+++ b/clang/test/CodeGenObjC/synchronized.m
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -triple=i686-apple-darwin8 -o %t %s -O2 &&
+// RUN: clang-cc -emit-llvm -triple=i686-apple-darwin8 -o %t %s -O2 &&
// RUN: grep 'ret i32' %t | count 1 &&
// RUN: grep 'ret i32 1' %t | count 1
diff --git a/clang/test/CodeGenObjC/unname-bf-metadata.m b/clang/test/CodeGenObjC/unname-bf-metadata.m
index bac530eaf94..a7636e4ebc8 100644
--- a/clang/test/CodeGenObjC/unname-bf-metadata.m
+++ b/clang/test/CodeGenObjC/unname-bf-metadata.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s
// Test that meta-data for ivar lists with unnamed bitfield are generated.
//
@interface Foo {
diff --git a/clang/test/Coverage/ast-printing.c b/clang/test/Coverage/ast-printing.c
index 0fc8b9f8338..401a3d3b8a0 100644
--- a/clang/test/Coverage/ast-printing.c
+++ b/clang/test/Coverage/ast-printing.c
@@ -1,5 +1,5 @@
-// RUN: clang --fsyntax-only %s &&
-// RUN: clang --ast-print %s &&
-// RUN: clang --ast-dump %s
+// RUN: clang-cc --fsyntax-only %s &&
+// RUN: clang-cc --ast-print %s &&
+// RUN: clang-cc --ast-dump %s
#include "c-language-features.inc"
diff --git a/clang/test/Coverage/ast-printing.m b/clang/test/Coverage/ast-printing.m
index c53efac0d71..85bbd4314a4 100644
--- a/clang/test/Coverage/ast-printing.m
+++ b/clang/test/Coverage/ast-printing.m
@@ -1,5 +1,5 @@
-// RUN: clang --fsyntax-only %s &&
-// RUN: clang --ast-print %s &&
-// RUN: clang --ast-dump %s
+// RUN: clang-cc --fsyntax-only %s &&
+// RUN: clang-cc --ast-print %s &&
+// RUN: clang-cc --ast-dump %s
#include "objc-language-features.inc"
diff --git a/clang/test/Coverage/codegen-gnu.m b/clang/test/Coverage/codegen-gnu.m
index adaf53c4670..417f5ef99e9 100644
--- a/clang/test/Coverage/codegen-gnu.m
+++ b/clang/test/Coverage/codegen-gnu.m
@@ -1,7 +1,7 @@
-// RUN: clang -triple i386-unknown-unknown -DIRGENABLE_GNU -DIRGENABLE -fgnu-runtime -emit-llvm -o %t %s &&
-// RUN: clang -triple i386-unknown-unknown -DIRGENABLE_GNU -DIRGENABLE -g -fgnu-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -DIRGENABLE_GNU -DIRGENABLE -fgnu-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -DIRGENABLE_GNU -DIRGENABLE -g -fgnu-runtime -emit-llvm -o %t %s &&
// FIXME: Remove once GNU can IRgen everything.
-// RUN: not clang -triple i386-unknown-unknown -fgnu-runtime -emit-llvm -o %t %s
+// RUN: not clang-cc -triple i386-unknown-unknown -fgnu-runtime -emit-llvm -o %t %s
#include "objc-language-features.inc"
diff --git a/clang/test/Coverage/codegen-next.m b/clang/test/Coverage/codegen-next.m
index 0916e534fb5..bca83cba693 100644
--- a/clang/test/Coverage/codegen-next.m
+++ b/clang/test/Coverage/codegen-next.m
@@ -1,4 +1,4 @@
-// RUN: clang -fnext-runtime -emit-llvm -o %t %s &&
-// RUN: clang -g -fnext-runtime -emit-llvm -o %t %s
+// RUN: clang-cc -fnext-runtime -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -fnext-runtime -emit-llvm -o %t %s
#include "objc-language-features.inc"
diff --git a/clang/test/Coverage/codegen.c b/clang/test/Coverage/codegen.c
index 5d6724ed2fa..543c361e1bb 100644
--- a/clang/test/Coverage/codegen.c
+++ b/clang/test/Coverage/codegen.c
@@ -1,7 +1,7 @@
-// RUN: clang -triple i386-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -triple i386-unknown-unknown -emit-llvm-bc -o %t %s &&
-// RUN: clang -triple i386-unknown-unknown -g -emit-llvm-bc -o %t %s &&
-// RUN: clang -triple x86_64-unknown-unknown -emit-llvm-bc -o %t %s &&
-// RUN: clang -triple x86_64-unknown-unknown -g -emit-llvm-bc -o %t %s
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -emit-llvm-bc -o %t %s &&
+// RUN: clang-cc -triple i386-unknown-unknown -g -emit-llvm-bc -o %t %s &&
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm-bc -o %t %s &&
+// RUN: clang-cc -triple x86_64-unknown-unknown -g -emit-llvm-bc -o %t %s
#include "c-language-features.inc"
diff --git a/clang/test/Coverage/html-diagnostics.c b/clang/test/Coverage/html-diagnostics.c
index 75d4e067fc6..6144f2fb98a 100644
--- a/clang/test/Coverage/html-diagnostics.c
+++ b/clang/test/Coverage/html-diagnostics.c
@@ -1,5 +1,5 @@
// RUN: rm -rf %t &&
-// RUN: clang --html-diags=%t -checker-simple %s
+// RUN: clang-cc --html-diags=%t -checker-simple %s
void f0(int x) {
int *p = &x;
diff --git a/clang/test/Coverage/html-print.c b/clang/test/Coverage/html-print.c
index 7ade9c6237b..dab156b145a 100644
--- a/clang/test/Coverage/html-print.c
+++ b/clang/test/Coverage/html-print.c
@@ -1,3 +1,3 @@
-// RUN: clang -emit-html -o %t %s
+// RUN: clang-cc -emit-html -o %t %s
#include "c-language-features.inc"
diff --git a/clang/test/Coverage/parse-callbacks.c b/clang/test/Coverage/parse-callbacks.c
index f65d9513d4b..309074de9e7 100644
--- a/clang/test/Coverage/parse-callbacks.c
+++ b/clang/test/Coverage/parse-callbacks.c
@@ -1,4 +1,4 @@
-// RUN: clang --parse-noop %s &&
-// RUN: clang --parse-print-callbacks %s
+// RUN: clang-cc --parse-noop %s &&
+// RUN: clang-cc --parse-print-callbacks %s
#include "c-language-features.inc"
diff --git a/clang/test/Coverage/parse-callbacks.m b/clang/test/Coverage/parse-callbacks.m
index efce13e9586..dc1dcfc6627 100644
--- a/clang/test/Coverage/parse-callbacks.m
+++ b/clang/test/Coverage/parse-callbacks.m
@@ -1,4 +1,4 @@
-// RUN: clang --parse-noop %s &&
-// RUN: clang --parse-print-callbacks %s
+// RUN: clang-cc --parse-noop %s &&
+// RUN: clang-cc --parse-print-callbacks %s
#include "objc-language-features.inc"
diff --git a/clang/test/Coverage/serialize.c b/clang/test/Coverage/serialize.c
index 11509062da7..a963aacf1d9 100644
--- a/clang/test/Coverage/serialize.c
+++ b/clang/test/Coverage/serialize.c
@@ -1,5 +1,5 @@
// DISABLED:
-// R U N: clang -fsyntax-only --serialize %s
+// R U N: clang-cc -fsyntax-only --serialize %s
// RUN:
#include "c-language-features.inc"
diff --git a/clang/test/Coverage/serialize.m b/clang/test/Coverage/serialize.m
index fbab286a481..e575b2db2dc 100644
--- a/clang/test/Coverage/serialize.m
+++ b/clang/test/Coverage/serialize.m
@@ -1,5 +1,5 @@
// DISABLED:
+// R U N: clang-cc -fsyntax-only --serialize %s
// RUN:
-// R U N: clang -fsyntax-only --serialize %s
#include "objc-language-features.inc"
diff --git a/clang/test/Coverage/targets.c b/clang/test/Coverage/targets.c
index 669fe841fe3..5a547a53add 100644
--- a/clang/test/Coverage/targets.c
+++ b/clang/test/Coverage/targets.c
@@ -1,18 +1,18 @@
-// RUN: clang -g -triple i686-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple i686-pc-linux-gnu -emit-llvm -o %t %s &&
-// RUN: clang -g -triple i686-unknown-dragonfly -emit-llvm -o %t %s &&
-// RUN: clang -g -triple i686-unknown-win32 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple i686-apple-darwin9 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple x86_64-pc-linux-gnu -emit-llvm -o %t %s &&
-// RUN: clang -g -triple x86_64-apple-darwin9 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple ppc-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple ppc-apple-darwin9 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple ppc64-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple ppc64-apple-darwin9 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple armv6-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple armv6-apple-darwin9 -emit-llvm -o %t %s &&
-// RUN: clang -g -triple sparc-unknown-unknown -emit-llvm -o %t %s &&
-// RUN: clang -g -triple sparc-unknown-solaris -emit-llvm -o %t %s &&
-// RUN: clang -g -triple pic16-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple i686-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple i686-pc-linux-gnu -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple i686-unknown-dragonfly -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple i686-unknown-win32 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple i686-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple x86_64-pc-linux-gnu -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple x86_64-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple ppc-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple ppc-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple ppc64-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple ppc64-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple armv6-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple armv6-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple sparc-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple sparc-unknown-solaris -emit-llvm -o %t %s &&
+// RUN: clang-cc -g -triple pic16-unknown-unknown -emit-llvm -o %t %s &&
// RUN: true
diff --git a/clang/test/Coverage/verbose.c b/clang/test/Coverage/verbose.c
index 6157bad395f..a75557b3fde 100644
--- a/clang/test/Coverage/verbose.c
+++ b/clang/test/Coverage/verbose.c
@@ -1 +1 @@
-// RUN: clang -fsyntax-only -v %s
+// RUN: clang-cc -fsyntax-only -v %s
diff --git a/clang/test/Driver/hello.c b/clang/test/Driver/hello.c
index 49c5276611f..503c274439b 100644
--- a/clang/test/Driver/hello.c
+++ b/clang/test/Driver/hello.c
@@ -1,7 +1,7 @@
// RUN: clang-driver -ccc-echo -o %t %s 2> %t.log &&
// Make sure we used clang.
-// RUN: grep 'clang" .*hello.c' %t.log &&
+// RUN: grep 'clang-cc" .*hello.c' %t.log &&
// RUN: %t > %t.out &&
// RUN: grep "I'm a little driver, short and stout." %t.out
diff --git a/clang/test/Driver/pth.c b/clang/test/Driver/pth.c
index d01326e0423..3fdcb8017b7 100644
--- a/clang/test/Driver/pth.c
+++ b/clang/test/Driver/pth.c
@@ -1,8 +1,8 @@
// Test transparent PTH support.
// RUN: clang-driver -x c-header %s -o %t.h.pch -### 2> %t.log &&
-// RUN: grep '".*/clang" .* "-o" ".*\.h\.pch" "-x" "c-header" ".*pth\.c"' %t.log &&
+// RUN: grep '".*/clang-cc" .* "-o" ".*\.h\.pch" "-x" "c-header" ".*pth\.c"' %t.log &&
// RUN: touch %t.h.pth &&
// RUN: clang-driver -E -include %t.h %s -### 2> %t.log &&
-// RUN: grep '".*/clang" .*"-include-pth" ".*\.h\.pth" .*"-x" "c" ".*pth\.c"' %t.log
+// RUN: grep '".*/clang-cc" .*"-include-pth" ".*\.h\.pth" .*"-x" "c" ".*pth\.c"' %t.log
diff --git a/clang/test/Frontend/dependency-gen.c b/clang/test/Frontend/dependency-gen.c
index cd668f1ab5e..ea95e0601bd 100644
--- a/clang/test/Frontend/dependency-gen.c
+++ b/clang/test/Frontend/dependency-gen.c
@@ -1,5 +1,5 @@
// rdar://6533411
-// RUN: clang -MD -MF %t.d -x c /dev/null
+// RUN: clang-cc -MD -MF %t.d -x c /dev/null
diff --git a/clang/test/Frontend/rewrite-macros.c b/clang/test/Frontend/rewrite-macros.c
index deb54f4297f..32e02ecb266 100644
--- a/clang/test/Frontend/rewrite-macros.c
+++ b/clang/test/Frontend/rewrite-macros.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify --rewrite-macros -o %t %s &&
+// RUN: clang-cc -verify --rewrite-macros -o %t %s &&
#define A(a,b) a ## b
diff --git a/clang/test/Frontend/stdin.c b/clang/test/Frontend/stdin.c
index a3899dea75d..35fe45d35b4 100644
--- a/clang/test/Frontend/stdin.c
+++ b/clang/test/Frontend/stdin.c
@@ -1,3 +1,3 @@
-// RUN: clang -E - < /dev/null > %t
+// RUN: clang-cc -E - < /dev/null > %t
// RUN: grep '<built-in>' %t
diff --git a/clang/test/Lexer/11-27-2007-FloatLiterals.c b/clang/test/Lexer/11-27-2007-FloatLiterals.c
index c0e21546a85..f3ea7cbaf9f 100644
--- a/clang/test/Lexer/11-27-2007-FloatLiterals.c
+++ b/clang/test/Lexer/11-27-2007-FloatLiterals.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -emit-llvm -o - | grep 0x3BFD83C940000000 | count 2 &&
-// RUN: clang %s -emit-llvm -o - | grep 2.000000e+32 | count 2
+// RUN: clang-cc %s -emit-llvm -o - | grep 0x3BFD83C940000000 | count 2 &&
+// RUN: clang-cc %s -emit-llvm -o - | grep 2.000000e+32 | count 2
float F = 1e-19f;
double D = 2e32;
diff --git a/clang/test/Lexer/badstring_in_if0.c b/clang/test/Lexer/badstring_in_if0.c
index 714f89b3869..5fa5a2bb240 100644
--- a/clang/test/Lexer/badstring_in_if0.c
+++ b/clang/test/Lexer/badstring_in_if0.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s 2>&1 | not grep error
+// RUN: clang-cc -E %s 2>&1 | not grep error
#if 0
"
diff --git a/clang/test/Lexer/block_cmt_end.c b/clang/test/Lexer/block_cmt_end.c
index d049c028726..65d948f7fd8 100644
--- a/clang/test/Lexer/block_cmt_end.c
+++ b/clang/test/Lexer/block_cmt_end.c
@@ -1,9 +1,9 @@
/*
- RUN: clang -E -trigraphs %s | grep bar &&
- RUN: clang -E -trigraphs %s | grep foo &&
- RUN: clang -E -trigraphs %s | not grep abc &&
- RUN: clang -E -trigraphs %s | not grep xyz &&
- RUN: clang -fsyntax-only -trigraphs -verify %s
+ RUN: clang-cc -E -trigraphs %s | grep bar &&
+ RUN: clang-cc -E -trigraphs %s | grep foo &&
+ RUN: clang-cc -E -trigraphs %s | not grep abc &&
+ RUN: clang-cc -E -trigraphs %s | not grep xyz &&
+ RUN: clang-cc -fsyntax-only -trigraphs -verify %s
*/
// This is a simple comment, /*/ does not end a comment, the trailing */ does.
diff --git a/clang/test/Lexer/c90.c b/clang/test/Lexer/c90.c
index d76c73ddc3d..d743d68cd50 100644
--- a/clang/test/Lexer/c90.c
+++ b/clang/test/Lexer/c90.c
@@ -1,4 +1,4 @@
-/* RUN: clang -std=c90 -fsyntax-only %s -verify -pedantic-errors
+/* RUN: clang-cc -std=c90 -fsyntax-only %s -verify -pedantic-errors
*/
enum { cast_hex = (long) (
diff --git a/clang/test/Lexer/constants.c b/clang/test/Lexer/constants.c
index 6d7ca19cdb9..014a8f1235c 100644
--- a/clang/test/Lexer/constants.c
+++ b/clang/test/Lexer/constants.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s
*/
int x = 000000080; /* expected-error {{invalid digit}} */
diff --git a/clang/test/Lexer/cxx0x_keyword.cpp b/clang/test/Lexer/cxx0x_keyword.cpp
index a54d26343b0..412c25e83c4 100644
--- a/clang/test/Lexer/cxx0x_keyword.cpp
+++ b/clang/test/Lexer/cxx0x_keyword.cpp
@@ -1,2 +1,2 @@
-// RUN: clang -fsyntax-only -verify -std=c++0x %s 2>&1
+// RUN: clang-cc -fsyntax-only -verify -std=c++0x %s 2>&1
int static_assert; /* expected-error {{expected unqualified-id}} */
diff --git a/clang/test/Lexer/cxx0x_keyword_as_cxx98.cpp b/clang/test/Lexer/cxx0x_keyword_as_cxx98.cpp
index 6700dcb1827..9f8aea127cb 100644
--- a/clang/test/Lexer/cxx0x_keyword_as_cxx98.cpp
+++ b/clang/test/Lexer/cxx0x_keyword_as_cxx98.cpp
@@ -1,2 +1,2 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
int static_assert;
diff --git a/clang/test/Lexer/digraph.c b/clang/test/Lexer/digraph.c
index 9683ee4f998..4d494ca1dd9 100644
--- a/clang/test/Lexer/digraph.c
+++ b/clang/test/Lexer/digraph.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify < %s
+// RUN: clang-cc -fsyntax-only -verify < %s
%:include <stdio.h>
diff --git a/clang/test/Lexer/dollar-idents.c b/clang/test/Lexer/dollar-idents.c
index ed20f05fb00..7635ea112eb 100644
--- a/clang/test/Lexer/dollar-idents.c
+++ b/clang/test/Lexer/dollar-idents.c
@@ -1,6 +1,6 @@
-// RUN: clang -dump-tokens %s 2> %t &&
+// RUN: clang-cc -dump-tokens %s 2> %t &&
// RUN: grep "identifier '\$A'" %t
-// RUN: clang -dump-tokens -x assembler-with-cpp %s 2> %t &&
+// RUN: clang-cc -dump-tokens -x assembler-with-cpp %s 2> %t &&
// RUN: grep "identifier 'A'" %t
// PR3808
diff --git a/clang/test/Lexer/escape_newline.c b/clang/test/Lexer/escape_newline.c
index 2e4b7cd7cd8..ce120ed7c82 100644
--- a/clang/test/Lexer/escape_newline.c
+++ b/clang/test/Lexer/escape_newline.c
@@ -1,6 +1,6 @@
-// RUN: clang -E -trigraphs %s | grep -- ' ->' &&
-// RUN: clang -E -trigraphs %s 2>&1 | grep 'backslash and newline separated by space' &&
-// RUN: clang -E -trigraphs %s 2>&1 | grep 'trigraph converted'
+// RUN: clang-cc -E -trigraphs %s | grep -- ' ->' &&
+// RUN: clang-cc -E -trigraphs %s 2>&1 | grep 'backslash and newline separated by space' &&
+// RUN: clang-cc -E -trigraphs %s 2>&1 | grep 'trigraph converted'
// This is an ugly way to spell a -> token.
-??/
diff --git a/clang/test/Lexer/multiple-include.c b/clang/test/Lexer/multiple-include.c
index ccea3ff7745..e5fd52926ee 100644
--- a/clang/test/Lexer/multiple-include.c
+++ b/clang/test/Lexer/multiple-include.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
#ifndef XVID_AUTO_INCLUDE
diff --git a/clang/test/Lexer/number.c b/clang/test/Lexer/number.c
index bafbc022d5e..253453c764b 100644
--- a/clang/test/Lexer/number.c
+++ b/clang/test/Lexer/number.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
float X = 1.17549435e-38F;
float Y = 08.123456;
diff --git a/clang/test/Lexer/numeric-literal-trash.c b/clang/test/Lexer/numeric-literal-trash.c
index 243825a5363..047e0b8e95f 100644
--- a/clang/test/Lexer/numeric-literal-trash.c
+++ b/clang/test/Lexer/numeric-literal-trash.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s
*/
# define XRECORD(x, c_name) e##c (x, __LINE__)
diff --git a/clang/test/Lexer/pragma-mark.c b/clang/test/Lexer/pragma-mark.c
index 388fef55755..f4204aa9d80 100644
--- a/clang/test/Lexer/pragma-mark.c
+++ b/clang/test/Lexer/pragma-mark.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// Lexer diagnostics shouldn't be included in #pragma mark.
#pragma mark Mike's world
diff --git a/clang/test/Lexer/rdr-6096838-2.c b/clang/test/Lexer/rdr-6096838-2.c
index 152617e2589..b135dc1409c 100644
--- a/clang/test/Lexer/rdr-6096838-2.c
+++ b/clang/test/Lexer/rdr-6096838-2.c
@@ -1,4 +1,4 @@
-/* RUN: clang -pedantic -std=gnu89 -fsyntax-only -verify %s
+/* RUN: clang-cc -pedantic -std=gnu89 -fsyntax-only -verify %s
rdar://6096838
*/
diff --git a/clang/test/Lexer/rdr-6096838.c b/clang/test/Lexer/rdr-6096838.c
index 3a7a0d5f1ff..60e5244646a 100644
--- a/clang/test/Lexer/rdr-6096838.c
+++ b/clang/test/Lexer/rdr-6096838.c
@@ -1,5 +1,5 @@
-/* RUN: clang -fsyntax-only -verify %s &&
- * RUN: clang -std=gnu89 -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s &&
+ * RUN: clang-cc -std=gnu89 -fsyntax-only -verify %s
rdar://6096838
*/
diff --git a/clang/test/Lexer/token-concat.c b/clang/test/Lexer/token-concat.c
index 003344fc0a2..4e27d5d723e 100644
--- a/clang/test/Lexer/token-concat.c
+++ b/clang/test/Lexer/token-concat.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -x c -o %t %s &&
+// RUN: clang-cc -E -x c -o %t %s &&
// RUN: grep 'IDENT.2' %t
IDENT.2
diff --git a/clang/test/Lexer/unknown-char.c b/clang/test/Lexer/unknown-char.c
index 8bdfe60553d..acbf4f039a7 100644
--- a/clang/test/Lexer/unknown-char.c
+++ b/clang/test/Lexer/unknown-char.c
@@ -1,2 +1,2 @@
-// RUN: clang -E %s 2>&1 | not grep error
+// RUN: clang-cc -E %s 2>&1 | not grep error
` ` ` `
diff --git a/clang/test/Misc/caret-diags.c b/clang/test/Misc/caret-diags.c
index e6ec03a5b4f..e339d563575 100644
--- a/clang/test/Misc/caret-diags.c
+++ b/clang/test/Misc/caret-diags.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s 2>&1 | not grep keyXXXX
+// RUN: clang-cc -fsyntax-only %s 2>&1 | not grep keyXXXX
// This should not show keyXXXX in the caret diag output. This once
// happened because the two tokens ended up in the scratch buffer and
// the caret diag from the scratch buffer included the previous token.
diff --git a/clang/test/Misc/diag-checker.c b/clang/test/Misc/diag-checker.c
index e5864461a67..4733ee1e03d 100644
--- a/clang/test/Misc/diag-checker.c
+++ b/clang/test/Misc/diag-checker.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#include <stdio.h>
diff --git a/clang/test/Misc/emit-html.c b/clang/test/Misc/emit-html.c
index 8c6556e3e5e..22d0d28dd65 100644
--- a/clang/test/Misc/emit-html.c
+++ b/clang/test/Misc/emit-html.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-html -o -
+// RUN: clang-cc %s -emit-html -o -
// rdar://6562329
#line 42 "foo.c"
diff --git a/clang/test/Parser/2008-10-31-parse-noop-failure.c b/clang/test/Parser/2008-10-31-parse-noop-failure.c
index c93947591b9..0598ea7dc9e 100755
--- a/clang/test/Parser/2008-10-31-parse-noop-failure.c
+++ b/clang/test/Parser/2008-10-31-parse-noop-failure.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -parse-noop %t
+// RUN: clang-cc -verify -parse-noop %t
void add_attribute(id) int id; {}
diff --git a/clang/test/Parser/CompoundStmtScope.c b/clang/test/Parser/CompoundStmtScope.c
index 9aadbceac13..6a404aa3a2c 100644
--- a/clang/test/Parser/CompoundStmtScope.c
+++ b/clang/test/Parser/CompoundStmtScope.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int foo() {
{
diff --git a/clang/test/Parser/MicrosoftExtensions.c b/clang/test/Parser/MicrosoftExtensions.c
index 039bafea097..6f5622e9393 100644
--- a/clang/test/Parser/MicrosoftExtensions.c
+++ b/clang/test/Parser/MicrosoftExtensions.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -fms-extensions -x=objective-c++ %s
+// RUN: clang-cc -fsyntax-only -verify -fms-extensions -x=objective-c++ %s
__stdcall int func0();
int __stdcall func();
typedef int (__cdecl *tptr)();
diff --git a/clang/test/Parser/argument_qualified.c b/clang/test/Parser/argument_qualified.c
index cd92c3258c6..c9494e7373a 100644
--- a/clang/test/Parser/argument_qualified.c
+++ b/clang/test/Parser/argument_qualified.c
@@ -1,4 +1,4 @@
-// RUN: clang %s
+// RUN: clang-cc %s
int abc (const float x) {
return 1;
}
diff --git a/clang/test/Parser/argument_redef.c b/clang/test/Parser/argument_redef.c
index 16263f43571..1a43178a40c 100644
--- a/clang/test/Parser/argument_redef.c
+++ b/clang/test/Parser/argument_redef.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s
*/
int foo(int A) { /* expected-note {{previous definition is here}} */
diff --git a/clang/test/Parser/argument_scope.c b/clang/test/Parser/argument_scope.c
index 8b9f065c822..5e6f439cfdf 100644
--- a/clang/test/Parser/argument_scope.c
+++ b/clang/test/Parser/argument_scope.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
typedef struct foo foo;
void blah(int foo) {
diff --git a/clang/test/Parser/asm.c b/clang/test/Parser/asm.c
index c23d31a7247..9cf9046aab6 100644
--- a/clang/test/Parser/asm.c
+++ b/clang/test/Parser/asm.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f1() {
asm ("ret" : : :); // expected-error {{expected string literal}}
diff --git a/clang/test/Parser/attributes.c b/clang/test/Parser/attributes.c
index d7fc35d92b3..37fa0ca1d36 100644
--- a/clang/test/Parser/attributes.c
+++ b/clang/test/Parser/attributes.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -pedantic -std=c99
+// RUN: clang-cc -fsyntax-only -verify %s -pedantic -std=c99
int __attribute__(()) x; // expected-warning {{extension used}}
diff --git a/clang/test/Parser/bad-control.c b/clang/test/Parser/bad-control.c
index fab9fa30394..6e59667c354 100644
--- a/clang/test/Parser/bad-control.c
+++ b/clang/test/Parser/bad-control.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s
*/
int foo() {
break; /* expected-error {{'break' statement not in loop or switch statement}} */
diff --git a/clang/test/Parser/block-block-storageclass.c b/clang/test/Parser/block-block-storageclass.c
index c9be12f1f07..d24ec5f1c69 100644
--- a/clang/test/Parser/block-block-storageclass.c
+++ b/clang/test/Parser/block-block-storageclass.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -parse-noop %s
+// RUN: clang-cc -fsyntax-only -verify -parse-noop %s
#if 0
#include <stdio.h>
void _Block_byref_release(void*src){}
diff --git a/clang/test/Parser/block-pointer-decl.c b/clang/test/Parser/block-pointer-decl.c
index 9920f5f68b3..7a21651bad3 100644
--- a/clang/test/Parser/block-pointer-decl.c
+++ b/clang/test/Parser/block-pointer-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -parse-noop -fblocks %s
+// RUN: clang-cc -fsyntax-only -verify -parse-noop -fblocks %s
struct blockStruct {
int (^a)(float, int);
diff --git a/clang/test/Parser/builtin_classify_type.c b/clang/test/Parser/builtin_classify_type.c
index 0a46f33b71d..7046310eb4a 100644
--- a/clang/test/Parser/builtin_classify_type.c
+++ b/clang/test/Parser/builtin_classify_type.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct foo { int a; };
diff --git a/clang/test/Parser/builtin_types_compatible.c b/clang/test/Parser/builtin_types_compatible.c
index 925c7ea50a1..0664a9f5564 100644
--- a/clang/test/Parser/builtin_types_compatible.c
+++ b/clang/test/Parser/builtin_types_compatible.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
extern int funcInt(int);
extern float funcFloat(float);
diff --git a/clang/test/Parser/c-namespace.c b/clang/test/Parser/c-namespace.c
index 2b380503ace..ffca15e6a2e 100644
--- a/clang/test/Parser/c-namespace.c
+++ b/clang/test/Parser/c-namespace.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
void bla1() {
struct XXX;
int XXX;
diff --git a/clang/test/Parser/char-literal-printing.c b/clang/test/Parser/char-literal-printing.c
index 990b8f76e1a..f6ad0ff511b 100644
--- a/clang/test/Parser/char-literal-printing.c
+++ b/clang/test/Parser/char-literal-printing.c
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s
+// RUN: clang-cc -ast-print %s
#include <stddef.h>
diff --git a/clang/test/Parser/check-objc2-syntax-1.m b/clang/test/Parser/check-objc2-syntax-1.m
index 967fa7583cd..f596e9ba0f3 100644
--- a/clang/test/Parser/check-objc2-syntax-1.m
+++ b/clang/test/Parser/check-objc2-syntax-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Subclass
+ (int)magicNumber;
diff --git a/clang/test/Parser/check-syntax-1.m b/clang/test/Parser/check-syntax-1.m
index 9036c65dce5..f4aa430cde1 100644
--- a/clang/test/Parser/check-syntax-1.m
+++ b/clang/test/Parser/check-syntax-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int @interface bla ; // expected-error {{cannot combine with previous 'int' declaration specifier}}
@end
diff --git a/clang/test/Parser/check_cast.c b/clang/test/Parser/check_cast.c
index c69f0f0d035..4df851c7bf9 100644
--- a/clang/test/Parser/check_cast.c
+++ b/clang/test/Parser/check_cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct foo {
int a;
};
diff --git a/clang/test/Parser/compound_literal.c b/clang/test/Parser/compound_literal.c
index c6d665ca43b..c263763b2e2 100644
--- a/clang/test/Parser/compound_literal.c
+++ b/clang/test/Parser/compound_literal.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int main() {
char *s;
s = (char []){"whatever"};
diff --git a/clang/test/Parser/control-scope.c b/clang/test/Parser/control-scope.c
index 4beed7eecd3..7ffc6ac46c0 100644
--- a/clang/test/Parser/control-scope.c
+++ b/clang/test/Parser/control-scope.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -std=c90 -verify &&
-// RUN: clang %s -std=c99
+// RUN: clang-cc %s -std=c90 -verify &&
+// RUN: clang-cc %s -std=c99
int f (int z) {
if (z + sizeof (enum {a})) // expected-note {{previous definition is here}}
diff --git a/clang/test/Parser/cxx-bool.cpp b/clang/test/Parser/cxx-bool.cpp
index 623dcb2887e..f0b3a9f9f03 100644
--- a/clang/test/Parser/cxx-bool.cpp
+++ b/clang/test/Parser/cxx-bool.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
bool a = true;
bool b = false;
diff --git a/clang/test/Parser/cxx-casting.cpp b/clang/test/Parser/cxx-casting.cpp
index 4b11dc8a2bc..1fdc28d2c88 100644
--- a/clang/test/Parser/cxx-casting.cpp
+++ b/clang/test/Parser/cxx-casting.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
char *const_cast_test(const char *var)
{
@@ -33,4 +33,4 @@ double static_cast_test(int i)
char postfix_expr_test()
{
return reinterpret_cast<char*>(0xdeadbeef)[0];
-} \ No newline at end of file
+}
diff --git a/clang/test/Parser/cxx-class.cpp b/clang/test/Parser/cxx-class.cpp
index 9cdd1d7c0ec..ff452b91911 100644
--- a/clang/test/Parser/cxx-class.cpp
+++ b/clang/test/Parser/cxx-class.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class C;
class C {
public:
diff --git a/clang/test/Parser/cxx-condition.cpp b/clang/test/Parser/cxx-condition.cpp
index 2a77193f259..8fbca2a90f7 100644
--- a/clang/test/Parser/cxx-condition.cpp
+++ b/clang/test/Parser/cxx-condition.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -parse-noop -verify %s
+// RUN: clang-cc -parse-noop -verify %s
void f() {
int a;
diff --git a/clang/test/Parser/cxx-exception-spec.cpp b/clang/test/Parser/cxx-exception-spec.cpp
index 47e9ffb50b3..b2203c96df7 100644
--- a/clang/test/Parser/cxx-exception-spec.cpp
+++ b/clang/test/Parser/cxx-exception-spec.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
struct X { };
diff --git a/clang/test/Parser/cxx-reference.cpp b/clang/test/Parser/cxx-reference.cpp
index a1cbc5ea4de..0d2b9d29c36 100644
--- a/clang/test/Parser/cxx-reference.cpp
+++ b/clang/test/Parser/cxx-reference.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
extern char *bork;
char *& bar = bork;
diff --git a/clang/test/Parser/cxx-template-decl.cpp b/clang/test/Parser/cxx-template-decl.cpp
index ce617fb7a29..ec333de8b4f 100644
--- a/clang/test/Parser/cxx-template-decl.cpp
+++ b/clang/test/Parser/cxx-template-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Errors
export class foo { }; // expected-error {{expected template}}
diff --git a/clang/test/Parser/cxx-try.cpp b/clang/test/Parser/cxx-try.cpp
index 642c8f6fe8f..76b85e84065 100644
--- a/clang/test/Parser/cxx-try.cpp
+++ b/clang/test/Parser/cxx-try.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f()
{
diff --git a/clang/test/Parser/cxx-typeid.cpp b/clang/test/Parser/cxx-typeid.cpp
index 1a6ffdbcd0a..5a92e7322f1 100644
--- a/clang/test/Parser/cxx-typeid.cpp
+++ b/clang/test/Parser/cxx-typeid.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// FIXME: This should really include <typeinfo>, but we don't have that yet.
namespace std {
diff --git a/clang/test/Parser/cxx-typeof.cpp b/clang/test/Parser/cxx-typeof.cpp
index 7e09905d8f4..0bf446316cf 100644
--- a/clang/test/Parser/cxx-typeof.cpp
+++ b/clang/test/Parser/cxx-typeof.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
static void test() {
int *pi;
diff --git a/clang/test/Parser/cxx-using-directive.cpp b/clang/test/Parser/cxx-using-directive.cpp
index bf89bb19211..676f4e6c5a5 100644
--- a/clang/test/Parser/cxx-using-directive.cpp
+++ b/clang/test/Parser/cxx-using-directive.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class A {};
diff --git a/clang/test/Parser/cxx-variadic-func.cpp b/clang/test/Parser/cxx-variadic-func.cpp
index 0e9c5ca285a..86d6b6bf2c5 100644
--- a/clang/test/Parser/cxx-variadic-func.cpp
+++ b/clang/test/Parser/cxx-variadic-func.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
void f(...) {
int g(int(...));
diff --git a/clang/test/Parser/cxx0x-rvalue-reference.cpp b/clang/test/Parser/cxx0x-rvalue-reference.cpp
index 5736b79ff76..389f2b94700 100644
--- a/clang/test/Parser/cxx0x-rvalue-reference.cpp
+++ b/clang/test/Parser/cxx0x-rvalue-reference.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c++0x %s
+// RUN: clang-cc -fsyntax-only -verify -std=c++0x %s
int && r1(int &&a);
diff --git a/clang/test/Parser/declarators.c b/clang/test/Parser/declarators.c
index fb7704faf3d..8a533ee53d8 100644
--- a/clang/test/Parser/declarators.c
+++ b/clang/test/Parser/declarators.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
extern int a1[];
diff --git a/clang/test/Parser/designator.c b/clang/test/Parser/designator.c
index d17f1b50eca..76c2d435227 100644
--- a/clang/test/Parser/designator.c
+++ b/clang/test/Parser/designator.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify -pedantic
+// RUN: clang-cc -fsyntax-only %s -verify -pedantic
int X[] = {
[4]4, // expected-warning {{use of GNU 'missing =' extension in designator}}
diff --git a/clang/test/Parser/encode.m b/clang/test/Parser/encode.m
index ce12882ecf0..1e088a01151 100644
--- a/clang/test/Parser/encode.m
+++ b/clang/test/Parser/encode.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int main(void) {
const char ch = @encode(char *)[2];
diff --git a/clang/test/Parser/enhanced-proto-1.m b/clang/test/Parser/enhanced-proto-1.m
index 354502e7913..1f42ec2efbb 100644
--- a/clang/test/Parser/enhanced-proto-1.m
+++ b/clang/test/Parser/enhanced-proto-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol MyProto1
@optional
diff --git a/clang/test/Parser/expressions.c b/clang/test/Parser/expressions.c
index 29621f1975e..3f58ef3d51e 100644
--- a/clang/test/Parser/expressions.c
+++ b/clang/test/Parser/expressions.c
@@ -1,4 +1,4 @@
-// RUN: clang -parse-noop %s
+// RUN: clang-cc -parse-noop %s
void test1() {
if (sizeof (int){ 1}); // sizeof compound literal
diff --git a/clang/test/Parser/expressions.m b/clang/test/Parser/expressions.m
index 8e314aca6f7..e9e41216f98 100644
--- a/clang/test/Parser/expressions.m
+++ b/clang/test/Parser/expressions.m
@@ -1,4 +1,4 @@
-// RUN: clang -parse-noop %s
+// RUN: clang-cc -parse-noop %s
void test1() {
@"s"; // expected-warning {{expression result unused}}
diff --git a/clang/test/Parser/extension.c b/clang/test/Parser/extension.c
index 9bd18de63f7..24f1ac5181a 100644
--- a/clang/test/Parser/extension.c
+++ b/clang/test/Parser/extension.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
// Top level extension marker.
diff --git a/clang/test/Parser/function-decls.c b/clang/test/Parser/function-decls.c
index 3493baa156d..28bb5c2e18d 100644
--- a/clang/test/Parser/function-decls.c
+++ b/clang/test/Parser/function-decls.c
@@ -1,4 +1,4 @@
-/* RUN: clang %s -ast-print
+/* RUN: clang-cc %s -ast-print
*/
void foo() {
diff --git a/clang/test/Parser/goto-ident.c b/clang/test/Parser/goto-ident.c
index 87d6ea5513d..e8d1963e38c 100644
--- a/clang/test/Parser/goto-ident.c
+++ b/clang/test/Parser/goto-ident.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only -verify %s
+/* RUN: clang-cc -fsyntax-only -verify %s
*/
void foo() {
diff --git a/clang/test/Parser/if-scope-c90.c b/clang/test/Parser/if-scope-c90.c
index 43a3676ca48..fdc75e9f10b 100644
--- a/clang/test/Parser/if-scope-c90.c
+++ b/clang/test/Parser/if-scope-c90.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify --std=c90 %s
+// RUN: clang-cc -fsyntax-only -verify --std=c90 %s
int f (int z)
{
diff --git a/clang/test/Parser/if-scope-c99.c b/clang/test/Parser/if-scope-c99.c
index 41d7ae2e181..37cd0e15ab8 100644
--- a/clang/test/Parser/if-scope-c99.c
+++ b/clang/test/Parser/if-scope-c99.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify --std=c99 %s
+// RUN: clang-cc -fsyntax-only -verify --std=c99 %s
int f (int z)
{
diff --git a/clang/test/Parser/implicit-casts.c b/clang/test/Parser/implicit-casts.c
index 2e8e0001822..e7d20980da4 100644
--- a/clang/test/Parser/implicit-casts.c
+++ b/clang/test/Parser/implicit-casts.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
_Complex double X;
void test1(int c) {
X = 5;
diff --git a/clang/test/Parser/method-prototype-1.m b/clang/test/Parser/method-prototype-1.m
index 6399f040a9c..1d535de8c14 100644
--- a/clang/test/Parser/method-prototype-1.m
+++ b/clang/test/Parser/method-prototype-1.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -parse-noop
+// RUN: clang-cc %s -parse-noop
@interface MyObject
- (void) bycopy : (int) woodo, ... ;
- (void) break : (int) woodo, ... ;
diff --git a/clang/test/Parser/namelookup-bug-1.c b/clang/test/Parser/namelookup-bug-1.c
index 298798c5fa1..3c8b85a2d61 100644
--- a/clang/test/Parser/namelookup-bug-1.c
+++ b/clang/test/Parser/namelookup-bug-1.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
typedef int Object;
diff --git a/clang/test/Parser/namelookup-bug-2.c b/clang/test/Parser/namelookup-bug-2.c
index 443b50ab02f..42298c39c46 100644
--- a/clang/test/Parser/namelookup-bug-2.c
+++ b/clang/test/Parser/namelookup-bug-2.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
typedef int Object;
diff --git a/clang/test/Parser/objc-alias-printing.m b/clang/test/Parser/objc-alias-printing.m
index 67e013f1d3d..e121bed0aea 100644
--- a/clang/test/Parser/objc-alias-printing.m
+++ b/clang/test/Parser/objc-alias-printing.m
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s
+// RUN: clang-cc -ast-print %s
@protocol P1 @end
@protocol P2 @end
diff --git a/clang/test/Parser/objc-category-neg-1.m b/clang/test/Parser/objc-category-neg-1.m
index 3da911b6dec..6c1bd295173 100644
--- a/clang/test/Parser/objc-category-neg-1.m
+++ b/clang/test/Parser/objc-category-neg-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void __assert_rtn(const char *, const char *, int, const char *) __attribute__((__noreturn__));
static __inline__ int __inline_isfinitef (float ) __attribute__ ((always_inline));
diff --git a/clang/test/Parser/objc-forcollection-1.m b/clang/test/Parser/objc-forcollection-1.m
index 6db74dc9527..21ec308a28a 100644
--- a/clang/test/Parser/objc-forcollection-1.m
+++ b/clang/test/Parser/objc-forcollection-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
typedef struct objc_class *Class;
typedef struct objc_object {
diff --git a/clang/test/Parser/objc-forcollection-neg-2.m b/clang/test/Parser/objc-forcollection-neg-2.m
index 31c8097ccb2..ddb279b6f7c 100644
--- a/clang/test/Parser/objc-forcollection-neg-2.m
+++ b/clang/test/Parser/objc-forcollection-neg-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef struct objc_class *Class;
typedef struct objc_object {
diff --git a/clang/test/Parser/objc-forcollection-neg.m b/clang/test/Parser/objc-forcollection-neg.m
index d67a714dafa..0f2bb90df85 100644
--- a/clang/test/Parser/objc-forcollection-neg.m
+++ b/clang/test/Parser/objc-forcollection-neg.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef struct objc_class *Class;
typedef struct objc_object {
diff --git a/clang/test/Parser/objc-foreach-error-1.m b/clang/test/Parser/objc-foreach-error-1.m
index e65c3290050..16a7ea8e3dc 100644
--- a/clang/test/Parser/objc-foreach-error-1.m
+++ b/clang/test/Parser/objc-foreach-error-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
ce MyList // expected-error {{invalid token after top level declarator}}
@end
diff --git a/clang/test/Parser/objc-foreach-syntax.m b/clang/test/Parser/objc-foreach-syntax.m
index c00f7772e52..950fc2f114a 100644
--- a/clang/test/Parser/objc-foreach-syntax.m
+++ b/clang/test/Parser/objc-foreach-syntax.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
static int test_NSURLGetResourceValueForKey( id keys )
{
diff --git a/clang/test/Parser/objc-init.m b/clang/test/Parser/objc-init.m
index f45d3236b55..8d74dfecbd0 100644
--- a/clang/test/Parser/objc-init.m
+++ b/clang/test/Parser/objc-init.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -pedantic
+// RUN: clang-cc -fsyntax-only -verify %s -pedantic
// rdar://5707001
@interface NSNumber;
diff --git a/clang/test/Parser/objc-interfaces.m b/clang/test/Parser/objc-interfaces.m
index b13eea59552..7aa672901ff 100644
--- a/clang/test/Parser/objc-interfaces.m
+++ b/clang/test/Parser/objc-interfaces.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// Test features and error recovery for objc interfaces.
diff --git a/clang/test/Parser/objc-messaging-1.m b/clang/test/Parser/objc-messaging-1.m
index 7340fac5f7c..4a36fc950fa 100644
--- a/clang/test/Parser/objc-messaging-1.m
+++ b/clang/test/Parser/objc-messaging-1.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -parse-noop
+// RUN: clang-cc %s -parse-noop
int main ()
{
int i,j;
diff --git a/clang/test/Parser/objc-messaging-neg-1.m b/clang/test/Parser/objc-messaging-neg-1.m
index 23db7e28c44..a1ec116fb7b 100644
--- a/clang/test/Parser/objc-messaging-neg-1.m
+++ b/clang/test/Parser/objc-messaging-neg-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int main()
{
diff --git a/clang/test/Parser/objc-missing-impl.m b/clang/test/Parser/objc-missing-impl.m
index 7d38371190c..9108451f1bf 100644
--- a/clang/test/Parser/objc-missing-impl.m
+++ b/clang/test/Parser/objc-missing-impl.m
@@ -1,2 +1,2 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@end // expected-warning {{@end must appear in an @implementation context}}
diff --git a/clang/test/Parser/objc-property-syntax.m b/clang/test/Parser/objc-property-syntax.m
index 1a8fd119475..cf75aaa2d5a 100644
--- a/clang/test/Parser/objc-property-syntax.m
+++ b/clang/test/Parser/objc-property-syntax.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface MyClass {
diff --git a/clang/test/Parser/objc-quirks.m b/clang/test/Parser/objc-quirks.m
index c5fe8bb1a18..2913b580c5f 100644
--- a/clang/test/Parser/objc-quirks.m
+++ b/clang/test/Parser/objc-quirks.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// FIXME: This is a horrible error message here. Fix.
int @"s" = 5; // expected-error {{prefix attribute must be}}
diff --git a/clang/test/Parser/objc-try-catch-1.m b/clang/test/Parser/objc-try-catch-1.m
index 255453135b0..2c41cac3ee6 100644
--- a/clang/test/Parser/objc-try-catch-1.m
+++ b/clang/test/Parser/objc-try-catch-1.m
@@ -1,5 +1,5 @@
-// RUN: clang -fsyntax-only -verify %s &&
-// RUN: clang -fsyntax-only -verify -x objective-c++ %s
+// RUN: clang-cc -fsyntax-only -verify %s &&
+// RUN: clang-cc -fsyntax-only -verify -x objective-c++ %s
void * proc();
@interface NSConstantString
diff --git a/clang/test/Parser/objc-type-printing.m b/clang/test/Parser/objc-type-printing.m
index 5d3cbd994f9..d9ad70474f2 100644
--- a/clang/test/Parser/objc-type-printing.m
+++ b/clang/test/Parser/objc-type-printing.m
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s
+// RUN: clang-cc -ast-print %s
@protocol P1 @end
@protocol P2 @end
diff --git a/clang/test/Parser/parmvardecl_conversion.c b/clang/test/Parser/parmvardecl_conversion.c
index 81acc07b61c..f35487ee95c 100644
--- a/clang/test/Parser/parmvardecl_conversion.c
+++ b/clang/test/Parser/parmvardecl_conversion.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f (int p[]) { p++; }
diff --git a/clang/test/Parser/pointer-arithmetic.c b/clang/test/Parser/pointer-arithmetic.c
index 3556c9aa4d4..d252b42c9b1 100644
--- a/clang/test/Parser/pointer-arithmetic.c
+++ b/clang/test/Parser/pointer-arithmetic.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int *test1(int *a) { return a + 1; }
int *test2(int *a) { return 1 + a; }
diff --git a/clang/test/Parser/pointer_promotion.c b/clang/test/Parser/pointer_promotion.c
index c648209bcf8..0254828e0f0 100644
--- a/clang/test/Parser/pointer_promotion.c
+++ b/clang/test/Parser/pointer_promotion.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int test() {
void *vp;
diff --git a/clang/test/Parser/pragma-pack.c b/clang/test/Parser/pragma-pack.c
index 0b83529494d..d42bbe5c40d 100644
--- a/clang/test/Parser/pragma-pack.c
+++ b/clang/test/Parser/pragma-pack.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Note that this puts the expected lines before the directives to work around
// limitations in the -verify mode.
diff --git a/clang/test/Parser/prefix-attributes.m b/clang/test/Parser/prefix-attributes.m
index 46eb90cd2b3..bb6d04da2a0 100644
--- a/clang/test/Parser/prefix-attributes.m
+++ b/clang/test/Parser/prefix-attributes.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
__attribute__((deprecated)) @class B; // expected-error {{prefix attribute must be followed by an interface or protocol}}
diff --git a/clang/test/Parser/promote_types_in_proto.c b/clang/test/Parser/promote_types_in_proto.c
index 40617a2a7df..faff3e35d5a 100644
--- a/clang/test/Parser/promote_types_in_proto.c
+++ b/clang/test/Parser/promote_types_in_proto.c
@@ -1,4 +1,4 @@
-// RUN: clang %s
+// RUN: clang-cc %s
void functionPromotion(void f(char *const []));
void arrayPromotion(char * const argv[]);
diff --git a/clang/test/Parser/recovery.c b/clang/test/Parser/recovery.c
index 5065b9446a1..1d49525f3b6 100644
--- a/clang/test/Parser/recovery.c
+++ b/clang/test/Parser/recovery.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic -fblocks %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic -fblocks %s
// PR2241
float test2241[] = {
diff --git a/clang/test/Parser/selector-1.m b/clang/test/Parser/selector-1.m
index abe94241aed..85ef919689d 100644
--- a/clang/test/Parser/selector-1.m
+++ b/clang/test/Parser/selector-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -parse-noop %s
+// RUN: clang-cc -parse-noop %s
int main() {
SEL s = @selector(retain);
diff --git a/clang/test/Parser/statements.c b/clang/test/Parser/statements.c
index 26b26624da1..c5923bc0641 100644
--- a/clang/test/Parser/statements.c
+++ b/clang/test/Parser/statements.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int test1() {
{ ; { ;;}} ;;
diff --git a/clang/test/Parser/struct-recursion.c b/clang/test/Parser/struct-recursion.c
index c16f9fc185d..11e5f7e97ab 100644
--- a/clang/test/Parser/struct-recursion.c
+++ b/clang/test/Parser/struct-recursion.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
// C99 6.7.2.3p11
diff --git a/clang/test/Parser/traditional_arg_scope.c b/clang/test/Parser/traditional_arg_scope.c
index f89708cec14..2a21ec3708d 100644
--- a/clang/test/Parser/traditional_arg_scope.c
+++ b/clang/test/Parser/traditional_arg_scope.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
int x(a) int a; {return a;}
int y(b) int b; {return a;} // expected-error {{use of undeclared identifier}}
diff --git a/clang/test/Parser/typeof.c b/clang/test/Parser/typeof.c
index ac51f58021e..8cb16c36f2a 100644
--- a/clang/test/Parser/typeof.c
+++ b/clang/test/Parser/typeof.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef int TInt;
diff --git a/clang/test/Parser/types.c b/clang/test/Parser/types.c
index f1ffb94b98c..69d7eb71054 100644
--- a/clang/test/Parser/types.c
+++ b/clang/test/Parser/types.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
// Test the X can be overloaded inside the struct.
typedef int X;
diff --git a/clang/test/Preprocessor/_Pragma-dependency.c b/clang/test/Preprocessor/_Pragma-dependency.c
index 837f31d07c9..da1d87f741e 100644
--- a/clang/test/Preprocessor/_Pragma-dependency.c
+++ b/clang/test/Preprocessor/_Pragma-dependency.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E 2>&1 | grep 'DO_PRAGMA (STR' &&
-// RUN: clang %s -E 2>&1 | grep '7:3'
+// RUN: clang-cc %s -E 2>&1 | grep 'DO_PRAGMA (STR' &&
+// RUN: clang-cc %s -E 2>&1 | grep '7:3'
#define DO_PRAGMA _Pragma
#define STR "GCC dependency \"parse.y\"")
diff --git a/clang/test/Preprocessor/_Pragma-location.c b/clang/test/Preprocessor/_Pragma-location.c
index 152e71ac13b..61cadfbb8a1 100644
--- a/clang/test/Preprocessor/_Pragma-location.c
+++ b/clang/test/Preprocessor/_Pragma-location.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | not grep 'scratch space'
+// RUN: clang-cc %s -E | not grep 'scratch space'
#define push _Pragma ("pack(push)")
push
diff --git a/clang/test/Preprocessor/_Pragma-physloc.c b/clang/test/Preprocessor/_Pragma-physloc.c
index b8f5499c7a1..87379491676 100644
--- a/clang/test/Preprocessor/_Pragma-physloc.c
+++ b/clang/test/Preprocessor/_Pragma-physloc.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep '#pragma x y z' &&
-// RUN: clang %s -E | grep '#pragma a b c'
+// RUN: clang-cc %s -E | grep '#pragma x y z' &&
+// RUN: clang-cc %s -E | grep '#pragma a b c'
_Pragma("x y z")
_Pragma("a b c")
diff --git a/clang/test/Preprocessor/_Pragma-poison.c b/clang/test/Preprocessor/_Pragma-poison.c
index 82a7fbecc2e..742f88532ee 100644
--- a/clang/test/Preprocessor/_Pragma-poison.c
+++ b/clang/test/Preprocessor/_Pragma-poison.c
@@ -1,5 +1,5 @@
-// RUN: clang -Eonly %s 2>&1 | grep error | wc -l | grep 1 &&
-// RUN: clang -Eonly %s 2>&1 | grep 7:4 | wc -l | grep 1
+// RUN: clang-cc -Eonly %s 2>&1 | grep error | wc -l | grep 1 &&
+// RUN: clang-cc -Eonly %s 2>&1 | grep 7:4 | wc -l | grep 1
#define BAR _Pragma ("GCC poison XYZW") XYZW /*NO ERROR*/
XYZW // NO ERROR
diff --git a/clang/test/Preprocessor/_Pragma-syshdr.c b/clang/test/Preprocessor/_Pragma-syshdr.c
index 4d2d29e023a..44eda5f0b96 100644
--- a/clang/test/Preprocessor/_Pragma-syshdr.c
+++ b/clang/test/Preprocessor/_Pragma-syshdr.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep 'system_header ignored in main file'
+// RUN: clang-cc %s -E 2>&1 | grep 'system_header ignored in main file'
_Pragma ("GCC system_header")
diff --git a/clang/test/Preprocessor/_Pragma-syshdr2.c b/clang/test/Preprocessor/_Pragma-syshdr2.c
index 190e5a7a307..de7f2d3dc3b 100644
--- a/clang/test/Preprocessor/_Pragma-syshdr2.c
+++ b/clang/test/Preprocessor/_Pragma-syshdr2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s 2>&1 | grep 'file not found'
+// RUN: clang-cc -E %s 2>&1 | grep 'file not found'
#define DO_PRAGMA _Pragma
DO_PRAGMA ("GCC dependency \"blahblabh\"")
diff --git a/clang/test/Preprocessor/assembler-with-cpp.c b/clang/test/Preprocessor/assembler-with-cpp.c
index ecb77e5f964..7a2830b3240 100644
--- a/clang/test/Preprocessor/assembler-with-cpp.c
+++ b/clang/test/Preprocessor/assembler-with-cpp.c
@@ -1,4 +1,4 @@
-// RUN: clang -x assembler-with-cpp -E %s > %t &&
+// RUN: clang-cc -x assembler-with-cpp -E %s > %t &&
#ifndef __ASSEMBLER__
#error "__ASSEMBLER__ not defined"
diff --git a/clang/test/Preprocessor/builtin_line.c b/clang/test/Preprocessor/builtin_line.c
index 7698d5f43c4..db01e47995a 100644
--- a/clang/test/Preprocessor/builtin_line.c
+++ b/clang/test/Preprocessor/builtin_line.c
@@ -1,10 +1,10 @@
-// RUN: clang %s -E | grep "^ 4" &&
+// RUN: clang-cc %s -E | grep "^ 4" &&
#define FOO __LINE__
FOO
// PR3579 - This should expand to the __LINE__ of the ')' not of the X.
-// RUN: clang %s -E | grep "^A 13"
+// RUN: clang-cc %s -E | grep "^A 13"
#define X() __LINE__
diff --git a/clang/test/Preprocessor/c99-6_10_3_3_p4.c b/clang/test/Preprocessor/c99-6_10_3_3_p4.c
index 13d5661e360..89660549b9a 100644
--- a/clang/test/Preprocessor/c99-6_10_3_3_p4.c
+++ b/clang/test/Preprocessor/c99-6_10_3_3_p4.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep -F 'char p[] = "x ## y";'
+// RUN: clang-cc -E %s | grep -F 'char p[] = "x ## y";'
#define hash_hash # ## #
#define mkstr(a) # a
#define in_between(a) mkstr(a)
diff --git a/clang/test/Preprocessor/c99-6_10_3_4_p5.c b/clang/test/Preprocessor/c99-6_10_3_4_p5.c
index fa5f7358b9e..22bdf8258cb 100644
--- a/clang/test/Preprocessor/c99-6_10_3_4_p5.c
+++ b/clang/test/Preprocessor/c99-6_10_3_4_p5.c
@@ -1,9 +1,9 @@
// Example from C99 6.10.3.4p5
-// RUN: clang -E %s | grep -F 'f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);' &&
-// RUN: clang -E %s | grep -F 'f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);' &&
-// RUN: clang -E %s | grep -F 'int i[] = { 1, 23, 4, 5, };' &&
-// RUN: clang -E %s | grep -F 'char c[2][6] = { "hello", "" };'
+// RUN: clang-cc -E %s | grep -F 'f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);' &&
+// RUN: clang-cc -E %s | grep -F 'f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);' &&
+// RUN: clang-cc -E %s | grep -F 'int i[] = { 1, 23, 4, 5, };' &&
+// RUN: clang-cc -E %s | grep -F 'char c[2][6] = { "hello", "" };'
#define x 3
diff --git a/clang/test/Preprocessor/c99-6_10_3_4_p6.c b/clang/test/Preprocessor/c99-6_10_3_4_p6.c
index ce7990a4cf3..c48d2efd2ef 100644
--- a/clang/test/Preprocessor/c99-6_10_3_4_p6.c
+++ b/clang/test/Preprocessor/c99-6_10_3_4_p6.c
@@ -1,10 +1,10 @@
// Example from C99 6.10.3.4p6
-// RUN: clang -E %s | grep -F 'printf("x" "1" "= %d, x" "2" "= s" x1, x2);' &&
-// RUN: clang -E %s | grep 'fputs("strncmp(\\"abc\\\\0d\\" \\"abc\\", .\\\\4.) == 0" ": @\\n", s);' &&
-// RUN: clang -E %s | grep -F 'include "vers2.h"' &&
-// RUN: clang -E %s | grep -F '"hello";' &&
-// RUN: clang -E %s | grep -F '"hello" ", world"'
+// RUN: clang-cc -E %s | grep -F 'printf("x" "1" "= %d, x" "2" "= s" x1, x2);' &&
+// RUN: clang-cc -E %s | grep 'fputs("strncmp(\\"abc\\\\0d\\" \\"abc\\", .\\\\4.) == 0" ": @\\n", s);' &&
+// RUN: clang-cc -E %s | grep -F 'include "vers2.h"' &&
+// RUN: clang-cc -E %s | grep -F '"hello";' &&
+// RUN: clang-cc -E %s | grep -F '"hello" ", world"'
#define str(s) # s
#define xstr(s) str(s)
diff --git a/clang/test/Preprocessor/c99-6_10_3_4_p7.c b/clang/test/Preprocessor/c99-6_10_3_4_p7.c
index 88957dfb675..a53df8263f1 100644
--- a/clang/test/Preprocessor/c99-6_10_3_4_p7.c
+++ b/clang/test/Preprocessor/c99-6_10_3_4_p7.c
@@ -1,7 +1,7 @@
// Example from C99 6.10.3.4p7
-// RUN: clang -E %s | grep -F 'int j[] = { 123, 45, 67, 89,' &&
-// RUN: clang -E %s | grep -F '10, 11, 12, };'
+// RUN: clang-cc -E %s | grep -F 'int j[] = { 123, 45, 67, 89,' &&
+// RUN: clang-cc -E %s | grep -F '10, 11, 12, };'
#define t(x,y,z) x ## y ## z
int j[] = { t(1,2,3), t(,4,5), t(6,,7), t(8,9,),
diff --git a/clang/test/Preprocessor/c99-6_10_3_4_p9.c b/clang/test/Preprocessor/c99-6_10_3_4_p9.c
index 08b4637e0e3..39c34546ad4 100644
--- a/clang/test/Preprocessor/c99-6_10_3_4_p9.c
+++ b/clang/test/Preprocessor/c99-6_10_3_4_p9.c
@@ -1,9 +1,9 @@
// Example from C99 6.10.3.4p9
-// RUN: clang -E %s | grep -F 'fprintf(stderr, "Flag");' &&
-// RUN: clang -E %s | grep -F 'fprintf(stderr, "X = %d\n", x);' &&
-// RUN: clang -E %s | grep -F 'puts("The first, second, and third items.");' &&
-// RUN: clang -E %s | grep -F '((x>y)?puts("x>y"): printf("x is %d but y is %d", x, y));'
+// RUN: clang-cc -E %s | grep -F 'fprintf(stderr, "Flag");' &&
+// RUN: clang-cc -E %s | grep -F 'fprintf(stderr, "X = %d\n", x);' &&
+// RUN: clang-cc -E %s | grep -F 'puts("The first, second, and third items.");' &&
+// RUN: clang-cc -E %s | grep -F '((x>y)?puts("x>y"): printf("x is %d but y is %d", x, y));'
#define debug(...) fprintf(stderr, __VA_ARGS__)
#define showlist(...) puts(#__VA_ARGS__)
diff --git a/clang/test/Preprocessor/clang_headers.c b/clang/test/Preprocessor/clang_headers.c
index 4fa6153459f..1cb331998f4 100644
--- a/clang/test/Preprocessor/clang_headers.c
+++ b/clang/test/Preprocessor/clang_headers.c
@@ -1,3 +1,3 @@
-// RUN: clang -E %s
+// RUN: clang-cc -E %s
#include <limits.h>
diff --git a/clang/test/Preprocessor/comment_save.c b/clang/test/Preprocessor/comment_save.c
index 1a3bd96efb5..30b043433c9 100644
--- a/clang/test/Preprocessor/comment_save.c
+++ b/clang/test/Preprocessor/comment_save.c
@@ -1,5 +1,5 @@
-// RUN: clang -E -C %s | grep '^// foo$' &&
-// RUN: clang -E -C %s | grep -F '^/* bar */$'
+// RUN: clang-cc -E -C %s | grep '^// foo$' &&
+// RUN: clang-cc -E -C %s | grep -F '^/* bar */$'
// foo
/* bar */
diff --git a/clang/test/Preprocessor/comment_save_if.c b/clang/test/Preprocessor/comment_save_if.c
index ce7b4c45b10..c08b2d7c78b 100644
--- a/clang/test/Preprocessor/comment_save_if.c
+++ b/clang/test/Preprocessor/comment_save_if.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E -CC -pedantic 2>&1 | grep -v '^/' | not grep warning
+// RUN: clang-cc %s -E -CC -pedantic 2>&1 | grep -v '^/' | not grep warning
#if 1 /*bar */
diff --git a/clang/test/Preprocessor/comment_save_macro.c b/clang/test/Preprocessor/comment_save_macro.c
index 635a6fd4064..66b59d136d7 100644
--- a/clang/test/Preprocessor/comment_save_macro.c
+++ b/clang/test/Preprocessor/comment_save_macro.c
@@ -1,6 +1,6 @@
-// RUN: clang -E -C %s | grep '^boo bork bar // zot$' &&
-// RUN: clang -E -CC %s | grep -F '^boo bork /* blah*/ bar // zot$' &&
-// RUN: clang -E %s | grep '^boo bork bar$'
+// RUN: clang-cc -E -C %s | grep '^boo bork bar // zot$' &&
+// RUN: clang-cc -E -CC %s | grep -F '^boo bork /* blah*/ bar // zot$' &&
+// RUN: clang-cc -E %s | grep '^boo bork bar$'
#define FOO bork // blah
diff --git a/clang/test/Preprocessor/cxx_and.cpp b/clang/test/Preprocessor/cxx_and.cpp
index b6bd00e5293..971b7bc991d 100644
--- a/clang/test/Preprocessor/cxx_and.cpp
+++ b/clang/test/Preprocessor/cxx_and.cpp
@@ -1,7 +1,7 @@
-// RUN: clang -DA -DB -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DB -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA -DB -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -DB -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
#if defined(A) and defined(B)
#define X 37
#else
diff --git a/clang/test/Preprocessor/cxx_bitand.cpp b/clang/test/Preprocessor/cxx_bitand.cpp
index ecc52e89ab5..8d7fe678e3e 100644
--- a/clang/test/Preprocessor/cxx_bitand.cpp
+++ b/clang/test/Preprocessor/cxx_bitand.cpp
@@ -1,6 +1,6 @@
-// RUN: clang -DA=1 -DB=2 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA=1 -DB=2 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
#if A bitand B
#define X 37
#else
diff --git a/clang/test/Preprocessor/cxx_bitor.cpp b/clang/test/Preprocessor/cxx_bitor.cpp
index 36c44523df3..7645c7ee513 100644
--- a/clang/test/Preprocessor/cxx_bitor.cpp
+++ b/clang/test/Preprocessor/cxx_bitor.cpp
@@ -1,8 +1,8 @@
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
#if A bitor B
#define X 37
#else
diff --git a/clang/test/Preprocessor/cxx_compl.cpp b/clang/test/Preprocessor/cxx_compl.cpp
index 12e589ffa1e..f1cc6d2800d 100644
--- a/clang/test/Preprocessor/cxx_compl.cpp
+++ b/clang/test/Preprocessor/cxx_compl.cpp
@@ -1,6 +1,6 @@
-// RUN: clang -DA=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA=1 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=0 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
#if compl 0 bitand A
#define X 37
#else
diff --git a/clang/test/Preprocessor/cxx_not.cpp b/clang/test/Preprocessor/cxx_not.cpp
index 2587b0ab994..dd3190117d9 100644
--- a/clang/test/Preprocessor/cxx_not.cpp
+++ b/clang/test/Preprocessor/cxx_not.cpp
@@ -1,5 +1,5 @@
-// RUN: clang -DA=1 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 37 == 37'
+// RUN: clang-cc -DA=1 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 37 == 37'
#if not defined(A)
#define X 37
#else
diff --git a/clang/test/Preprocessor/cxx_not_eq.cpp b/clang/test/Preprocessor/cxx_not_eq.cpp
index b0be7b39173..4940f3b0a7b 100644
--- a/clang/test/Preprocessor/cxx_not_eq.cpp
+++ b/clang/test/Preprocessor/cxx_not_eq.cpp
@@ -1,6 +1,6 @@
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DA=1 -DB=2 -E %s | grep 'int a = 37 == 37'
+// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -DA=1 -DB=2 -E %s | grep 'int a = 37 == 37'
#if A not_eq B
#define X 37
#else
diff --git a/clang/test/Preprocessor/cxx_oper_keyword.cpp b/clang/test/Preprocessor/cxx_oper_keyword.cpp
index 66586e7b36c..faae68741ee 100644
--- a/clang/test/Preprocessor/cxx_oper_keyword.cpp
+++ b/clang/test/Preprocessor/cxx_oper_keyword.cpp
@@ -1,5 +1,5 @@
-// RUN: not clang %s -E &&
-// RUN: clang %s -E -fno-operator-names
+// RUN: not clang-cc %s -E &&
+// RUN: clang-cc %s -E -fno-operator-names
// Not valid in C++ unless -fno-operator-names is passed.
#define and foo
diff --git a/clang/test/Preprocessor/cxx_oper_spelling.cpp b/clang/test/Preprocessor/cxx_oper_spelling.cpp
index fc8bc70e519..85f0426ca3a 100644
--- a/clang/test/Preprocessor/cxx_oper_spelling.cpp
+++ b/clang/test/Preprocessor/cxx_oper_spelling.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep 'a: "and"'
+// RUN: clang-cc -E %s | grep 'a: "and"'
#define X(A) #A
diff --git a/clang/test/Preprocessor/cxx_or.cpp b/clang/test/Preprocessor/cxx_or.cpp
index ce3fed1cd48..133f28516b4 100644
--- a/clang/test/Preprocessor/cxx_or.cpp
+++ b/clang/test/Preprocessor/cxx_or.cpp
@@ -1,7 +1,7 @@
-// RUN: clang -DA -DB -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DB -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA -DB -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DB -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
#if defined(A) or defined(B)
#define X 37
#else
diff --git a/clang/test/Preprocessor/cxx_true.cpp b/clang/test/Preprocessor/cxx_true.cpp
index 5ebdaf8d2fe..e35c54d7b3f 100644
--- a/clang/test/Preprocessor/cxx_true.cpp
+++ b/clang/test/Preprocessor/cxx_true.cpp
@@ -1,6 +1,6 @@
-/* RUN: clang -E %s -x=c++ | grep block_1 &&
- RUN: clang -E %s -x=c++ | not grep block_2 &&
- RUN: clang -E %s -x=c | not grep block
+/* RUN: clang-cc -E %s -x=c++ | grep block_1 &&
+ RUN: clang-cc -E %s -x=c++ | not grep block_2 &&
+ RUN: clang-cc -E %s -x=c | not grep block
*/
#if true
diff --git a/clang/test/Preprocessor/cxx_xor.cpp b/clang/test/Preprocessor/cxx_xor.cpp
index 7a4c8822cda..a38c3c5454b 100644
--- a/clang/test/Preprocessor/cxx_xor.cpp
+++ b/clang/test/Preprocessor/cxx_xor.cpp
@@ -1,8 +1,8 @@
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37' &&
+// RUN: clang-cc -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
#if A xor B
#define X 37
#else
diff --git a/clang/test/Preprocessor/disabled-cond-diags.c b/clang/test/Preprocessor/disabled-cond-diags.c
index df9dc8919b1..eb7632f29b3 100644
--- a/clang/test/Preprocessor/disabled-cond-diags.c
+++ b/clang/test/Preprocessor/disabled-cond-diags.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s 2>&1 | not grep "warning\|error"
+// RUN: clang-cc -E %s 2>&1 | not grep "warning\|error"
#if 0
diff --git a/clang/test/Preprocessor/dump_macros.c b/clang/test/Preprocessor/dump_macros.c
index 348257fb519..d3e06b2bfac 100644
--- a/clang/test/Preprocessor/dump_macros.c
+++ b/clang/test/Preprocessor/dump_macros.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -dM %s -o %t &&
+// RUN: clang-cc -E -dM %s -o %t &&
// Space even without expansion tokens
// RUN: grep "#define A(x) " %t &&
diff --git a/clang/test/Preprocessor/dumptokens_phyloc.c b/clang/test/Preprocessor/dumptokens_phyloc.c
index ae7ccc7d210..c0e78c9b155 100644
--- a/clang/test/Preprocessor/dumptokens_phyloc.c
+++ b/clang/test/Preprocessor/dumptokens_phyloc.c
@@ -1,4 +1,4 @@
-// RUN: clang -dump-tokens %s 2>&1 | grep "Spelling=.*dumptokens_phyloc.c:3:20"
+// RUN: clang-cc -dump-tokens %s 2>&1 | grep "Spelling=.*dumptokens_phyloc.c:3:20"
#define TESTPHYLOC 10
diff --git a/clang/test/Preprocessor/expr_comma.c b/clang/test/Preprocessor/expr_comma.c
index e36f0407bf8..0a24baca46c 100644
--- a/clang/test/Preprocessor/expr_comma.c
+++ b/clang/test/Preprocessor/expr_comma.c
@@ -1,8 +1,8 @@
// Comma is not allowed in C89
-// RUN: not clang -E %s -std=c89 -pedantic-errors &&
+// RUN: not clang-cc -E %s -std=c89 -pedantic-errors &&
// Comma is allowed if unevaluated in C99
-// RUN: clang -E %s -std=c99 -pedantic-errors
+// RUN: clang-cc -E %s -std=c99 -pedantic-errors
// PR2279
diff --git a/clang/test/Preprocessor/expr_invalid_tok.c b/clang/test/Preprocessor/expr_invalid_tok.c
index 877a845eff6..5e750a462be 100644
--- a/clang/test/Preprocessor/expr_invalid_tok.c
+++ b/clang/test/Preprocessor/expr_invalid_tok.c
@@ -1,6 +1,6 @@
-// RUN: not clang -E %s 2>&1 | grep 'invalid token at start of a preprocessor expression' &&
-// RUN: not clang -E %s 2>&1 | grep 'token is not a valid binary operator in a preprocessor subexpression' &&
-// RUN: not clang -E %s 2>&1 | grep ':14: error: expected end of line in preprocessor expression'
+// RUN: not clang-cc -E %s 2>&1 | grep 'invalid token at start of a preprocessor expression' &&
+// RUN: not clang-cc -E %s 2>&1 | grep 'token is not a valid binary operator in a preprocessor subexpression' &&
+// RUN: not clang-cc -E %s 2>&1 | grep ':14: error: expected end of line in preprocessor expression'
// PR2220
#if 1 * * 2
diff --git a/clang/test/Preprocessor/expr_liveness.c b/clang/test/Preprocessor/expr_liveness.c
index d9e5d7cb25f..3d1e25edd4e 100644
--- a/clang/test/Preprocessor/expr_liveness.c
+++ b/clang/test/Preprocessor/expr_liveness.c
@@ -1,5 +1,5 @@
-/* RUN: clang -E %s -DNO_ERRORS -Werror -Wundef &&
- RUN: not clang -E %s
+/* RUN: clang-cc -E %s -DNO_ERRORS -Werror -Wundef &&
+ RUN: not clang-cc -E %s
*/
#ifdef NO_ERRORS
diff --git a/clang/test/Preprocessor/expr_usual_conversions.c b/clang/test/Preprocessor/expr_usual_conversions.c
index 90275c99444..47aca7beca6 100644
--- a/clang/test/Preprocessor/expr_usual_conversions.c
+++ b/clang/test/Preprocessor/expr_usual_conversions.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep warning | wc -l | grep 2
+// RUN: clang-cc %s -E 2>&1 | grep warning | wc -l | grep 2
#define INTMAX_MIN (-9223372036854775807LL -1)
diff --git a/clang/test/Preprocessor/extension-warning.c b/clang/test/Preprocessor/extension-warning.c
index c325c2fcf23..00c9b8735f3 100644
--- a/clang/test/Preprocessor/extension-warning.c
+++ b/clang/test/Preprocessor/extension-warning.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
// The preprocessor shouldn't warn about extensions within macro bodies that
// aren't expanded.
diff --git a/clang/test/Preprocessor/function_macro_file.c b/clang/test/Preprocessor/function_macro_file.c
index eeb9256ec73..6a266dd0790 100644
--- a/clang/test/Preprocessor/function_macro_file.c
+++ b/clang/test/Preprocessor/function_macro_file.c
@@ -1,4 +1,4 @@
-/* RUN: clang -E -P %s | grep f
+/* RUN: clang-cc -E -P %s | grep f
*/
#include "function_macro_file.h"
diff --git a/clang/test/Preprocessor/hash_line.c b/clang/test/Preprocessor/hash_line.c
index 788440ba82a..7ed65d1b424 100644
--- a/clang/test/Preprocessor/hash_line.c
+++ b/clang/test/Preprocessor/hash_line.c
@@ -1,7 +1,7 @@
// The 1 and # should not go on the same line.
-// RUN: clang %s -E | not grep "1 #" &&
-// RUN: clang %s -E | grep '^1$' &&
-// RUN: clang %s -E | grep '^ #$'
+// RUN: clang-cc %s -E | not grep "1 #" &&
+// RUN: clang-cc %s -E | grep '^1$' &&
+// RUN: clang-cc %s -E | grep '^ #$'
1
#define EMPTY
EMPTY #
diff --git a/clang/test/Preprocessor/hash_space.c b/clang/test/Preprocessor/hash_space.c
index 77f5cfc5306..e7dbd3bc617 100644
--- a/clang/test/Preprocessor/hash_space.c
+++ b/clang/test/Preprocessor/hash_space.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep " #"
+// RUN: clang-cc %s -E | grep " #"
// Should put a space before the # so that -fpreprocessed mode doesn't
// macro expand this again.
diff --git a/clang/test/Preprocessor/header_lookup1.c b/clang/test/Preprocessor/header_lookup1.c
index 10049adcd37..df58a6ea9c5 100644
--- a/clang/test/Preprocessor/header_lookup1.c
+++ b/clang/test/Preprocessor/header_lookup1.c
@@ -1,2 +1,2 @@
-// RUN: clang -I /usr/include %s -E | grep 'stdio.h.*3.*4'
+// RUN: clang-cc -I /usr/include %s -E | grep 'stdio.h.*3.*4'
#include <stdio.h>
diff --git a/clang/test/Preprocessor/if_warning.c b/clang/test/Preprocessor/if_warning.c
index bf30d303b66..f07c88707e7 100644
--- a/clang/test/Preprocessor/if_warning.c
+++ b/clang/test/Preprocessor/if_warning.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E -Wundef -Werror 2>&1 | grep error | count 1 &&
-// RUN: clang %s -E -Werror 2>&1 | not grep error
+// RUN: clang-cc %s -E -Wundef -Werror 2>&1 | grep error | count 1 &&
+// RUN: clang-cc %s -E -Werror 2>&1 | not grep error
#if foo // Should generate an warning
#endif
diff --git a/clang/test/Preprocessor/ifdef-recover.c b/clang/test/Preprocessor/ifdef-recover.c
index 7fad8c20bd4..3fffcc0290d 100644
--- a/clang/test/Preprocessor/ifdef-recover.c
+++ b/clang/test/Preprocessor/ifdef-recover.c
@@ -1,4 +1,4 @@
-/* RUN: clang -E %s 2>&1 >/dev/null | grep error: | count 3
+/* RUN: clang-cc -E %s 2>&1 >/dev/null | grep error: | count 3
*/
#ifdef
diff --git a/clang/test/Preprocessor/import_self.c b/clang/test/Preprocessor/import_self.c
index e8f6fa793d1..2cabe3d71ca 100644
--- a/clang/test/Preprocessor/import_self.c
+++ b/clang/test/Preprocessor/import_self.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -I. %s | grep BODY_OF_FILE | wc -l | grep 1
+// RUN: clang-cc -E -I. %s | grep BODY_OF_FILE | wc -l | grep 1
// This #import should have no effect, as we're importing the current file.
#import <import_self.c>
diff --git a/clang/test/Preprocessor/include-directive1.c b/clang/test/Preprocessor/include-directive1.c
index 3e449c52689..66f70fb3a9e 100644
--- a/clang/test/Preprocessor/include-directive1.c
+++ b/clang/test/Preprocessor/include-directive1.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 3
+// RUN: clang-cc -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 3
// XX expands to nothing.
#define XX
diff --git a/clang/test/Preprocessor/include-directive2.c b/clang/test/Preprocessor/include-directive2.c
index 8309b4508aa..785b77cbdd8 100644
--- a/clang/test/Preprocessor/include-directive2.c
+++ b/clang/test/Preprocessor/include-directive2.c
@@ -1,4 +1,4 @@
-// RUN: clang -Eonly %s
+// RUN: clang-cc -Eonly %s
# define HEADER <float.h>
# include HEADER
diff --git a/clang/test/Preprocessor/include-directive3.c b/clang/test/Preprocessor/include-directive3.c
index 9e22d5d4920..2541301b932 100644
--- a/clang/test/Preprocessor/include-directive3.c
+++ b/clang/test/Preprocessor/include-directive3.c
@@ -1,3 +1,3 @@
-// RUN: clang -include file_to_include.h -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 1
+// RUN: clang-cc -include file_to_include.h -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 1
// PR3464
diff --git a/clang/test/Preprocessor/include-pth.c b/clang/test/Preprocessor/include-pth.c
index 64b46eb15ec..2bdc7dc8746 100644
--- a/clang/test/Preprocessor/include-pth.c
+++ b/clang/test/Preprocessor/include-pth.c
@@ -1,2 +1,3 @@
-// RUN: clang -x c-header %s -o %t && clang -include-pth %t %s -E | grep 'file_to_include' | count 2
+// RUN: clang-cc -x c-header %s -o %t &&
+// RUN: clang-cc -include-pth %t %s -E | grep 'file_to_include' | count 2
#include "file_to_include.h"
diff --git a/clang/test/Preprocessor/indent_macro.c b/clang/test/Preprocessor/indent_macro.c
index 0dcaa7b4b9a..f6b411e93ff 100644
--- a/clang/test/Preprocessor/indent_macro.c
+++ b/clang/test/Preprocessor/indent_macro.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^ zzap$'
+// RUN: clang-cc -E %s | grep '^ zzap$'
// zzap is on a new line, should be indented.
#define BLAH zzap
diff --git a/clang/test/Preprocessor/line-directive.c b/clang/test/Preprocessor/line-directive.c
index a1590fa3333..07cfa65e946 100644
--- a/clang/test/Preprocessor/line-directive.c
+++ b/clang/test/Preprocessor/line-directive.c
@@ -1,6 +1,6 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s &&
-// RUN: clang -E %s 2>&1 | grep 'blonk.c:92:2: error: #error ABC' &&
-// RUN: clang -E %s 2>&1 | grep 'blonk.c:93:2: error: #error DEF'
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s &&
+// RUN: clang-cc -E %s 2>&1 | grep 'blonk.c:92:2: error: #error ABC' &&
+// RUN: clang-cc -E %s 2>&1 | grep 'blonk.c:93:2: error: #error DEF'
#line 'a' // expected-error {{#line directive requires a positive integer argument}}
#line 0 // expected-error {{#line directive requires a positive integer argument}}
diff --git a/clang/test/Preprocessor/macro_arg_keyword.c b/clang/test/Preprocessor/macro_arg_keyword.c
index 1f9d7e790f4..92b1ae53571 100644
--- a/clang/test/Preprocessor/macro_arg_keyword.c
+++ b/clang/test/Preprocessor/macro_arg_keyword.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep xxx-xxx
+// RUN: clang-cc -E %s | grep xxx-xxx
#define foo(return) return-return
diff --git a/clang/test/Preprocessor/macro_disable.c b/clang/test/Preprocessor/macro_disable.c
index 33b856d8f64..ff861d26219 100644
--- a/clang/test/Preprocessor/macro_disable.c
+++ b/clang/test/Preprocessor/macro_disable.c
@@ -1,5 +1,5 @@
-// RUN: clang -E %s | grep 'a: 2 + M_0(3)(4)(5);' &&
-// RUN: clang -E %s | grep 'b: 4 + 4 + 3 + 2 + 1 + M_0(3)(2)(1);'
+// RUN: clang-cc -E %s | grep 'a: 2 + M_0(3)(4)(5);' &&
+// RUN: clang-cc -E %s | grep 'b: 4 + 4 + 3 + 2 + 1 + M_0(3)(2)(1);'
#define M_0(x) M_ ## x
#define M_1(x) x + M_0(0)
diff --git a/clang/test/Preprocessor/macro_disable2.c b/clang/test/Preprocessor/macro_disable2.c
index 6e1f80469c3..286539e96f4 100644
--- a/clang/test/Preprocessor/macro_disable2.c
+++ b/clang/test/Preprocessor/macro_disable2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep 'A B C A B A C A B C A'
+// RUN: clang-cc -E %s | grep 'A B C A B A C A B C A'
#define A A B C
#define B B C A
diff --git a/clang/test/Preprocessor/macro_disable3.c b/clang/test/Preprocessor/macro_disable3.c
index b358a556775..011de3beed3 100644
--- a/clang/test/Preprocessor/macro_disable3.c
+++ b/clang/test/Preprocessor/macro_disable3.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep -F 'f(2 * (f(2 * (z[0]))));'
+// RUN: clang-cc %s -E | grep -F 'f(2 * (f(2 * (z[0]))));'
// Check for C99 6.10.3.4p2.
#define f(a) f(x * (a))
diff --git a/clang/test/Preprocessor/macro_disable4.c b/clang/test/Preprocessor/macro_disable4.c
index 4858813a0ec..b652b988d02 100644
--- a/clang/test/Preprocessor/macro_disable4.c
+++ b/clang/test/Preprocessor/macro_disable4.c
@@ -1,4 +1,4 @@
-// RUN: clang -P -E %s | grep 'int f(void)'
+// RUN: clang-cc -P -E %s | grep 'int f(void)'
// PR1820
#define f(x) h(x
diff --git a/clang/test/Preprocessor/macro_expand.c b/clang/test/Preprocessor/macro_expand.c
index 69a4835c5a6..a7a80aff427 100644
--- a/clang/test/Preprocessor/macro_expand.c
+++ b/clang/test/Preprocessor/macro_expand.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^Y$'
+// RUN: clang-cc -E %s | grep '^Y$'
#define X() Y
#define Y() X
diff --git a/clang/test/Preprocessor/macro_expandloc.c b/clang/test/Preprocessor/macro_expandloc.c
index 00bba6f60d7..ce1efd20a27 100644
--- a/clang/test/Preprocessor/macro_expandloc.c
+++ b/clang/test/Preprocessor/macro_expandloc.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep '#include'
+// RUN: clang-cc %s -E 2>&1 | grep '#include'
#define FOO 1
// The error message should be on the #include line, not the 1.
diff --git a/clang/test/Preprocessor/macro_expandloc2.c b/clang/test/Preprocessor/macro_expandloc2.c
index 3a833299fdf..9adf3fd911f 100644
--- a/clang/test/Preprocessor/macro_expandloc2.c
+++ b/clang/test/Preprocessor/macro_expandloc2.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep '#include'
+// RUN: clang-cc %s -E 2>&1 | grep '#include'
#define FOO BAR
// The error message should be on the #include line, not the 1.
diff --git a/clang/test/Preprocessor/macro_fn_comma_swallow.c b/clang/test/Preprocessor/macro_fn_comma_swallow.c
index d4f3bb9940d..4e06f89a160 100644
--- a/clang/test/Preprocessor/macro_fn_comma_swallow.c
+++ b/clang/test/Preprocessor/macro_fn_comma_swallow.c
@@ -1,7 +1,7 @@
// Test the GNU comma swallowing extension.
-// RUN: clang %s -E | grep 'foo{A, }' &&
-// RUN: clang %s -E | grep 'fo2{A,}' &&
-// RUN: clang %s -E | grep '{foo}'
+// RUN: clang-cc %s -E | grep 'foo{A, }' &&
+// RUN: clang-cc %s -E | grep 'fo2{A,}' &&
+// RUN: clang-cc %s -E | grep '{foo}'
#define X(Y) foo{A, Y}
X()
diff --git a/clang/test/Preprocessor/macro_fn_disable_expand.c b/clang/test/Preprocessor/macro_fn_disable_expand.c
index a9e1d46f06a..d99c01832ea 100644
--- a/clang/test/Preprocessor/macro_fn_disable_expand.c
+++ b/clang/test/Preprocessor/macro_fn_disable_expand.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep 'bar foo (2)' &&
-// RUN: clang %s -E | grep 'm(ABCD)'
+// RUN: clang-cc %s -E | grep 'bar foo (2)' &&
+// RUN: clang-cc %s -E | grep 'm(ABCD)'
#define foo(x) bar x
foo(foo) (2)
diff --git a/clang/test/Preprocessor/macro_fn_lparen_scan.c b/clang/test/Preprocessor/macro_fn_lparen_scan.c
index 497ef230d26..1056fd82341 100644
--- a/clang/test/Preprocessor/macro_fn_lparen_scan.c
+++ b/clang/test/Preprocessor/macro_fn_lparen_scan.c
@@ -1,7 +1,7 @@
-// RUN: clang -E %s | grep 'noexp: foo y' &&
-// RUN: clang -E %s | grep 'expand: abc' &&
-// RUN: clang -E %s | grep 'noexp2: foo nonexp' &&
-// RUN: clang -E %s | grep 'expand2: abc'
+// RUN: clang-cc -E %s | grep 'noexp: foo y' &&
+// RUN: clang-cc -E %s | grep 'expand: abc' &&
+// RUN: clang-cc -E %s | grep 'noexp2: foo nonexp' &&
+// RUN: clang-cc -E %s | grep 'expand2: abc'
#define A foo
#define foo() abc
diff --git a/clang/test/Preprocessor/macro_fn_lparen_scan2.c b/clang/test/Preprocessor/macro_fn_lparen_scan2.c
index fa4d5047fb0..fb64befaf1e 100644
--- a/clang/test/Preprocessor/macro_fn_lparen_scan2.c
+++ b/clang/test/Preprocessor/macro_fn_lparen_scan2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep 'FUNC (3 +1);'
+// RUN: clang-cc -E %s | grep 'FUNC (3 +1);'
#define F(a) a
#define FUNC(a) (a+1)
diff --git a/clang/test/Preprocessor/macro_fn_placemarker.c b/clang/test/Preprocessor/macro_fn_placemarker.c
index 30c0bcf47fa..ff688ce2d7a 100644
--- a/clang/test/Preprocessor/macro_fn_placemarker.c
+++ b/clang/test/Preprocessor/macro_fn_placemarker.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep 'foo(A, )'
+// RUN: clang-cc %s -E | grep 'foo(A, )'
#define X(Y) foo(A, Y)
X()
diff --git a/clang/test/Preprocessor/macro_fn_preexpand.c b/clang/test/Preprocessor/macro_fn_preexpand.c
index 81a7c417268..a392263aef4 100644
--- a/clang/test/Preprocessor/macro_fn_preexpand.c
+++ b/clang/test/Preprocessor/macro_fn_preexpand.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep 'pre: 1 1 X' &&
-// RUN: clang %s -E | grep 'nopre: 1A(X)'
+// RUN: clang-cc %s -E | grep 'pre: 1 1 X' &&
+// RUN: clang-cc %s -E | grep 'nopre: 1A(X)'
/* Preexpansion of argument. */
#define A(X) 1 X
diff --git a/clang/test/Preprocessor/macro_fn_varargs_iso.c b/clang/test/Preprocessor/macro_fn_varargs_iso.c
index 716e920336e..78ad212405c 100644
--- a/clang/test/Preprocessor/macro_fn_varargs_iso.c
+++ b/clang/test/Preprocessor/macro_fn_varargs_iso.c
@@ -1,7 +1,7 @@
-// RUN: clang -E %s | grep 'foo{a, b, c, d, e}' &&
-// RUN: clang -E %s | grep 'foo2{d, C, B}' &&
-// RUN: clang -E %s | grep 'foo2{d,e, C, B}'
+// RUN: clang-cc -E %s | grep 'foo{a, b, c, d, e}' &&
+// RUN: clang-cc -E %s | grep 'foo2{d, C, B}' &&
+// RUN: clang-cc -E %s | grep 'foo2{d,e, C, B}'
#define va1(...) foo{a, __VA_ARGS__, e}
va1(b, c, d)
diff --git a/clang/test/Preprocessor/macro_fn_varargs_named.c b/clang/test/Preprocessor/macro_fn_varargs_named.c
index b3bb72c6431..c2841b1574b 100644
--- a/clang/test/Preprocessor/macro_fn_varargs_named.c
+++ b/clang/test/Preprocessor/macro_fn_varargs_named.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep '^a: x$' &&
-// RUN: clang -E %s | grep '^b: x y, z,h$' &&
-// RUN: clang -E %s | grep '^c: foo(x)$'
+// RUN: clang-cc -E %s | grep '^a: x$' &&
+// RUN: clang-cc -E %s | grep '^b: x y, z,h$' &&
+// RUN: clang-cc -E %s | grep '^c: foo(x)$'
#define A(b, c...) b c
a: A(x)
diff --git a/clang/test/Preprocessor/macro_misc.c b/clang/test/Preprocessor/macro_misc.c
index 147e827df36..169c5ec772a 100644
--- a/clang/test/Preprocessor/macro_misc.c
+++ b/clang/test/Preprocessor/macro_misc.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -Eonly -verify
+// RUN: clang-cc %s -Eonly -verify
// This should not be rejected.
#ifdef defined
diff --git a/clang/test/Preprocessor/macro_not_define.c b/clang/test/Preprocessor/macro_not_define.c
index 388481a90e8..a42240bab60 100644
--- a/clang/test/Preprocessor/macro_not_define.c
+++ b/clang/test/Preprocessor/macro_not_define.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^ # define X 3$'
+// RUN: clang-cc -E %s | grep '^ # define X 3$'
#define H #
#define D define
diff --git a/clang/test/Preprocessor/macro_paste_bad.c b/clang/test/Preprocessor/macro_paste_bad.c
index 60caa427438..1ccfdec368c 100644
--- a/clang/test/Preprocessor/macro_paste_bad.c
+++ b/clang/test/Preprocessor/macro_paste_bad.c
@@ -1,4 +1,4 @@
-// RUN: clang -Eonly %s 2>&1 | grep error
+// RUN: clang-cc -Eonly %s 2>&1 | grep error
// pasting ""x"" and ""+"" does not give a valid preprocessing token
#define XYZ x ## +
XYZ
diff --git a/clang/test/Preprocessor/macro_paste_bcpl_comment.c b/clang/test/Preprocessor/macro_paste_bcpl_comment.c
index 9a864d520cc..8bbee5dc2dd 100644
--- a/clang/test/Preprocessor/macro_paste_bcpl_comment.c
+++ b/clang/test/Preprocessor/macro_paste_bcpl_comment.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -Eonly 2>&1 | grep error
+// RUN: clang-cc %s -Eonly 2>&1 | grep error
#define COMM1 / ## /
COMM1
diff --git a/clang/test/Preprocessor/macro_paste_c_block_comment.c b/clang/test/Preprocessor/macro_paste_c_block_comment.c
index 9299514c51e..86f812421d8 100644
--- a/clang/test/Preprocessor/macro_paste_c_block_comment.c
+++ b/clang/test/Preprocessor/macro_paste_c_block_comment.c
@@ -1,6 +1,6 @@
-// RUN: clang %s -Eonly 2>&1 | grep error &&
-// RUN: clang %s -Eonly 2>&1 | not grep unterminated &&
-// RUN: clang %s -Eonly 2>&1 | not grep scratch
+// RUN: clang-cc %s -Eonly 2>&1 | grep error &&
+// RUN: clang-cc %s -Eonly 2>&1 | not grep unterminated &&
+// RUN: clang-cc %s -Eonly 2>&1 | not grep scratch
#define COMM / ## *
COMM
diff --git a/clang/test/Preprocessor/macro_paste_commaext.c b/clang/test/Preprocessor/macro_paste_commaext.c
index e75ac1f5740..e98849b15af 100644
--- a/clang/test/Preprocessor/macro_paste_commaext.c
+++ b/clang/test/Preprocessor/macro_paste_commaext.c
@@ -1,8 +1,8 @@
-// RUN: clang %s -E | grep 'V);' &&
-// RUN: clang %s -E | grep 'W, 1, 2);' &&
-// RUN: clang %s -E | grep 'X, 1, 2);' &&
-// RUN: clang %s -E | grep 'Y, );' &&
-// RUN: clang %s -E | grep 'Z, );'
+// RUN: clang-cc %s -E | grep 'V);' &&
+// RUN: clang-cc %s -E | grep 'W, 1, 2);' &&
+// RUN: clang-cc %s -E | grep 'X, 1, 2);' &&
+// RUN: clang-cc %s -E | grep 'Y, );' &&
+// RUN: clang-cc %s -E | grep 'Z, );'
#define debug(format, ...) format, ## __VA_ARGS__)
debug(V);
diff --git a/clang/test/Preprocessor/macro_paste_empty.c b/clang/test/Preprocessor/macro_paste_empty.c
index 8b78ecddd68..75504bc22a7 100644
--- a/clang/test/Preprocessor/macro_paste_empty.c
+++ b/clang/test/Preprocessor/macro_paste_empty.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep 'a:Y' &&
-// RUN: clang -E %s | grep 'b:Y' &&
-// RUN: clang -E %s | grep 'c:YY'
+// RUN: clang-cc -E %s | grep 'a:Y' &&
+// RUN: clang-cc -E %s | grep 'b:Y' &&
+// RUN: clang-cc -E %s | grep 'c:YY'
#define FOO(X) X ## Y
a:FOO()
diff --git a/clang/test/Preprocessor/macro_paste_hard.c b/clang/test/Preprocessor/macro_paste_hard.c
index be467456bf7..25b6c1994b5 100644
--- a/clang/test/Preprocessor/macro_paste_hard.c
+++ b/clang/test/Preprocessor/macro_paste_hard.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep '1: aaab 2' &&
-// RUN: clang -E %s | grep '2: 2 baaa' &&
-// RUN: clang -E %s | grep '3: 2 xx'
+// RUN: clang-cc -E %s | grep '1: aaab 2' &&
+// RUN: clang-cc -E %s | grep '2: 2 baaa' &&
+// RUN: clang-cc -E %s | grep '3: 2 xx'
#define a(n) aaa ## n
#define b 2
diff --git a/clang/test/Preprocessor/macro_paste_hashhash.c b/clang/test/Preprocessor/macro_paste_hashhash.c
index 4ebf55e41f3..42654fd1b18 100644
--- a/clang/test/Preprocessor/macro_paste_hashhash.c
+++ b/clang/test/Preprocessor/macro_paste_hashhash.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^"x ## y";$'
+// RUN: clang-cc -E %s | grep '^"x ## y";$'
#define hash_hash # ## #
#define mkstr(a) # a
#define in_between(a) mkstr(a)
diff --git a/clang/test/Preprocessor/macro_paste_mscomment.c b/clang/test/Preprocessor/macro_paste_mscomment.c
index 858337a879b..b0fc57101c6 100644
--- a/clang/test/Preprocessor/macro_paste_mscomment.c
+++ b/clang/test/Preprocessor/macro_paste_mscomment.c
@@ -1,4 +1,4 @@
-// RUN: clang -P -E -fms-extensions %s | sed '/^#.\+/d' | tr -d '\n' |
+// RUN: clang-cc -P -E -fms-extensions %s | sed '/^#.\+/d' | tr -d '\n' |
// RUN: grep '^int foo;int bar;int baz;$' | count 1
// This horrible stuff should preprocess into (other than whitespace):
// int foo;
diff --git a/clang/test/Preprocessor/macro_paste_none.c b/clang/test/Preprocessor/macro_paste_none.c
index 2ba2820b16c..e978fca2250 100644
--- a/clang/test/Preprocessor/macro_paste_none.c
+++ b/clang/test/Preprocessor/macro_paste_none.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '!!'
+// RUN: clang-cc -E %s | grep '!!'
#define A(B,C) B ## C
diff --git a/clang/test/Preprocessor/macro_paste_simple.c b/clang/test/Preprocessor/macro_paste_simple.c
index 82b75daf571..2affbac0dec 100644
--- a/clang/test/Preprocessor/macro_paste_simple.c
+++ b/clang/test/Preprocessor/macro_paste_simple.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep "barbaz123"
+// RUN: clang-cc %s -E | grep "barbaz123"
#define FOO bar ## baz ## 123
diff --git a/clang/test/Preprocessor/macro_paste_spacing.c b/clang/test/Preprocessor/macro_paste_spacing.c
index 471ebcc0155..130548dbf99 100644
--- a/clang/test/Preprocessor/macro_paste_spacing.c
+++ b/clang/test/Preprocessor/macro_paste_spacing.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep "^xy$"
+// RUN: clang-cc %s -E | grep "^xy$"
#define A x ## y
blah
diff --git a/clang/test/Preprocessor/macro_rescan.c b/clang/test/Preprocessor/macro_rescan.c
index 2ceb2923ca0..17b4dc2756f 100644
--- a/clang/test/Preprocessor/macro_rescan.c
+++ b/clang/test/Preprocessor/macro_rescan.c
@@ -1,5 +1,5 @@
-// RUN: clang -E %s | grep 'ei_1 = (17 +1);' &&
-// RUN: clang -E %s | grep 'ei_2 = (M1)(17);'
+// RUN: clang-cc -E %s | grep 'ei_1 = (17 +1);' &&
+// RUN: clang-cc -E %s | grep 'ei_2 = (M1)(17);'
#define M1(a) (a+1)
#define M2(b) b
diff --git a/clang/test/Preprocessor/macro_rescan2.c b/clang/test/Preprocessor/macro_rescan2.c
index 4fae444002d..6914ae0ac5f 100644
--- a/clang/test/Preprocessor/macro_rescan2.c
+++ b/clang/test/Preprocessor/macro_rescan2.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep 'a: 2\*f(9)' &&
-// RUN: clang %s -E | grep 'b: 2\*9\*g'
+// RUN: clang-cc %s -E | grep 'a: 2\*f(9)' &&
+// RUN: clang-cc %s -E | grep 'b: 2\*9\*g'
#define f(a) a*g
#define g f
diff --git a/clang/test/Preprocessor/macro_rescan_varargs.c b/clang/test/Preprocessor/macro_rescan_varargs.c
index 3c79d0e9931..ed1056ab1b3 100644
--- a/clang/test/Preprocessor/macro_rescan_varargs.c
+++ b/clang/test/Preprocessor/macro_rescan_varargs.c
@@ -1,5 +1,5 @@
-// RUN: clang -E %s | grep -F "1: F, (, 'a', 'b', );" &&
-// RUN: clang -E %s | grep -F "2: 'a' + 'b';"
+// RUN: clang-cc -E %s | grep -F "1: F, (, 'a', 'b', );" &&
+// RUN: clang-cc -E %s | grep -F "2: 'a' + 'b';"
#define LPAREN (
#define RPAREN )
#define F(x, y) x + y
diff --git a/clang/test/Preprocessor/macro_rparen_scan.c b/clang/test/Preprocessor/macro_rparen_scan.c
index d4e62837ae6..92750988384 100644
--- a/clang/test/Preprocessor/macro_rparen_scan.c
+++ b/clang/test/Preprocessor/macro_rparen_scan.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^3 ;$'
+// RUN: clang-cc -E %s | grep '^3 ;$'
/* Right paren scanning, hard case. Should expand to 3. */
#define i(x) 3
diff --git a/clang/test/Preprocessor/macro_rparen_scan2.c b/clang/test/Preprocessor/macro_rparen_scan2.c
index a9ca9d1bb45..41748ac459b 100644
--- a/clang/test/Preprocessor/macro_rparen_scan2.c
+++ b/clang/test/Preprocessor/macro_rparen_scan2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep -F 'static int glob = (1 + 1 );'
+// RUN: clang-cc -E %s | grep -F 'static int glob = (1 + 1 );'
#define R_PAREN )
diff --git a/clang/test/Preprocessor/macro_space.c b/clang/test/Preprocessor/macro_space.c
index 553fddb68f6..4fdbb0a0cee 100644
--- a/clang/test/Preprocessor/macro_space.c
+++ b/clang/test/Preprocessor/macro_space.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep '! ,'
+// RUN: clang-cc %s -E | grep '! ,'
#define XX
! XX,
diff --git a/clang/test/Preprocessor/mi_opt.c b/clang/test/Preprocessor/mi_opt.c
index 96029dc95ab..aa69e2b4aea 100644
--- a/clang/test/Preprocessor/mi_opt.c
+++ b/clang/test/Preprocessor/mi_opt.c
@@ -1,4 +1,4 @@
-// RUN: not clang -fsyntax-only %s
+// RUN: not clang-cc -fsyntax-only %s
// PR1900
// This test should get a redefinition error from m_iopt.h: the MI opt
// shouldn't apply.
diff --git a/clang/test/Preprocessor/objc-pp.m b/clang/test/Preprocessor/objc-pp.m
index 0648acddf6e..866e7e4809a 100644
--- a/clang/test/Preprocessor/objc-pp.m
+++ b/clang/test/Preprocessor/objc-pp.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
#import <stdio.h> // no warning.
diff --git a/clang/test/Preprocessor/output_paste_avoid.c b/clang/test/Preprocessor/output_paste_avoid.c
index 7fe8788a267..b23d22a7963 100644
--- a/clang/test/Preprocessor/output_paste_avoid.c
+++ b/clang/test/Preprocessor/output_paste_avoid.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep '+ + - - + + = = =' &&
-// RUN: clang -E %s | not grep -F '...' &&
-// RUN: clang -E %s | not grep -F 'L"str"'
+// RUN: clang-cc -E %s | grep '+ + - - + + = = =' &&
+// RUN: clang-cc -E %s | not grep -F '...' &&
+// RUN: clang-cc -E %s | not grep -F 'L"str"'
// This should print as ".. ." to avoid turning into ...
#define y(a) ..a
diff --git a/clang/test/Preprocessor/paste_bad.c b/clang/test/Preprocessor/paste_bad.c
index 89e879957e4..de2417fbf5c 100644
--- a/clang/test/Preprocessor/paste_bad.c
+++ b/clang/test/Preprocessor/paste_bad.c
@@ -1,6 +1,6 @@
// GCC PR 20077
-// RUN: not clang -E %s &&
-// RUN: not clang -E %s 2>&1 | grep error: | wc -l | grep 10
+// RUN: not clang-cc -E %s &&
+// RUN: not clang-cc -E %s 2>&1 | grep error: | wc -l | grep 10
#define a a ## ## /* { dg-error "end of a macro expansion" } */
#define b() b ## ## /* { dg-error "end of a macro expansion" } */
diff --git a/clang/test/Preprocessor/poison.c b/clang/test/Preprocessor/poison.c
index 5df4b47918f..9759ae473fe 100644
--- a/clang/test/Preprocessor/poison.c
+++ b/clang/test/Preprocessor/poison.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep error
+// RUN: clang-cc %s -E 2>&1 | grep error
#pragma GCC poison rindex
rindex(some_string, 'h');
diff --git a/clang/test/Preprocessor/poison_expansion.c b/clang/test/Preprocessor/poison_expansion.c
index 3444bace4d6..45676c8e6cb 100644
--- a/clang/test/Preprocessor/poison_expansion.c
+++ b/clang/test/Preprocessor/poison_expansion.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | not grep error
+// RUN: clang-cc %s -E 2>&1 | not grep error
#define strrchr rindex
#pragma GCC poison rindex
diff --git a/clang/test/Preprocessor/pr2086.c b/clang/test/Preprocessor/pr2086.c
index ddf2c166cdd..4df65a4f7c6 100644
--- a/clang/test/Preprocessor/pr2086.c
+++ b/clang/test/Preprocessor/pr2086.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s
+// RUN: clang-cc -E %s
#define test
#include "pr2086.h"
diff --git a/clang/test/Preprocessor/pragma_microsoft.c b/clang/test/Preprocessor/pragma_microsoft.c
index e05126d0dd7..81e90e3de69 100644
--- a/clang/test/Preprocessor/pragma_microsoft.c
+++ b/clang/test/Preprocessor/pragma_microsoft.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fms-extensions
+// RUN: clang-cc %s -fsyntax-only -verify -fms-extensions
// rdar://6495941
diff --git a/clang/test/Preprocessor/pragma_unknown.c b/clang/test/Preprocessor/pragma_unknown.c
index ca2bea10e19..e1b040b5cf0 100644
--- a/clang/test/Preprocessor/pragma_unknown.c
+++ b/clang/test/Preprocessor/pragma_unknown.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '#pragma foo bar'
+// RUN: clang-cc -E %s | grep '#pragma foo bar'
// GCC doesn't expand macro args for unrecognized pragmas.
#define bar xX
diff --git a/clang/test/Preprocessor/print_line_track.c b/clang/test/Preprocessor/print_line_track.c
index 505e5f9fae1..539433d1af0 100644
--- a/clang/test/Preprocessor/print_line_track.c
+++ b/clang/test/Preprocessor/print_line_track.c
@@ -1,8 +1,8 @@
-/* RUN: clang -E %s | grep 'a 3' &&
- * RUN: clang -E %s | grep 'b 16' &&
- * RUN: clang -E -P %s | grep 'a 3' &&
- * RUN: clang -E -P %s | grep 'b 16' &&
- * RUN: clang -E %s | not grep '# 0 '
+/* RUN: clang-cc -E %s | grep 'a 3' &&
+ * RUN: clang-cc -E %s | grep 'b 16' &&
+ * RUN: clang-cc -E -P %s | grep 'a 3' &&
+ * RUN: clang-cc -E -P %s | grep 'b 16' &&
+ * RUN: clang-cc -E %s | not grep '# 0 '
* PR1848
* PR3437
*/
diff --git a/clang/test/Preprocessor/skipping_unclean.c b/clang/test/Preprocessor/skipping_unclean.c
index 9efdd648b48..31ce9b460de 100644
--- a/clang/test/Preprocessor/skipping_unclean.c
+++ b/clang/test/Preprocessor/skipping_unclean.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep bark
+// RUN: clang-cc -E %s | grep bark
#if 0
blah
diff --git a/clang/test/Preprocessor/stringize_misc.c b/clang/test/Preprocessor/stringize_misc.c
index b8e4480ef83..251116acad6 100644
--- a/clang/test/Preprocessor/stringize_misc.c
+++ b/clang/test/Preprocessor/stringize_misc.c
@@ -1,9 +1,9 @@
-// RUN: clang -E %s | grep -F '"f(1, 2)" "g((x=y++, y))"' &&
-// RUN: clang -E %s | grep -F '"{a=1" "b=2;}"' &&
-// RUN: clang -E %s | grep -F '"<" "["' &&
-// RUN: clang -E %s | grep -F '"(,)" "(...)"' &&
-// RUN: clang -E %s | grep -F '{a=1 c=3; b=2;}' &&
-// RUN: clang -E %s | grep -F '"a COMMA b" "(a, b)"'
+// RUN: clang-cc -E %s | grep -F '"f(1, 2)" "g((x=y++, y))"' &&
+// RUN: clang-cc -E %s | grep -F '"{a=1" "b=2;}"' &&
+// RUN: clang-cc -E %s | grep -F '"<" "["' &&
+// RUN: clang-cc -E %s | grep -F '"(,)" "(...)"' &&
+// RUN: clang-cc -E %s | grep -F '{a=1 c=3; b=2;}' &&
+// RUN: clang-cc -E %s | grep -F '"a COMMA b" "(a, b)"'
#define M(x, y) #x #y
diff --git a/clang/test/Preprocessor/stringize_space.c b/clang/test/Preprocessor/stringize_space.c
index 8c83677d679..e41736c8168 100644
--- a/clang/test/Preprocessor/stringize_space.c
+++ b/clang/test/Preprocessor/stringize_space.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep -- '-"" , - "" , -"" , - ""'
+// RUN: clang-cc -E %s | grep -- '-"" , - "" , -"" , - ""'
#define A(b) -#b , - #b , -# b , - # b
A()
diff --git a/clang/test/Preprocessor/stringize_space2.c b/clang/test/Preprocessor/stringize_space2.c
index cf81674065b..6a96894de6e 100644
--- a/clang/test/Preprocessor/stringize_space2.c
+++ b/clang/test/Preprocessor/stringize_space2.c
@@ -1,4 +1,4 @@
-/* RUN: clang -E %s | grep 'a c'
+/* RUN: clang-cc -E %s | grep 'a c'
*/
#define t(x) #x
t(a
diff --git a/clang/test/Preprocessor/undef-error.c b/clang/test/Preprocessor/undef-error.c
index a2769345bab..f818e59a6d1 100644
--- a/clang/test/Preprocessor/undef-error.c
+++ b/clang/test/Preprocessor/undef-error.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -pedantic-errors -verify
+// RUN: clang-cc %s -pedantic-errors -verify
// PR2045
#define b
diff --git a/clang/test/Preprocessor/unterminated.c b/clang/test/Preprocessor/unterminated.c
index 59bcae831d8..2040aac17de 100644
--- a/clang/test/Preprocessor/unterminated.c
+++ b/clang/test/Preprocessor/unterminated.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -verify %s
+// RUN: clang-cc -E -verify %s
// PR3096
#ifdef FOO // expected-error {{unterminated conditional directive}}
/* /* */
diff --git a/clang/test/Rewriter/block-test.c b/clang/test/Rewriter/block-test.c
index c65815ff9a5..9b24e6323d4 100644
--- a/clang/test/Rewriter/block-test.c
+++ b/clang/test/Rewriter/block-test.c
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-blocks %s -fblocks -o -
+// RUN: clang-cc -rewrite-blocks %s -fblocks -o -
static int (^block)(const void *, const void *) = (int (^)(const void *, const void *))0;
static int (*func)(int (^block)(void *, void *)) = (int (*)(int (^block)(void *, void *)))0;
diff --git a/clang/test/Rewriter/crash.m b/clang/test/Rewriter/crash.m
index 2e34850e968..d4aba58c7b6 100644
--- a/clang/test/Rewriter/crash.m
+++ b/clang/test/Rewriter/crash.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc -o - %s
+// RUN: clang-cc -rewrite-objc -o - %s
// rdar://5950938
@interface NSArray {}
+ (id)arrayWithObjects:(id)firstObj, ...;
diff --git a/clang/test/Rewriter/finally.m b/clang/test/Rewriter/finally.m
index 0d623dcc1ce..bdc5a34fdf2 100644
--- a/clang/test/Rewriter/finally.m
+++ b/clang/test/Rewriter/finally.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc -verify %s -o -
+// RUN: clang-cc -rewrite-objc -verify %s -o -
int main() {
@try {
diff --git a/clang/test/Rewriter/id-test-3.m b/clang/test/Rewriter/id-test-3.m
index 121af3e588e..ad1e76decf8 100644
--- a/clang/test/Rewriter/id-test-3.m
+++ b/clang/test/Rewriter/id-test-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@protocol P
- (id<P>) Meth: (id<P>) Arg;
diff --git a/clang/test/Rewriter/ivar-encoding-1.m b/clang/test/Rewriter/ivar-encoding-1.m
index fb504fd04c4..759146175d4 100644
--- a/clang/test/Rewriter/ivar-encoding-1.m
+++ b/clang/test/Rewriter/ivar-encoding-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@interface Intf
{
diff --git a/clang/test/Rewriter/ivar-encoding-2.m b/clang/test/Rewriter/ivar-encoding-2.m
index a5872d4285a..86cc9b6a88f 100644
--- a/clang/test/Rewriter/ivar-encoding-2.m
+++ b/clang/test/Rewriter/ivar-encoding-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@implementation Intf
{
diff --git a/clang/test/Rewriter/metadata-test-1.m b/clang/test/Rewriter/metadata-test-1.m
index 03586c54f3b..40eded121ec 100644
--- a/clang/test/Rewriter/metadata-test-1.m
+++ b/clang/test/Rewriter/metadata-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@interface Intf
@end
diff --git a/clang/test/Rewriter/metadata-test-2.m b/clang/test/Rewriter/metadata-test-2.m
index 9a53bda004d..ab838f18bb9 100644
--- a/clang/test/Rewriter/metadata-test-2.m
+++ b/clang/test/Rewriter/metadata-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
typedef struct _NSPoint {
float x;
diff --git a/clang/test/Rewriter/method-encoding-1.m b/clang/test/Rewriter/method-encoding-1.m
index 6559c6b9bbb..25dccbf7508 100644
--- a/clang/test/Rewriter/method-encoding-1.m
+++ b/clang/test/Rewriter/method-encoding-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@protocol P1
- (void) MyProtoMeth : (int **) arg1 : (void*) arg2;
diff --git a/clang/test/Rewriter/objc-encoding-bug-1.m b/clang/test/Rewriter/objc-encoding-bug-1.m
index d2944370389..684a0d2ded0 100644
--- a/clang/test/Rewriter/objc-encoding-bug-1.m
+++ b/clang/test/Rewriter/objc-encoding-bug-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
typedef struct NSMethodFrameArgInfo {
struct NSMethodFrameArgInfo *subInfo;
diff --git a/clang/test/Rewriter/objc-ivar-receiver-1.m b/clang/test/Rewriter/objc-ivar-receiver-1.m
index 5a9365f376f..c7ad05a1884 100644
--- a/clang/test/Rewriter/objc-ivar-receiver-1.m
+++ b/clang/test/Rewriter/objc-ivar-receiver-1.m
@@ -1,5 +1,5 @@
-// RUN: clang -rewrite-objc %s -o - &&
-// RUN: clang -rewrite-objc %s -o - | grep 'newInv->_container'
+// RUN: clang-cc -rewrite-objc %s -o - &&
+// RUN: clang-cc -rewrite-objc %s -o - | grep 'newInv->_container'
@interface NSMutableArray
- (void)addObject:(id)addObject;
diff --git a/clang/test/Rewriter/objc-string-concat-1.m b/clang/test/Rewriter/objc-string-concat-1.m
index bb3e835f6b2..e8f8a88f205 100644
--- a/clang/test/Rewriter/objc-string-concat-1.m
+++ b/clang/test/Rewriter/objc-string-concat-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@class NSString;
diff --git a/clang/test/Rewriter/objc-super-test.m b/clang/test/Rewriter/objc-super-test.m
index fd61dbee2ee..500933d835d 100644
--- a/clang/test/Rewriter/objc-super-test.m
+++ b/clang/test/Rewriter/objc-super-test.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o - | grep objc_msgSendSuper | grep MainMethod
+// RUN: clang-cc -rewrite-objc %s -o - | grep objc_msgSendSuper | grep MainMethod
typedef struct objc_selector *SEL;
typedef struct objc_object *id;
diff --git a/clang/test/Rewriter/objc-synchronized-1.m b/clang/test/Rewriter/objc-synchronized-1.m
index 5f8ae31d5d8..e3c41165db2 100644
--- a/clang/test/Rewriter/objc-synchronized-1.m
+++ b/clang/test/Rewriter/objc-synchronized-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
id SYNCH_EXPR();
void SYNCH_BODY();
diff --git a/clang/test/Rewriter/properties.m b/clang/test/Rewriter/properties.m
index 68ce6e97eba..ac8ee9ff8c9 100644
--- a/clang/test/Rewriter/properties.m
+++ b/clang/test/Rewriter/properties.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o -
+// RUN: clang-cc -rewrite-objc %s -o -
@interface Foo {
int i;
diff --git a/clang/test/Rewriter/protocol-rewrite-1.m b/clang/test/Rewriter/protocol-rewrite-1.m
index 204f34a916a..263a97d85d2 100644
--- a/clang/test/Rewriter/protocol-rewrite-1.m
+++ b/clang/test/Rewriter/protocol-rewrite-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
typedef struct MyWidget {
int a;
diff --git a/clang/test/Rewriter/rewrite-api-bug.m b/clang/test/Rewriter/rewrite-api-bug.m
index 4d69eb0832e..ba0511b6465 100644
--- a/clang/test/Rewriter/rewrite-api-bug.m
+++ b/clang/test/Rewriter/rewrite-api-bug.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@interface MyDerived
- (void) instanceMethod;
diff --git a/clang/test/Rewriter/rewrite-foreach-1.m b/clang/test/Rewriter/rewrite-foreach-1.m
index a4e83a3bb0e..eef33f88c9c 100644
--- a/clang/test/Rewriter/rewrite-foreach-1.m
+++ b/clang/test/Rewriter/rewrite-foreach-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@protocol P @end
diff --git a/clang/test/Rewriter/rewrite-foreach-2.m b/clang/test/Rewriter/rewrite-foreach-2.m
index 8ef4e969e8f..12f0e834df4 100644
--- a/clang/test/Rewriter/rewrite-foreach-2.m
+++ b/clang/test/Rewriter/rewrite-foreach-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@protocol P @end
diff --git a/clang/test/Rewriter/rewrite-foreach-3.m b/clang/test/Rewriter/rewrite-foreach-3.m
index 7bb4e9b02be..3aa0d95b44b 100644
--- a/clang/test/Rewriter/rewrite-foreach-3.m
+++ b/clang/test/Rewriter/rewrite-foreach-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@protocol P @end
diff --git a/clang/test/Rewriter/rewrite-foreach-4.m b/clang/test/Rewriter/rewrite-foreach-4.m
index c4d8bf60500..774f9a0b75c 100644
--- a/clang/test/Rewriter/rewrite-foreach-4.m
+++ b/clang/test/Rewriter/rewrite-foreach-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@interface MyList
- (id) allKeys;
diff --git a/clang/test/Rewriter/rewrite-foreach-5.m b/clang/test/Rewriter/rewrite-foreach-5.m
index 0016da3fbe2..d0d12444a3e 100644
--- a/clang/test/Rewriter/rewrite-foreach-5.m
+++ b/clang/test/Rewriter/rewrite-foreach-5.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@interface MyList
- (id) allKeys;
diff --git a/clang/test/Rewriter/rewrite-foreach-6.m b/clang/test/Rewriter/rewrite-foreach-6.m
index 3bea346a7fb..c6043bb98eb 100644
--- a/clang/test/Rewriter/rewrite-foreach-6.m
+++ b/clang/test/Rewriter/rewrite-foreach-6.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -rewrite-objc -o=-
+// RUN: clang-cc %s -rewrite-objc -o=-
// rdar://5716356
// FIXME: Should be able to pipe into clang, but code is not
// yet correct for other reasons: rdar://5716940
diff --git a/clang/test/Rewriter/rewrite-nest.m b/clang/test/Rewriter/rewrite-nest.m
index 1a829356850..7a1690a3630 100644
--- a/clang/test/Rewriter/rewrite-nest.m
+++ b/clang/test/Rewriter/rewrite-nest.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@interface NSMapTable @end
@interface NSEnumerator @end
diff --git a/clang/test/Rewriter/rewrite-protocol-type-1.m b/clang/test/Rewriter/rewrite-protocol-type-1.m
index 47610dff3ae..48dc02971ca 100644
--- a/clang/test/Rewriter/rewrite-protocol-type-1.m
+++ b/clang/test/Rewriter/rewrite-protocol-type-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@protocol MyProto1
@end
diff --git a/clang/test/Rewriter/rewrite-try-catch.m b/clang/test/Rewriter/rewrite-try-catch.m
index be0bf091589..8c6d08f2e01 100644
--- a/clang/test/Rewriter/rewrite-try-catch.m
+++ b/clang/test/Rewriter/rewrite-try-catch.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@interface Foo @end
@interface GARF @end
diff --git a/clang/test/Rewriter/static-type-protocol-1.m b/clang/test/Rewriter/static-type-protocol-1.m
index 4283d073b1c..0985a9d7755 100644
--- a/clang/test/Rewriter/static-type-protocol-1.m
+++ b/clang/test/Rewriter/static-type-protocol-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@protocol Proto
- (void) ProtoDidget;
diff --git a/clang/test/Rewriter/undecl-objc-h.m b/clang/test/Rewriter/undecl-objc-h.m
index 938a3973761..b09765163ec 100644
--- a/clang/test/Rewriter/undecl-objc-h.m
+++ b/clang/test/Rewriter/undecl-objc-h.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
typedef struct S {
int * pint;
diff --git a/clang/test/Rewriter/undeclared-method-1.m b/clang/test/Rewriter/undeclared-method-1.m
index 67b970508b3..795fd61b4af 100644
--- a/clang/test/Rewriter/undeclared-method-1.m
+++ b/clang/test/Rewriter/undeclared-method-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@interface Derived @end
diff --git a/clang/test/Rewriter/undef-field-reference-1.m b/clang/test/Rewriter/undef-field-reference-1.m
index f91345eaa12..43bc2ad8bfa 100644
--- a/clang/test/Rewriter/undef-field-reference-1.m
+++ b/clang/test/Rewriter/undef-field-reference-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
@interface MyDerived
{
diff --git a/clang/test/Rewriter/va-method.m b/clang/test/Rewriter/va-method.m
index 00065ebb9c1..3bee599435e 100644
--- a/clang/test/Rewriter/va-method.m
+++ b/clang/test/Rewriter/va-method.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o=-
+// RUN: clang-cc -rewrite-objc %s -o=-
#include <stdarg.h>
diff --git a/clang/test/Sema/128bitint.c b/clang/test/Sema/128bitint.c
index 45678e90a9c..2a18d904f8f 100644
--- a/clang/test/Sema/128bitint.c
+++ b/clang/test/Sema/128bitint.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef int i128 __attribute__((__mode__(TI)));
typedef unsigned u128 __attribute__((__mode__(TI)));
diff --git a/clang/test/Sema/PR2727.c b/clang/test/Sema/PR2727.c
index 1b3096f0b58..52d8392ee9e 100644
--- a/clang/test/Sema/PR2727.c
+++ b/clang/test/Sema/PR2727.c
@@ -1,5 +1,5 @@
-// RUN: clang -verify -fsyntax-only -std=c90 %s &&
-// RUN: clang -verify -fsyntax-only -std=c99 %s
+// RUN: clang-cc -verify -fsyntax-only -std=c90 %s &&
+// RUN: clang-cc -verify -fsyntax-only -std=c99 %s
int f (int x)
{
diff --git a/clang/test/Sema/PR2728.c b/clang/test/Sema/PR2728.c
index 01a3be7b9e4..26c96fe625b 100644
--- a/clang/test/Sema/PR2728.c
+++ b/clang/test/Sema/PR2728.c
@@ -1,5 +1,5 @@
-// RUN: clang -verify -fsyntax-only -std=c90 %s &&
-// RUN: clang -verify -fsyntax-only -std=c99 %s
+// RUN: clang-cc -verify -fsyntax-only -std=c90 %s &&
+// RUN: clang-cc -verify -fsyntax-only -std=c99 %s
struct s
{
diff --git a/clang/test/Sema/PR2919-builtin-types-compat-strips-crv.c b/clang/test/Sema/PR2919-builtin-types-compat-strips-crv.c
index 0e374881abf..160ec4a3805 100644
--- a/clang/test/Sema/PR2919-builtin-types-compat-strips-crv.c
+++ b/clang/test/Sema/PR2919-builtin-types-compat-strips-crv.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
typedef struct foo T0;
typedef const struct foo T1;
diff --git a/clang/test/Sema/PR2923.c b/clang/test/Sema/PR2923.c
index 5d827767419..c75e7baed1a 100644
--- a/clang/test/Sema/PR2923.c
+++ b/clang/test/Sema/PR2923.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Test for absence of crash reported in PR 2923:
//
diff --git a/clang/test/Sema/PR2963-enum-constant.c b/clang/test/Sema/PR2963-enum-constant.c
index 28becc37937..7a088148155 100644
--- a/clang/test/Sema/PR2963-enum-constant.c
+++ b/clang/test/Sema/PR2963-enum-constant.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -pedantic -fsyntax-only
+// RUN: clang-cc %s -verify -pedantic -fsyntax-only
typedef short short_fixed;
diff --git a/clang/test/Sema/address-constant.c b/clang/test/Sema/address-constant.c
index e1704b8b0e6..69f2f79f685 100644
--- a/clang/test/Sema/address-constant.c
+++ b/clang/test/Sema/address-constant.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int i;
int a[] = {0};
diff --git a/clang/test/Sema/address_spaces.c b/clang/test/Sema/address_spaces.c
index a081b38a8eb..8f637268a4e 100644
--- a/clang/test/Sema/address_spaces.c
+++ b/clang/test/Sema/address_spaces.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
#define _AS1 __attribute__((address_space(1)))
#define _AS2 __attribute__((address_space(2)))
diff --git a/clang/test/Sema/align-x86.c b/clang/test/Sema/align-x86.c
index df392a2e1e8..f6668ddb327 100644
--- a/clang/test/Sema/align-x86.c
+++ b/clang/test/Sema/align-x86.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
// PR3433
double g1;
diff --git a/clang/test/Sema/annotate.c b/clang/test/Sema/annotate.c
index 4387d4f7a2c..aec2af8b022 100644
--- a/clang/test/Sema/annotate.c
+++ b/clang/test/Sema/annotate.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
void __attribute__((annotate("foo"))) foo(float *a) {
__attribute__((annotate("bar"))) int x;
diff --git a/clang/test/Sema/anonymous-struct-union.c b/clang/test/Sema/anonymous-struct-union.c
index 9784236c8bf..ca1133bd8ac 100644
--- a/clang/test/Sema/anonymous-struct-union.c
+++ b/clang/test/Sema/anonymous-struct-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct X {
union {
float f3;
diff --git a/clang/test/Sema/arg-duplicate.c b/clang/test/Sema/arg-duplicate.c
index c5498a23091..82b2992af34 100644
--- a/clang/test/Sema/arg-duplicate.c
+++ b/clang/test/Sema/arg-duplicate.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int f3(y, x,
x) // expected-error {{redefinition of parameter}}
diff --git a/clang/test/Sema/arg-scope-c99.c b/clang/test/Sema/arg-scope-c99.c
index 2d386c45da5..b5b1c8a812c 100644
--- a/clang/test/Sema/arg-scope-c99.c
+++ b/clang/test/Sema/arg-scope-c99.c
@@ -1,2 +1,2 @@
-// RUN: clang -fsyntax-only -std=c99 -verify %s
+// RUN: clang-cc -fsyntax-only -std=c99 -verify %s
int bb(int sz, int ar[sz][sz]) { }
diff --git a/clang/test/Sema/arg-scope.c b/clang/test/Sema/arg-scope.c
index fc2bb70d0a1..c1cc7e112f8 100644
--- a/clang/test/Sema/arg-scope.c
+++ b/clang/test/Sema/arg-scope.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int aa(int b, int x[sizeof b]) {}
void foo(int i, int A[i]) {}
diff --git a/clang/test/Sema/array-constraint.c b/clang/test/Sema/array-constraint.c
index 06b5d747abc..5a09e20ecbf 100644
--- a/clang/test/Sema/array-constraint.c
+++ b/clang/test/Sema/array-constraint.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
struct s; // expected-note 2 {{forward declaration of 'struct s'}}
struct s* t (struct s z[]) { // expected-error {{array has incomplete element type}}
diff --git a/clang/test/Sema/array-declared-as-incorrect-type.c b/clang/test/Sema/array-declared-as-incorrect-type.c
index 9b7d8b7a74e..3f6fa33a3bd 100644
--- a/clang/test/Sema/array-declared-as-incorrect-type.c
+++ b/clang/test/Sema/array-declared-as-incorrect-type.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
extern int a1[];
int a1[1];
diff --git a/clang/test/Sema/array-init.c b/clang/test/Sema/array-init.c
index 0c1bbc04709..4e95a018760 100644
--- a/clang/test/Sema/array-init.c
+++ b/clang/test/Sema/array-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
extern int foof() = 1; // expected-error{{illegal initializer (only variables can be initialized)}}
diff --git a/clang/test/Sema/asm.c b/clang/test/Sema/asm.c
index 6ed9c50d627..4072a5cc762 100644
--- a/clang/test/Sema/asm.c
+++ b/clang/test/Sema/asm.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -arch=i386 -verify -fsyntax-only
+// RUN: clang-cc %s -arch=i386 -verify -fsyntax-only
void f() {
int i;
diff --git a/clang/test/Sema/assign-null.c b/clang/test/Sema/assign-null.c
index 6972d902236..a343c8069fd 100644
--- a/clang/test/Sema/assign-null.c
+++ b/clang/test/Sema/assign-null.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#include <stddef.h>
diff --git a/clang/test/Sema/assign.c b/clang/test/Sema/assign.c
index 4ddb25a94af..b25262c6243 100644
--- a/clang/test/Sema/assign.c
+++ b/clang/test/Sema/assign.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void *test1(void) { return 0; }
diff --git a/clang/test/Sema/ast-print.c b/clang/test/Sema/ast-print.c
index 34b0411cfe0..a8988b029f4 100644
--- a/clang/test/Sema/ast-print.c
+++ b/clang/test/Sema/ast-print.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -ast-print
+// RUN: clang-cc %s -ast-print
typedef void func_typedef();
func_typedef xxx;
diff --git a/clang/test/Sema/attr-aligned.c b/clang/test/Sema/attr-aligned.c
index e689c0eaebe..c7d65ee9ae8 100644
--- a/clang/test/Sema/attr-aligned.c
+++ b/clang/test/Sema/attr-aligned.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
int x __attribute__((aligned(3))); // expected-error {{requested alignment is not a power of 2}}
diff --git a/clang/test/Sema/attr-cleanup.c b/clang/test/Sema/attr-cleanup.c
index d239c1ade51..69896083f06 100644
--- a/clang/test/Sema/attr-cleanup.c
+++ b/clang/test/Sema/attr-cleanup.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
void c1(int *a);
diff --git a/clang/test/Sema/attr-deprecated.c b/clang/test/Sema/attr-deprecated.c
index 2540e59c004..6597bad4b57 100644
--- a/clang/test/Sema/attr-deprecated.c
+++ b/clang/test/Sema/attr-deprecated.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
int f() __attribute__((deprecated));
void g() __attribute__((deprecated));
diff --git a/clang/test/Sema/attr-mode.c b/clang/test/Sema/attr-mode.c
index 4d6ce288927..ac411d7c42d 100644
--- a/clang/test/Sema/attr-mode.c
+++ b/clang/test/Sema/attr-mode.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef int i16_1 __attribute((mode(HI)));
int i16_1_test[sizeof(i16_1) == 2 ? 1 : -1];
diff --git a/clang/test/Sema/attr-nodebug.c b/clang/test/Sema/attr-nodebug.c
index a3b525c4938..512ecfdcafc 100644
--- a/clang/test/Sema/attr-nodebug.c
+++ b/clang/test/Sema/attr-nodebug.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
int a __attribute__((nodebug)); // expected-warning {{'nodebug' attribute only applies to function types}}
diff --git a/clang/test/Sema/attr-noinline.c b/clang/test/Sema/attr-noinline.c
index 2d1c0f00d47..cf695f0d21f 100644
--- a/clang/test/Sema/attr-noinline.c
+++ b/clang/test/Sema/attr-noinline.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
int a __attribute__((noinline)); // expected-warning {{'noinline' attribute only applies to function types}}
diff --git a/clang/test/Sema/attr-noreturn.c b/clang/test/Sema/attr-noreturn.c
index 5384eaf8328..35c2bb5fdb4 100644
--- a/clang/test/Sema/attr-noreturn.c
+++ b/clang/test/Sema/attr-noreturn.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
static void (*fp0)(void) __attribute__((noreturn));
diff --git a/clang/test/Sema/attr-unused.c b/clang/test/Sema/attr-unused.c
index 87d58572a65..dbb5e630d7a 100644
--- a/clang/test/Sema/attr-unused.c
+++ b/clang/test/Sema/attr-unused.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
static void (*fp0)(void) __attribute__((unused));
diff --git a/clang/test/Sema/attr-used.c b/clang/test/Sema/attr-used.c
index 10674814ce2..fdabf7ff2ad 100644
--- a/clang/test/Sema/attr-used.c
+++ b/clang/test/Sema/attr-used.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
extern int l0 __attribute__((used)); // expected-warning {{used attribute ignored}}
__private_extern__ int l1 __attribute__((used)); // expected-warning {{used attribute ignored}}
diff --git a/clang/test/Sema/attr-warn_unused_result.c b/clang/test/Sema/attr-warn_unused_result.c
index 38f201ca825..b4ef1bbeaf0 100644
--- a/clang/test/Sema/attr-warn_unused_result.c
+++ b/clang/test/Sema/attr-warn_unused_result.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// rdar://6587766
int fn1() __attribute__ ((warn_unused_result));
diff --git a/clang/test/Sema/attr-weak.c b/clang/test/Sema/attr-weak.c
index a58e61e627a..b79e1e7dfca 100644
--- a/clang/test/Sema/attr-weak.c
+++ b/clang/test/Sema/attr-weak.c
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
extern int g0 __attribute__((weak));
extern int g1 __attribute__((weak_import));
diff --git a/clang/test/Sema/bitfield-layout.c b/clang/test/Sema/bitfield-layout.c
index 0ac5dd260a8..4405c80fee6 100644
--- a/clang/test/Sema/bitfield-layout.c
+++ b/clang/test/Sema/bitfield-layout.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -triple=i686-apple-darwin9
+// RUN: clang-cc %s -fsyntax-only -verify -triple=i686-apple-darwin9
#define CHECK_SIZE(kind, name, size) extern int name##1[sizeof(kind name) == size ? 1 : -1];
#define CHECK_ALIGN(kind, name, size) extern int name##2[__alignof(kind name) == size ? 1 : -1];
diff --git a/clang/test/Sema/bitfield.c b/clang/test/Sema/bitfield.c
index 0a658c5c33e..0022b4d62ff 100644
--- a/clang/test/Sema/bitfield.c
+++ b/clang/test/Sema/bitfield.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
enum e0; // expected-note{{forward declaration of 'enum e0'}}
struct a {
diff --git a/clang/test/Sema/block-args.c b/clang/test/Sema/block-args.c
index d518fef0442..a2d8e5a8673 100644
--- a/clang/test/Sema/block-args.c
+++ b/clang/test/Sema/block-args.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fblocks
+// RUN: clang-cc %s -fsyntax-only -verify -fblocks
void take(void*);
diff --git a/clang/test/Sema/block-as-object.m b/clang/test/Sema/block-as-object.m
index 28f8d775d0c..219b1a06532 100644
--- a/clang/test/Sema/block-as-object.m
+++ b/clang/test/Sema/block-as-object.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fblocks
+// RUN: clang-cc %s -fsyntax-only -verify -fblocks
@interface Whatever
- copy;
diff --git a/clang/test/Sema/block-byref-args.c b/clang/test/Sema/block-byref-args.c
index 29f5a3aeeb9..39745d54efa 100644
--- a/clang/test/Sema/block-byref-args.c
+++ b/clang/test/Sema/block-byref-args.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fblocks
+// RUN: clang-cc %s -fsyntax-only -verify -fblocks
#include <stdio.h>
diff --git a/clang/test/Sema/block-call.c b/clang/test/Sema/block-call.c
index c52f0ed96bf..3326131816e 100644
--- a/clang/test/Sema/block-call.c
+++ b/clang/test/Sema/block-call.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -fblocks
+// RUN: clang-cc -fsyntax-only -verify %s -fblocks
int (*FP)();
int (^IFP) ();
diff --git a/clang/test/Sema/block-explicit-return-type.c b/clang/test/Sema/block-explicit-return-type.c
index a0d5da6ee8e..c7b26b3d6bf 100644
--- a/clang/test/Sema/block-explicit-return-type.c
+++ b/clang/test/Sema/block-explicit-return-type.c
@@ -1,4 +1,4 @@
-// RUN: clang -ObjC -fsyntax-only %s -verify -fblocks
+// RUN: clang-cc -ObjC -fsyntax-only %s -verify -fblocks
// FIXME: should compile
// Test for blocks with explicit return type specified.
diff --git a/clang/test/Sema/block-labels.c b/clang/test/Sema/block-labels.c
index 15e6f61cede..f0f8c4856d8 100644
--- a/clang/test/Sema/block-labels.c
+++ b/clang/test/Sema/block-labels.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fblocks -fsyntax-only
+// RUN: clang-cc %s -verify -fblocks -fsyntax-only
int a() {
A:if (1) xx();
diff --git a/clang/test/Sema/block-literal.c b/clang/test/Sema/block-literal.c
index 4890839b97a..2dc45812431 100644
--- a/clang/test/Sema/block-literal.c
+++ b/clang/test/Sema/block-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify -fblocks
+// RUN: clang-cc -fsyntax-only %s -verify -fblocks
void I( void (^)(void));
void (^noop)(void);
diff --git a/clang/test/Sema/block-misc.c b/clang/test/Sema/block-misc.c
index c3de7b7e9be..dde07f07394 100644
--- a/clang/test/Sema/block-misc.c
+++ b/clang/test/Sema/block-misc.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -fblocks
+// RUN: clang-cc -fsyntax-only -verify %s -fblocks
void donotwarn();
int (^IFP) ();
diff --git a/clang/test/Sema/block-return.c b/clang/test/Sema/block-return.c
index a3705348355..d7717b38ca3 100644
--- a/clang/test/Sema/block-return.c
+++ b/clang/test/Sema/block-return.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify -fblocks
+// RUN: clang-cc -fsyntax-only %s -verify -fblocks
typedef void (^CL)(void);
diff --git a/clang/test/Sema/block-storageclass.c b/clang/test/Sema/block-storageclass.c
index 0ae723d44cf..3d2527b3f4e 100644
--- a/clang/test/Sema/block-storageclass.c
+++ b/clang/test/Sema/block-storageclass.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fblocks
+// RUN: clang-cc %s -fsyntax-only -verify -fblocks
#include <stdio.h>
void _Block_byref_release(void*src){}
diff --git a/clang/test/Sema/block-syntax-error.c b/clang/test/Sema/block-syntax-error.c
index 5f6c204a471..b046f46da48 100644
--- a/clang/test/Sema/block-syntax-error.c
+++ b/clang/test/Sema/block-syntax-error.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fblocks
+// RUN: clang-cc %s -fsyntax-only -verify -fblocks
void (^noop)(void);
diff --git a/clang/test/Sema/builtin-object-size.c b/clang/test/Sema/builtin-object-size.c
index 27a2782d0cf..4b15cb1f0e2 100644
--- a/clang/test/Sema/builtin-object-size.c
+++ b/clang/test/Sema/builtin-object-size.c
@@ -1,5 +1,5 @@
-// RUN: clang -fsyntax-only -verify %s &&
-// RUN: clang -fsyntax-only -triple x86_64-apple-darwin9 -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s &&
+// RUN: clang-cc -fsyntax-only -triple x86_64-apple-darwin9 -verify %s
int a[10];
diff --git a/clang/test/Sema/builtin-prefetch.c b/clang/test/Sema/builtin-prefetch.c
index 187552d088c..6b39e75d525 100644
--- a/clang/test/Sema/builtin-prefetch.c
+++ b/clang/test/Sema/builtin-prefetch.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int foo() {
int a;
diff --git a/clang/test/Sema/builtin-stackaddress.c b/clang/test/Sema/builtin-stackaddress.c
index c030ab364fe..67582a549f5 100644
--- a/clang/test/Sema/builtin-stackaddress.c
+++ b/clang/test/Sema/builtin-stackaddress.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void* a(unsigned x) {
return __builtin_return_address(0);
}
diff --git a/clang/test/Sema/builtins.c b/clang/test/Sema/builtins.c
index bbbad421cf2..90908552fe1 100644
--- a/clang/test/Sema/builtins.c
+++ b/clang/test/Sema/builtins.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic -triple=i686-apple-darwin9
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic -triple=i686-apple-darwin9
// This test needs to set the target because it uses __builtin_ia32_vec_ext_v4si
int test1(float a, int b) {
diff --git a/clang/test/Sema/c89-2.c b/clang/test/Sema/c89-2.c
index 128046f6d29..723bd7c18d8 100644
--- a/clang/test/Sema/c89-2.c
+++ b/clang/test/Sema/c89-2.c
@@ -1,4 +1,4 @@
-/* RUN: not clang %s -std=c89 -pedantic-errors
+/* RUN: not clang-cc %s -std=c89 -pedantic-errors
*/
/* We can't put expected-warning lines on #if lines. */
diff --git a/clang/test/Sema/c89.c b/clang/test/Sema/c89.c
index 0c7496ac7a2..138d6fa2496 100644
--- a/clang/test/Sema/c89.c
+++ b/clang/test/Sema/c89.c
@@ -1,4 +1,4 @@
-/* RUN: clang %s -std=c89 -pedantic -fsyntax-only -verify
+/* RUN: clang-cc %s -std=c89 -pedantic -fsyntax-only -verify
*/
void test1() {
{
diff --git a/clang/test/Sema/callingconv.c b/clang/test/Sema/callingconv.c
index fa0af768342..cb69c59c403 100644
--- a/clang/test/Sema/callingconv.c
+++ b/clang/test/Sema/callingconv.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
void __attribute__((fastcall)) foo(float *a) {
}
diff --git a/clang/test/Sema/carbon.c b/clang/test/Sema/carbon.c
index 94a707557f2..edb4d9729b1 100644
--- a/clang/test/Sema/carbon.c
+++ b/clang/test/Sema/carbon.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -fsyntax-only -print-stats &&
-// RUN: clang -x c-header -o %t %s && clang -token-cache %t %s
+// RUN: clang-cc %s -fsyntax-only -print-stats &&
+// RUN: clang-cc -x c-header -o %t %s && clang-cc -token-cache %t %s
#ifdef __APPLE__
#include <Carbon/Carbon.h>
#endif
diff --git a/clang/test/Sema/cast-to-union.c b/clang/test/Sema/cast-to-union.c
index 495b27cb1bd..24f913b9ea3 100644
--- a/clang/test/Sema/cast-to-union.c
+++ b/clang/test/Sema/cast-to-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
union u { int i; };
void f(union u);
diff --git a/clang/test/Sema/cast.c b/clang/test/Sema/cast.c
index 14bfe138f30..6ceec6923c8 100644
--- a/clang/test/Sema/cast.c
+++ b/clang/test/Sema/cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
typedef struct { unsigned long bits[(((1) + (64) - 1) / (64))]; } cpumask_t;
cpumask_t x;
diff --git a/clang/test/Sema/check-increment.c b/clang/test/Sema/check-increment.c
index 4447feb0b8e..9809544854d 100644
--- a/clang/test/Sema/check-increment.c
+++ b/clang/test/Sema/check-increment.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#include <stdio.h>
typedef int *pint;
diff --git a/clang/test/Sema/compare.c b/clang/test/Sema/compare.c
index e1ebf575ac6..4b44bf5b96a 100644
--- a/clang/test/Sema/compare.c
+++ b/clang/test/Sema/compare.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
int test(char *C) { // nothing here should warn.
return C != ((void*)0);
diff --git a/clang/test/Sema/complex-int.c b/clang/test/Sema/complex-int.c
index 77bfc9c3768..5977b4d1e0c 100644
--- a/clang/test/Sema/complex-int.c
+++ b/clang/test/Sema/complex-int.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
void a() {
__complex__ int arr;
diff --git a/clang/test/Sema/complex-promotion.c b/clang/test/Sema/complex-promotion.c
index f7e5f638847..3d86c20eb24 100644
--- a/clang/test/Sema/complex-promotion.c
+++ b/clang/test/Sema/complex-promotion.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
float a;
diff --git a/clang/test/Sema/compound-literal.c b/clang/test/Sema/compound-literal.c
index e457c72bee4..24ec223ae6a 100644
--- a/clang/test/Sema/compound-literal.c
+++ b/clang/test/Sema/compound-literal.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
struct foo { int a, b; };
diff --git a/clang/test/Sema/conditional-expr.c b/clang/test/Sema/conditional-expr.c
index ae973d6b2b8..c068113e9b8 100644
--- a/clang/test/Sema/conditional-expr.c
+++ b/clang/test/Sema/conditional-expr.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
void foo() {
*(0 ? (double *)0 : (void *)0) = 0;
// FIXME: GCC doesn't consider the the following two statements to be errors.
diff --git a/clang/test/Sema/conditional.c b/clang/test/Sema/conditional.c
index e1ad1a51ba9..1c7486a6133 100644
--- a/clang/test/Sema/conditional.c
+++ b/clang/test/Sema/conditional.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
const char* test1 = 1 ? "i" : 1 == 1 ? "v" : "r";
diff --git a/clang/test/Sema/const-eval.c b/clang/test/Sema/const-eval.c
index 03aeb2a0b3a..dd91c482365 100644
--- a/clang/test/Sema/const-eval.c
+++ b/clang/test/Sema/const-eval.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#define EVAL_EXPR(testno, expr) int test##testno = sizeof(struct{char qq[expr];});
int x;
diff --git a/clang/test/Sema/const-ptr-int-ptr-cast.c b/clang/test/Sema/const-ptr-int-ptr-cast.c
index 3590583cd5e..4e08bfff2cb 100644
--- a/clang/test/Sema/const-ptr-int-ptr-cast.c
+++ b/clang/test/Sema/const-ptr-int-ptr-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#include <stdint.h>
diff --git a/clang/test/Sema/constant-builtins-2.c b/clang/test/Sema/constant-builtins-2.c
index d47cc3556b3..146d9e9bb92 100644
--- a/clang/test/Sema/constant-builtins-2.c
+++ b/clang/test/Sema/constant-builtins-2.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
// Math stuff
diff --git a/clang/test/Sema/constant-builtins.c b/clang/test/Sema/constant-builtins.c
index b1c5e2af108..3914641751d 100644
--- a/clang/test/Sema/constant-builtins.c
+++ b/clang/test/Sema/constant-builtins.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify -pedantic
+// RUN: clang-cc -fsyntax-only %s -verify -pedantic
// Math stuff
diff --git a/clang/test/Sema/constructor-attribute.c b/clang/test/Sema/constructor-attribute.c
index 3f240b02e5a..bf876f344a8 100644
--- a/clang/test/Sema/constructor-attribute.c
+++ b/clang/test/Sema/constructor-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int x __attribute__((constructor)); // expected-warning {{'constructor' attribute only applies to function types}}
int f() __attribute__((constructor));
diff --git a/clang/test/Sema/darwin-align-cast.c b/clang/test/Sema/darwin-align-cast.c
index adf938f29bc..09808b5af2e 100644
--- a/clang/test/Sema/darwin-align-cast.c
+++ b/clang/test/Sema/darwin-align-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef long unsigned int __darwin_size_t;
typedef long __darwin_ssize_t;
typedef __darwin_size_t size_t;
diff --git a/clang/test/Sema/decl-invalid.c b/clang/test/Sema/decl-invalid.c
index 78a9ee1d4bf..0e10bdd8c12 100644
--- a/clang/test/Sema/decl-invalid.c
+++ b/clang/test/Sema/decl-invalid.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// See Sema::ParsedFreeStandingDeclSpec about the double diagnostic
typedef union <anonymous> __mbstate_t; // expected-error {{declaration of anonymous union must be a definition}} expected-error {{declaration does not declare anything}}
diff --git a/clang/test/Sema/decl-type-merging.c b/clang/test/Sema/decl-type-merging.c
index 89bc4944750..1b789a142ad 100644
--- a/clang/test/Sema/decl-type-merging.c
+++ b/clang/test/Sema/decl-type-merging.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -std=c99 -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -std=c99 -verify -pedantic %s
int x[10];
int x[] = {1,2,3};
diff --git a/clang/test/Sema/declspec.c b/clang/test/Sema/declspec.c
index 0207b4aacc5..e325cc83521 100644
--- a/clang/test/Sema/declspec.c
+++ b/clang/test/Sema/declspec.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
typedef char T[4];
T foo(int n, int m) { } // expected-error {{cannot return array or function}}
diff --git a/clang/test/Sema/default.c b/clang/test/Sema/default.c
index 4efac17cfd1..5dac99131b6 100644
--- a/clang/test/Sema/default.c
+++ b/clang/test/Sema/default.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f5 (int z) {
if (z)
diff --git a/clang/test/Sema/default1.c b/clang/test/Sema/default1.c
index a72d0aef0cc..6e8a27bf573 100644
--- a/clang/test/Sema/default1.c
+++ b/clang/test/Sema/default1.c
@@ -1,2 +1,2 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f(int i = 0); // expected-error {{C does not support default arguments}}
diff --git a/clang/test/Sema/deref.c b/clang/test/Sema/deref.c
index 83f7f8389cd..fad56430a07 100644
--- a/clang/test/Sema/deref.c
+++ b/clang/test/Sema/deref.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c90 %s
+// RUN: clang-cc -fsyntax-only -verify -std=c90 %s
void
foo (void)
{
diff --git a/clang/test/Sema/designated-initializers.c b/clang/test/Sema/designated-initializers.c
index f604701d121..cfbe80224bf 100644
--- a/clang/test/Sema/designated-initializers.c
+++ b/clang/test/Sema/designated-initializers.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -arch x86_64 %s
+// RUN: clang-cc -fsyntax-only -verify -arch x86_64 %s
int complete_array_from_init[] = { 1, 2, [10] = 5, 1, 2, [5] = 2, 6 };
diff --git a/clang/test/Sema/dllimport-dllexport.c b/clang/test/Sema/dllimport-dllexport.c
index 3f385d16c18..90ed1456d24 100644
--- a/clang/test/Sema/dllimport-dllexport.c
+++ b/clang/test/Sema/dllimport-dllexport.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
inline void __attribute__((dllexport)) foo1(){} // expected-warning{{dllexport attribute ignored}}
inline void __attribute__((dllimport)) foo2(){} // expected-warning{{dllimport attribute ignored}}
diff --git a/clang/test/Sema/enum.c b/clang/test/Sema/enum.c
index dbc250abc3b..adb93755123 100644
--- a/clang/test/Sema/enum.c
+++ b/clang/test/Sema/enum.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
enum e {A,
B = 42LL << 32, // expected-warning {{ISO C restricts enumerator values to range of 'int'}}
C = -4, D = 12456 };
diff --git a/clang/test/Sema/expr-address-of.c b/clang/test/Sema/expr-address-of.c
index 7dd7dd67d37..b3ea9c50668 100644
--- a/clang/test/Sema/expr-address-of.c
+++ b/clang/test/Sema/expr-address-of.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
struct xx { int bitf:1; };
struct entry { struct xx *whatever;
diff --git a/clang/test/Sema/expr-comma-c89.c b/clang/test/Sema/expr-comma-c89.c
index 4949ee3a83f..b2b17dc3359 100644
--- a/clang/test/Sema/expr-comma-c89.c
+++ b/clang/test/Sema/expr-comma-c89.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -std=c99
+// RUN: clang-cc %s -fsyntax-only -verify -std=c99
// rdar://6095180
#include <assert.h>
diff --git a/clang/test/Sema/expr-comma.c b/clang/test/Sema/expr-comma.c
index 849e8d5ae8b..64079866ca9 100644
--- a/clang/test/Sema/expr-comma.c
+++ b/clang/test/Sema/expr-comma.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -std=c89
+// RUN: clang-cc %s -fsyntax-only -verify -std=c89
// rdar://6095180
#include <assert.h>
diff --git a/clang/test/Sema/exprs.c b/clang/test/Sema/exprs.c
index 8bf42f7d7dd..d348d9e190d 100644
--- a/clang/test/Sema/exprs.c
+++ b/clang/test/Sema/exprs.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -pedantic -fsyntax-only
+// RUN: clang-cc %s -verify -pedantic -fsyntax-only
// PR1966
_Complex double test1() {
diff --git a/clang/test/Sema/ext_vector_components.c b/clang/test/Sema/ext_vector_components.c
index ad0277baac9..422a9e6f228 100644
--- a/clang/test/Sema/ext_vector_components.c
+++ b/clang/test/Sema/ext_vector_components.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef __attribute__(( ext_vector_type(2) )) float float2;
typedef __attribute__(( ext_vector_type(3) )) float float3;
diff --git a/clang/test/Sema/flexible-array-init.c b/clang/test/Sema/flexible-array-init.c
index 2b8f40fa5b0..afe31fb8294 100644
--- a/clang/test/Sema/flexible-array-init.c
+++ b/clang/test/Sema/flexible-array-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
struct one {
int a;
int values[]; // expected-note 3{{initialized flexible array member 'values' is here}}
diff --git a/clang/test/Sema/floating-point-compare.c b/clang/test/Sema/floating-point-compare.c
index ae0d0fe1509..763a8f4b86b 100644
--- a/clang/test/Sema/floating-point-compare.c
+++ b/clang/test/Sema/floating-point-compare.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Wfloat-equal -verify %s
+// RUN: clang-cc -fsyntax-only -Wfloat-equal -verify %s
int f1(float x, float y) {
return x == y; // expected-warning {{comparing floating point with ==}}
diff --git a/clang/test/Sema/for.c b/clang/test/Sema/for.c
index c08f532688b..183a95d0ab4 100644
--- a/clang/test/Sema/for.c
+++ b/clang/test/Sema/for.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Check C99 6.8.5p3
void b1 (void) { for (void (*f) (void);;); }
diff --git a/clang/test/Sema/format-attribute.c b/clang/test/Sema/format-attribute.c
index a1cd0b84b37..cb823318592 100644
--- a/clang/test/Sema/format-attribute.c
+++ b/clang/test/Sema/format-attribute.c
@@ -1,4 +1,4 @@
-//RUN: clang -fsyntax-only -verify %s
+//RUN: clang-cc -fsyntax-only -verify %s
#include <stdarg.h>
diff --git a/clang/test/Sema/format-strings.c b/clang/test/Sema/format-strings.c
index 9237a5970e9..cbeadc20b82 100644
--- a/clang/test/Sema/format-strings.c
+++ b/clang/test/Sema/format-strings.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Define this to get vasprintf on Linux
#define _GNU_SOURCE
diff --git a/clang/test/Sema/function-ptr.c b/clang/test/Sema/function-ptr.c
index 83e4d74b6ad..6b410018f4b 100644
--- a/clang/test/Sema/function-ptr.c
+++ b/clang/test/Sema/function-ptr.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -pedantic
+// RUN: clang-cc %s -verify -pedantic
typedef int unary_int_func(int arg);
unary_int_func *func;
diff --git a/clang/test/Sema/function-redecl.c b/clang/test/Sema/function-redecl.c
index fc2e1995f26..28593b0678d 100644
--- a/clang/test/Sema/function-redecl.c
+++ b/clang/test/Sema/function-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// PR3588
void g0(int, int);
diff --git a/clang/test/Sema/function.c b/clang/test/Sema/function.c
index 90ade3380b9..c240896adf5 100644
--- a/clang/test/Sema/function.c
+++ b/clang/test/Sema/function.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
// PR1892
void f(double a[restrict][5]); // should promote to restrict ptr.
void f(double (* restrict a)[5]);
diff --git a/clang/test/Sema/heinous-extensions-off.c b/clang/test/Sema/heinous-extensions-off.c
index 2b15f29bf42..3a9880ce7f7 100644
--- a/clang/test/Sema/heinous-extensions-off.c
+++ b/clang/test/Sema/heinous-extensions-off.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify
+// RUN: clang-cc %s -verify
int foo() {
int a;
diff --git a/clang/test/Sema/heinous-extensions-on.c b/clang/test/Sema/heinous-extensions-on.c
index 6b831f14d1b..480b1b41e90 100644
--- a/clang/test/Sema/heinous-extensions-on.c
+++ b/clang/test/Sema/heinous-extensions-on.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fheinous-gnu-extensions
+// RUN: clang-cc %s -verify -fheinous-gnu-extensions
int foo() {
int a;
diff --git a/clang/test/Sema/i-c-e.c b/clang/test/Sema/i-c-e.c
index d8770755a12..6bc35413995 100644
--- a/clang/test/Sema/i-c-e.c
+++ b/clang/test/Sema/i-c-e.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic -fpascal-strings
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic -fpascal-strings
#include <stdint.h>
#include <limits.h>
diff --git a/clang/test/Sema/if-empty-body.c b/clang/test/Sema/if-empty-body.c
index 376eb9865a0..1d1df40bd6a 100644
--- a/clang/test/Sema/if-empty-body.c
+++ b/clang/test/Sema/if-empty-body.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f1(int a) {
if (a); // expected-warning {{if statement has empty body}}
diff --git a/clang/test/Sema/illegal-types.c b/clang/test/Sema/illegal-types.c
index 411f27262a7..c932bb28dcc 100644
--- a/clang/test/Sema/illegal-types.c
+++ b/clang/test/Sema/illegal-types.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c++98 %s
+// RUN: clang-cc -fsyntax-only -verify -std=c++98 %s
void a (void []()); // expected-error{{'type name' declared as array of functions}}
void b (void p[]()); // expected-error{{'p' declared as array of functions}}
diff --git a/clang/test/Sema/implicit-builtin-decl.c b/clang/test/Sema/implicit-builtin-decl.c
index e022b6d8fd5..696a2b926c9 100644
--- a/clang/test/Sema/implicit-builtin-decl.c
+++ b/clang/test/Sema/implicit-builtin-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f() {
int *ptr = malloc(sizeof(int) * 10); // expected-warning{{implicitly declaring C library function 'malloc' with type}} \
// expected-note{{please include the header <stdlib.h> or explicitly provide a declaration for 'malloc'}} \
diff --git a/clang/test/Sema/implicit-builtin-freestanding.c b/clang/test/Sema/implicit-builtin-freestanding.c
index f36aa09b5fb..9bd5c05892e 100644
--- a/clang/test/Sema/implicit-builtin-freestanding.c
+++ b/clang/test/Sema/implicit-builtin-freestanding.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -ffreestanding %s
+// RUN: clang-cc -fsyntax-only -verify -ffreestanding %s
int malloc(int a) { return a; }
diff --git a/clang/test/Sema/implicit-builtin-redecl.c b/clang/test/Sema/implicit-builtin-redecl.c
index 2ad35185b25..cd99b545531 100644
--- a/clang/test/Sema/implicit-builtin-redecl.c
+++ b/clang/test/Sema/implicit-builtin-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// PR3592
static void* malloc(int);
diff --git a/clang/test/Sema/implicit-cast.c b/clang/test/Sema/implicit-cast.c
index fe83bd93e33..ce34ad6d1c6 100644
--- a/clang/test/Sema/implicit-cast.c
+++ b/clang/test/Sema/implicit-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
static char *test1(int cf) {
return cf ? "abc" : 0;
diff --git a/clang/test/Sema/implicit-decl.c b/clang/test/Sema/implicit-decl.c
index 91f5dd103f6..8873e76098c 100644
--- a/clang/test/Sema/implicit-decl.c
+++ b/clang/test/Sema/implicit-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
typedef int int32_t;
typedef unsigned char Boolean;
diff --git a/clang/test/Sema/implicit-def.c b/clang/test/Sema/implicit-def.c
index ea42d0c1c80..2c2594680a1 100644
--- a/clang/test/Sema/implicit-def.c
+++ b/clang/test/Sema/implicit-def.c
@@ -1,5 +1,5 @@
-/* RUN: clang -fsyntax-only %s -std=c89 &&
- * RUN: not clang -fsyntax-only %s -std=c99 -pedantic-errors
+/* RUN: clang-cc -fsyntax-only %s -std=c89 &&
+ * RUN: not clang-cc -fsyntax-only %s -std=c99 -pedantic-errors
*/
int A() {
diff --git a/clang/test/Sema/implicit-int.c b/clang/test/Sema/implicit-int.c
index 28962531c96..71a5724a1ff 100644
--- a/clang/test/Sema/implicit-int.c
+++ b/clang/test/Sema/implicit-int.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify -pedantic
+// RUN: clang-cc -fsyntax-only %s -verify -pedantic
foo() { // expected-warning {{type specifier missing, defaults to 'int'}}
}
diff --git a/clang/test/Sema/incompatible-sign.c b/clang/test/Sema/incompatible-sign.c
index 9747327364b..a62f9a8ba70 100644
--- a/clang/test/Sema/incompatible-sign.c
+++ b/clang/test/Sema/incompatible-sign.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
int a(int* x);
int b(unsigned* y) { return a(y); } // expected-warning {{pointer types point to integer types with different sign}}
diff --git a/clang/test/Sema/incomplete-call.c b/clang/test/Sema/incomplete-call.c
index c8b104a47d8..aedfe50bbfd 100644
--- a/clang/test/Sema/incomplete-call.c
+++ b/clang/test/Sema/incomplete-call.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct foo; // expected-note 3 {{forward declaration of 'struct foo'}}
diff --git a/clang/test/Sema/incomplete-decl.c b/clang/test/Sema/incomplete-decl.c
index de957403a3a..8468cf47ab6 100644
--- a/clang/test/Sema/incomplete-decl.c
+++ b/clang/test/Sema/incomplete-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct foo; // expected-note 4 {{forward declaration of 'struct foo'}}
diff --git a/clang/test/Sema/init-struct-qualified.c b/clang/test/Sema/init-struct-qualified.c
index 37637e108c3..539820ae418 100644
--- a/clang/test/Sema/init-struct-qualified.c
+++ b/clang/test/Sema/init-struct-qualified.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify < %s
+// RUN: clang-cc -fsyntax-only -verify < %s
typedef float CGFloat;
typedef struct _NSPoint { CGFloat x; CGFloat y; } NSPoint;
typedef struct _NSSize { CGFloat width; CGFloat height; } NSSize;
diff --git a/clang/test/Sema/init.c b/clang/test/Sema/init.c
index 73c6887889b..9430f312ad6 100644
--- a/clang/test/Sema/init.c
+++ b/clang/test/Sema/init.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
#include <stdint.h>
diff --git a/clang/test/Sema/int-arith-convert.c b/clang/test/Sema/int-arith-convert.c
index c2fad4bfe60..5bbab7d9af9 100644
--- a/clang/test/Sema/int-arith-convert.c
+++ b/clang/test/Sema/int-arith-convert.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple=i686-linux-gnu -fsyntax-only -verify %s
+// RUN: clang-cc -triple=i686-linux-gnu -fsyntax-only -verify %s
// Check types are the same through redeclaration
unsigned long x;
diff --git a/clang/test/Sema/invalid-decl.c b/clang/test/Sema/invalid-decl.c
index 17f316884ee..e9130c80a90 100644
--- a/clang/test/Sema/invalid-decl.c
+++ b/clang/test/Sema/invalid-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
void test() {
char = 4; // expected-error {{expected identifier}}
diff --git a/clang/test/Sema/invalid-init-diag.c b/clang/test/Sema/invalid-init-diag.c
index 8eaefa6cd10..724d0ea368b 100644
--- a/clang/test/Sema/invalid-init-diag.c
+++ b/clang/test/Sema/invalid-init-diag.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
int a;
struct {int x;} x = a; // expected-error {{incompatible type initializing 'int', expected 'struct <anonymous>'}}
diff --git a/clang/test/Sema/invalid-struct-init.c b/clang/test/Sema/invalid-struct-init.c
index 9777a27a0ed..73e2e446f13 100644
--- a/clang/test/Sema/invalid-struct-init.c
+++ b/clang/test/Sema/invalid-struct-init.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
typedef struct _zend_module_entry zend_module_entry;
struct _zend_module_entry {
diff --git a/clang/test/Sema/knr-def-call.c b/clang/test/Sema/knr-def-call.c
index 83a0c5e24cb..0e562d7c7e7 100644
--- a/clang/test/Sema/knr-def-call.c
+++ b/clang/test/Sema/knr-def-call.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// C DR #316, PR 3626.
void f0(a, b, c, d) int a,b,c,d; {}
diff --git a/clang/test/Sema/member-reference.c b/clang/test/Sema/member-reference.c
index b434f5b7793..b810ccf15b7 100644
--- a/clang/test/Sema/member-reference.c
+++ b/clang/test/Sema/member-reference.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
struct simple { int i; };
diff --git a/clang/test/Sema/merge-decls.c b/clang/test/Sema/merge-decls.c
index e6d60c462c2..f4c25f51142 100644
--- a/clang/test/Sema/merge-decls.c
+++ b/clang/test/Sema/merge-decls.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
void foo(void);
void foo(void) {}
diff --git a/clang/test/Sema/ms-fuzzy-asm.c b/clang/test/Sema/ms-fuzzy-asm.c
index 5e387f38083..58dcbcfc523 100644
--- a/clang/test/Sema/ms-fuzzy-asm.c
+++ b/clang/test/Sema/ms-fuzzy-asm.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fms-extensions
+// RUN: clang-cc %s -verify -fms-extensions
#define M __asm int 0x2c
#define M2 int
diff --git a/clang/test/Sema/nested-redef.c b/clang/test/Sema/nested-redef.c
index 0264ad4c58a..53b22d69893 100644
--- a/clang/test/Sema/nested-redef.c
+++ b/clang/test/Sema/nested-redef.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct X { // expected-note{{previous definition is here}}
struct X { } x; // expected-error{{nested redefinition of 'X'}} \
expected-error {{field has incomplete type}}
diff --git a/clang/test/Sema/nonnull.c b/clang/test/Sema/nonnull.c
index 9a64ce4320b..3d9b329abe6 100644
--- a/clang/test/Sema/nonnull.c
+++ b/clang/test/Sema/nonnull.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int f1(int x) __attribute__((nonnull)); // expected-warning{{'nonnull' attribute applied to function with no pointer arguments}}
int f2(int *x) __attribute__ ((nonnull (1)));
diff --git a/clang/test/Sema/offsetof.c b/clang/test/Sema/offsetof.c
index 0d33b775519..5e52de7245a 100644
--- a/clang/test/Sema/offsetof.c
+++ b/clang/test/Sema/offsetof.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER)
diff --git a/clang/test/Sema/overloadable-complex.c b/clang/test/Sema/overloadable-complex.c
index 4df59aa11e7..62b38821334 100644
--- a/clang/test/Sema/overloadable-complex.c
+++ b/clang/test/Sema/overloadable-complex.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
char *foo(float) __attribute__((__overloadable__)); // expected-note 3 {{candidate function}}
void test_foo_1(float fv, double dv, float _Complex fc, double _Complex dc) {
diff --git a/clang/test/Sema/overloadable.c b/clang/test/Sema/overloadable.c
index 20722929662..0d5db3a9845 100644
--- a/clang/test/Sema/overloadable.c
+++ b/clang/test/Sema/overloadable.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int var __attribute__((overloadable)); // expected-error{{'overloadable' attribute can only be applied to a function}}
diff --git a/clang/test/Sema/pointer-addition.c b/clang/test/Sema/pointer-addition.c
index 3a924b00825..87d5eaf39c9 100644
--- a/clang/test/Sema/pointer-addition.c
+++ b/clang/test/Sema/pointer-addition.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
typedef struct S S; // expected-note 3 {{forward declaration of 'struct S'}}
void a(S* b, void* c) {
diff --git a/clang/test/Sema/pointer-subtract-compat.c b/clang/test/Sema/pointer-subtract-compat.c
index 9aebe9cdceb..b3be37e7f18 100644
--- a/clang/test/Sema/pointer-subtract-compat.c
+++ b/clang/test/Sema/pointer-subtract-compat.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
typedef const char rchar;
int a(char* a, rchar* b) {
diff --git a/clang/test/Sema/pragma-pack-2.c b/clang/test/Sema/pragma-pack-2.c
index c86136bf3e0..25be5539783 100644
--- a/clang/test/Sema/pragma-pack-2.c
+++ b/clang/test/Sema/pragma-pack-2.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i686-apple-darwin9 %s -fsyntax-only -verify
+// RUN: clang-cc -triple i686-apple-darwin9 %s -fsyntax-only -verify
#include <stddef.h>
diff --git a/clang/test/Sema/pragma-pack.c b/clang/test/Sema/pragma-pack.c
index a426025cffa..51398fa0a55 100644
--- a/clang/test/Sema/pragma-pack.c
+++ b/clang/test/Sema/pragma-pack.c
@@ -1,4 +1,4 @@
-// RUN: clang -triple i686-apple-darwin9 -fsyntax-only -verify %s
+// RUN: clang-cc -triple i686-apple-darwin9 -fsyntax-only -verify %s
/* expected-warning {{value of #pragma pack(show) == 8}} */ #pragma pack(show)
/* expected-warning {{expected #pragma pack parameter to be}} */ #pragma pack(3)
diff --git a/clang/test/Sema/pragma-unused.c b/clang/test/Sema/pragma-unused.c
index 81818020de3..fe8bf8608bc 100644
--- a/clang/test/Sema/pragma-unused.c
+++ b/clang/test/Sema/pragma-unused.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f1(void) {
int x, y, z;
diff --git a/clang/test/Sema/predef.c b/clang/test/Sema/predef.c
index 097950ccc63..7b3fe5038f9 100644
--- a/clang/test/Sema/predef.c
+++ b/clang/test/Sema/predef.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void abcdefghi12(void) {
const char (*ss)[12] = &__func__;
diff --git a/clang/test/Sema/predefined-function.c b/clang/test/Sema/predefined-function.c
index bce63550ccb..e8ccb3636b8 100644
--- a/clang/test/Sema/predefined-function.c
+++ b/clang/test/Sema/predefined-function.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
char *funk(int format);
enum Test {A=-1};
diff --git a/clang/test/Sema/rdar6248119.m b/clang/test/Sema/rdar6248119.m
index ff402b296d8..631c7b35a99 100644
--- a/clang/test/Sema/rdar6248119.m
+++ b/clang/test/Sema/rdar6248119.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
// Test case for:
// <rdar://problem/6248119> @finally doesn't introduce a new scope
diff --git a/clang/test/Sema/rdr6094103-unordered-compare-promote.c b/clang/test/Sema/rdr6094103-unordered-compare-promote.c
index 7de91f27df6..636f770e3ee 100644
--- a/clang/test/Sema/rdr6094103-unordered-compare-promote.c
+++ b/clang/test/Sema/rdr6094103-unordered-compare-promote.c
@@ -1,4 +1,4 @@
-// RUN: clang -ast-dump %s 2>&1 | grep ImplicitCastExpr | count 2
+// RUN: clang-cc -ast-dump %s 2>&1 | grep ImplicitCastExpr | count 2
int foo (double x, long double y) {
// There needs to be an implicit cast on x here.
diff --git a/clang/test/Sema/recover-goto.c b/clang/test/Sema/recover-goto.c
index 4bb7c51bbf9..e7b9f3c8eaf 100644
--- a/clang/test/Sema/recover-goto.c
+++ b/clang/test/Sema/recover-goto.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
void a() {goto A; // expected-error {{use of undeclared label}}
// expected-error {{expected '}'}}
diff --git a/clang/test/Sema/redefinition.c b/clang/test/Sema/redefinition.c
index 97e04731480..26c90c8e6d4 100644
--- a/clang/test/Sema/redefinition.c
+++ b/clang/test/Sema/redefinition.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
int f(int a) { } // expected-note {{previous definition is here}}
int f(int);
int f(int a) { } // expected-error {{redefinition of 'f'}}
diff --git a/clang/test/Sema/scope-check.c b/clang/test/Sema/scope-check.c
index 71c9d2fd391..20cecbf3f30 100644
--- a/clang/test/Sema/scope-check.c
+++ b/clang/test/Sema/scope-check.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int test1(int x) {
goto L; // expected-error{{illegal jump}}
diff --git a/clang/test/Sema/self-comparison.c b/clang/test/Sema/self-comparison.c
index 8bf54fde9f5..db56e8bf17d 100644
--- a/clang/test/Sema/self-comparison.c
+++ b/clang/test/Sema/self-comparison.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int foo(int x) {
return x == x; // expected-warning {{self-comparison always results}}
diff --git a/clang/test/Sema/sentinel-attribute.c b/clang/test/Sema/sentinel-attribute.c
index 37d0adc5966..e9451b81bc6 100644
--- a/clang/test/Sema/sentinel-attribute.c
+++ b/clang/test/Sema/sentinel-attribute.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int x __attribute__((sentinel)); //expected-warning{{'sentinel' attribute only applies to function or method types}}
void f1(int a, ...) __attribute__ ((sentinel));
diff --git a/clang/test/Sema/shift.c b/clang/test/Sema/shift.c
index d5ae5c1e903..5acbe12ac33 100644
--- a/clang/test/Sema/shift.c
+++ b/clang/test/Sema/shift.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
void test() {
char c;
diff --git a/clang/test/Sema/static-init.c b/clang/test/Sema/static-init.c
index 9ab3146ee76..e6592f3bb65 100644
--- a/clang/test/Sema/static-init.c
+++ b/clang/test/Sema/static-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -arch i386 -fsyntax-only -verify %s
+// RUN: clang-cc -arch i386 -fsyntax-only -verify %s
#include <stdint.h>
diff --git a/clang/test/Sema/stdcall-fastcall.c b/clang/test/Sema/stdcall-fastcall.c
index 4e938f575fb..353bbfc2529 100644
--- a/clang/test/Sema/stdcall-fastcall.c
+++ b/clang/test/Sema/stdcall-fastcall.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// CC qualifier can be applied only to functions
int __attribute__((stdcall)) var1; // expected-warning{{'stdcall' attribute only applies to function types}}
diff --git a/clang/test/Sema/stmt_exprs.c b/clang/test/Sema/stmt_exprs.c
index 10b9e47214a..3af984ada45 100644
--- a/clang/test/Sema/stmt_exprs.c
+++ b/clang/test/Sema/stmt_exprs.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
typedef unsigned __uint32_t;
diff --git a/clang/test/Sema/struct-cast.c b/clang/test/Sema/struct-cast.c
index 734be804e6e..063e8e32c02 100644
--- a/clang/test/Sema/struct-cast.c
+++ b/clang/test/Sema/struct-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
struct S {
int one;
diff --git a/clang/test/Sema/struct-compat.c b/clang/test/Sema/struct-compat.c
index 489ff471fab..35d8fb1aa0c 100644
--- a/clang/test/Sema/struct-compat.c
+++ b/clang/test/Sema/struct-compat.c
@@ -1,4 +1,4 @@
-/* RUN: clang %s -fsyntax-only -pedantic -verify
+/* RUN: clang-cc %s -fsyntax-only -pedantic -verify
*/
extern struct {int a;} x; // expected-note {{previous definition is here}}
diff --git a/clang/test/Sema/struct-decl.c b/clang/test/Sema/struct-decl.c
index 3f95b7a71b8..9d9f5278705 100644
--- a/clang/test/Sema/struct-decl.c
+++ b/clang/test/Sema/struct-decl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// PR3459
struct bar {
char n[1];
diff --git a/clang/test/Sema/struct-packed-align.c b/clang/test/Sema/struct-packed-align.c
index 2b5a889580f..8250c14d442 100644
--- a/clang/test/Sema/struct-packed-align.c
+++ b/clang/test/Sema/struct-packed-align.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// Packed structs.
struct s {
diff --git a/clang/test/Sema/switch.c b/clang/test/Sema/switch.c
index 25e1d4d88a1..5999f342aef 100644
--- a/clang/test/Sema/switch.c
+++ b/clang/test/Sema/switch.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f (int z) {
while (z) {
diff --git a/clang/test/Sema/tentative-decls.c b/clang/test/Sema/tentative-decls.c
index ea8d6225510..3a830bf4283 100644
--- a/clang/test/Sema/tentative-decls.c
+++ b/clang/test/Sema/tentative-decls.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// PR3310
struct a x1; // expected-note 2{{forward declaration of 'struct a'}}
diff --git a/clang/test/Sema/text-diag.c b/clang/test/Sema/text-diag.c
index 2e312918442..19847c6d1e9 100644
--- a/clang/test/Sema/text-diag.c
+++ b/clang/test/Sema/text-diag.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
unsigned char *foo = "texto\
que continua\
e continua";
diff --git a/clang/test/Sema/transparent-union-pointer.c b/clang/test/Sema/transparent-union-pointer.c
index 58597b18096..ea761f17e7d 100644
--- a/clang/test/Sema/transparent-union-pointer.c
+++ b/clang/test/Sema/transparent-union-pointer.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
typedef union {
union wait *__uptr;
diff --git a/clang/test/Sema/type-spec-struct-union.c b/clang/test/Sema/type-spec-struct-union.c
index 47de16be7ac..2b68b787731 100644
--- a/clang/test/Sema/type-spec-struct-union.c
+++ b/clang/test/Sema/type-spec-struct-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
/* This test checks the introduction of struct and union types based
on a type specifier of the form "struct-or-union identifier" when they
diff --git a/clang/test/Sema/typecheck-binop.c b/clang/test/Sema/typecheck-binop.c
index 7977e7e71fc..496bdd3b0f4 100644
--- a/clang/test/Sema/typecheck-binop.c
+++ b/clang/test/Sema/typecheck-binop.c
@@ -1,4 +1,4 @@
-/* RUN: clang %s -fsyntax-only -pedantic -verify
+/* RUN: clang-cc %s -fsyntax-only -pedantic -verify
*/
struct incomplete;
diff --git a/clang/test/Sema/typedef-prototype.c b/clang/test/Sema/typedef-prototype.c
index e646604ae38..fc0e05ead29 100644
--- a/clang/test/Sema/typedef-prototype.c
+++ b/clang/test/Sema/typedef-prototype.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef int unary_int_func(int arg);
unary_int_func add_one;
diff --git a/clang/test/Sema/typedef-redef.c b/clang/test/Sema/typedef-redef.c
index 48c4863513e..9ec622612ec 100644
--- a/clang/test/Sema/typedef-redef.c
+++ b/clang/test/Sema/typedef-redef.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// size_t coming from a system header.
#include <stddef.h>
diff --git a/clang/test/Sema/typedef-retain.c b/clang/test/Sema/typedef-retain.c
index b621743373c..ef9ec76f467 100644
--- a/clang/test/Sema/typedef-retain.c
+++ b/clang/test/Sema/typedef-retain.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -fno-lax-vector-conversions
+// RUN: clang-cc -fsyntax-only -verify %s -fno-lax-vector-conversions
typedef float float4 __attribute__((vector_size(16)));
typedef int int4 __attribute__((vector_size(16)));
diff --git a/clang/test/Sema/typedef-variable-type.c b/clang/test/Sema/typedef-variable-type.c
index 703792fcdc5..7a9bb4879bc 100644
--- a/clang/test/Sema/typedef-variable-type.c
+++ b/clang/test/Sema/typedef-variable-type.c
@@ -1,3 +1,3 @@
-// RUN: clang %s -verify -fsyntax-only -pedantic
+// RUN: clang-cc %s -verify -fsyntax-only -pedantic
typedef int (*a)[!.0]; // expected-warning{{size of static array must be an integer constant expression}}
diff --git a/clang/test/Sema/types.c b/clang/test/Sema/types.c
index da025884613..40dfd89c4fd 100644
--- a/clang/test/Sema/types.c
+++ b/clang/test/Sema/types.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -pedantic -verify
+// RUN: clang-cc %s -pedantic -verify
// rdar://6097662
typedef int (*T)[2];
diff --git a/clang/test/Sema/unnamed-bitfield-init.c b/clang/test/Sema/unnamed-bitfield-init.c
index 3a3869ab6df..249f06e07d9 100644
--- a/clang/test/Sema/unnamed-bitfield-init.c
+++ b/clang/test/Sema/unnamed-bitfield-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef struct {
int a; int : 24; char b;
} S;
diff --git a/clang/test/Sema/unused-expr.c b/clang/test/Sema/unused-expr.c
index a44d1c8fed4..b3d6efb7d37 100644
--- a/clang/test/Sema/unused-expr.c
+++ b/clang/test/Sema/unused-expr.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -fno-math-errno %s
+// RUN: clang-cc -fsyntax-only -verify -fno-math-errno %s
int foo(int X, int Y);
diff --git a/clang/test/Sema/usual-float.c b/clang/test/Sema/usual-float.c
index 9c1977ff242..40c0bde4e0c 100644
--- a/clang/test/Sema/usual-float.c
+++ b/clang/test/Sema/usual-float.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
typedef float CGFloat;
diff --git a/clang/test/Sema/va_arg_x86_64.c b/clang/test/Sema/va_arg_x86_64.c
index 3e51b8628c3..680abb714b9 100644
--- a/clang/test/Sema/va_arg_x86_64.c
+++ b/clang/test/Sema/va_arg_x86_64.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -triple=x86_64-unknown-freebsd7.0 %s
+// RUN: clang-cc -fsyntax-only -verify -triple=x86_64-unknown-freebsd7.0 %s
// PR2631
char* foo(char *fmt, __builtin_va_list ap)
diff --git a/clang/test/Sema/var-redecl.c b/clang/test/Sema/var-redecl.c
index 037a8f136d8..129fd17cd53 100644
--- a/clang/test/Sema/var-redecl.c
+++ b/clang/test/Sema/var-redecl.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int outer1; // expected-note{{previous definition is here}}
extern int outer2; // expected-note{{previous definition is here}}
diff --git a/clang/test/Sema/varargs.c b/clang/test/Sema/varargs.c
index b340177f9c5..434e4ce291d 100644
--- a/clang/test/Sema/varargs.c
+++ b/clang/test/Sema/varargs.c
@@ -1,5 +1,5 @@
-// RUN: clang -fsyntax-only -verify %s &&
-// RUN: clang -fsyntax-only -verify %s -triple x86_64-apple-darwin9
+// RUN: clang-cc -fsyntax-only -verify %s &&
+// RUN: clang-cc -fsyntax-only -verify %s -triple x86_64-apple-darwin9
void f1(int a)
{
diff --git a/clang/test/Sema/vector-assign.c b/clang/test/Sema/vector-assign.c
index 548c08e7e32..3c0cd9020c8 100644
--- a/clang/test/Sema/vector-assign.c
+++ b/clang/test/Sema/vector-assign.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
typedef unsigned int v2u __attribute__ ((vector_size (8)));
typedef signed int v2s __attribute__ ((vector_size (8)));
typedef signed int v1s __attribute__ ((vector_size (4)));
diff --git a/clang/test/Sema/vector-cast.c b/clang/test/Sema/vector-cast.c
index 111430b1c1e..15f29b91e94 100644
--- a/clang/test/Sema/vector-cast.c
+++ b/clang/test/Sema/vector-cast.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s -verify
+// RUN: clang-cc -fsyntax-only %s -verify
typedef long long t1 __attribute__ ((vector_size (8)));
typedef char t2 __attribute__ ((vector_size (16)));
diff --git a/clang/test/Sema/vector-init.c b/clang/test/Sema/vector-init.c
index eb009b9cd59..d0d9cf053ed 100644
--- a/clang/test/Sema/vector-init.c
+++ b/clang/test/Sema/vector-init.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
//typedef __attribute__(( ext_vector_type(4) )) float float4;
typedef float float4 __attribute__((vector_size(16)));
diff --git a/clang/test/Sema/vla.c b/clang/test/Sema/vla.c
index 74ac1346539..252e9ff62e5 100644
--- a/clang/test/Sema/vla.c
+++ b/clang/test/Sema/vla.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only -pedantic
+// RUN: clang-cc %s -verify -fsyntax-only -pedantic
int test1() {
typedef int x[test1()]; // vla
diff --git a/clang/test/Sema/void_arg.c b/clang/test/Sema/void_arg.c
index d0571fc4e12..6799146a5ff 100644
--- a/clang/test/Sema/void_arg.c
+++ b/clang/test/Sema/void_arg.c
@@ -1,4 +1,4 @@
-/* RUN: clang -fsyntax-only %s -verify
+/* RUN: clang-cc -fsyntax-only %s -verify
*/
typedef void Void;
diff --git a/clang/test/Sema/warn-freestanding-complex.c b/clang/test/Sema/warn-freestanding-complex.c
index aa59b955c9c..a4d3f5be318 100644
--- a/clang/test/Sema/warn-freestanding-complex.c
+++ b/clang/test/Sema/warn-freestanding-complex.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -ffreestanding -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -ffreestanding -pedantic -verify %s
void foo(float _Complex c) { // expected-warning{{complex numbers are an extension in a freestanding C99 implementation}}
}
diff --git a/clang/test/Sema/wchar.c b/clang/test/Sema/wchar.c
index b7171fec7a5..16376009ab1 100644
--- a/clang/test/Sema/wchar.c
+++ b/clang/test/Sema/wchar.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
#include <wchar.h>
int check_wchar_size[sizeof(*L"") == sizeof(wchar_t) ? 1 : -1];
diff --git a/clang/test/SemaCXX/__null.cpp b/clang/test/SemaCXX/__null.cpp
index 798e0aa99d1..4672801fd7b 100644
--- a/clang/test/SemaCXX/__null.cpp
+++ b/clang/test/SemaCXX/__null.cpp
@@ -1,5 +1,5 @@
-// RUN: clang -triple x86_64-unknown-unknown %s -fsyntax-only -verify &&
-// RUN: clang -triple i686-unknown-unknown %s -fsyntax-only -verify
+// RUN: clang-cc -triple x86_64-unknown-unknown %s -fsyntax-only -verify &&
+// RUN: clang-cc -triple i686-unknown-unknown %s -fsyntax-only -verify
void f() {
int* i = __null;
diff --git a/clang/test/SemaCXX/abstract.cpp b/clang/test/SemaCXX/abstract.cpp
index dfe0a657982..02305881394 100644
--- a/clang/test/SemaCXX/abstract.cpp
+++ b/clang/test/SemaCXX/abstract.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -std=c++0x
+// RUN: clang-cc -fsyntax-only -verify %s -std=c++0x
#ifndef __GXX_EXPERIMENTAL_CXX0X__
#define __CONCAT(__X, __Y) __CONCAT1(__X, __Y)
diff --git a/clang/test/SemaCXX/addr-of-overloaded-function.cpp b/clang/test/SemaCXX/addr-of-overloaded-function.cpp
index 2184116dd2d..9c9f0e19ef3 100644
--- a/clang/test/SemaCXX/addr-of-overloaded-function.cpp
+++ b/clang/test/SemaCXX/addr-of-overloaded-function.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int f(double);
int f(int);
diff --git a/clang/test/SemaCXX/address-of.cpp b/clang/test/SemaCXX/address-of.cpp
index 3d0e57f6e3a..4e436d6e98b 100644
--- a/clang/test/SemaCXX/address-of.cpp
+++ b/clang/test/SemaCXX/address-of.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// PR clang/3175
void bar(int*);
diff --git a/clang/test/SemaCXX/aggregate-initialization.cpp b/clang/test/SemaCXX/aggregate-initialization.cpp
index 75b872feb01..c96eda44803 100644
--- a/clang/test/SemaCXX/aggregate-initialization.cpp
+++ b/clang/test/SemaCXX/aggregate-initialization.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c++98 %s
+// RUN: clang-cc -fsyntax-only -verify -std=c++98 %s
// Verify that we can't initialize non-aggregates with an initializer
// list.
diff --git a/clang/test/SemaCXX/anonymous-union.cpp b/clang/test/SemaCXX/anonymous-union.cpp
index 5860ed4af78..f77fa03328f 100644
--- a/clang/test/SemaCXX/anonymous-union.cpp
+++ b/clang/test/SemaCXX/anonymous-union.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct X {
union {
float f3;
diff --git a/clang/test/SemaCXX/attr-unavailable.cpp b/clang/test/SemaCXX/attr-unavailable.cpp
index 78e348ae1f6..8e5f76bcacf 100644
--- a/clang/test/SemaCXX/attr-unavailable.cpp
+++ b/clang/test/SemaCXX/attr-unavailable.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int &foo(int);
double &foo(double);
diff --git a/clang/test/SemaCXX/basic_lookup_argdep.cpp b/clang/test/SemaCXX/basic_lookup_argdep.cpp
index 53448d119a8..486a688d943 100644
--- a/clang/test/SemaCXX/basic_lookup_argdep.cpp
+++ b/clang/test/SemaCXX/basic_lookup_argdep.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
namespace N {
struct X { };
diff --git a/clang/test/SemaCXX/blocks.cpp b/clang/test/SemaCXX/blocks.cpp
index 8b4b3aeb88c..837fb0423b9 100644
--- a/clang/test/SemaCXX/blocks.cpp
+++ b/clang/test/SemaCXX/blocks.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -fblocks
+// RUN: clang-cc -fsyntax-only -verify %s -fblocks
void tovoid(void*);
diff --git a/clang/test/SemaCXX/bool.cpp b/clang/test/SemaCXX/bool.cpp
index e606a518d7f..c5ad30e471c 100644
--- a/clang/test/SemaCXX/bool.cpp
+++ b/clang/test/SemaCXX/bool.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Bool literals can be enum values.
enum {
diff --git a/clang/test/SemaCXX/carbon.cpp b/clang/test/SemaCXX/carbon.cpp
index 9c9c3780403..983a000b2cf 100644
--- a/clang/test/SemaCXX/carbon.cpp
+++ b/clang/test/SemaCXX/carbon.cpp
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -print-stats
+// RUN: clang-cc %s -fsyntax-only -print-stats
#ifdef __APPLE__
#include <Carbon/Carbon.h>
#endif
diff --git a/clang/test/SemaCXX/class-names.cpp b/clang/test/SemaCXX/class-names.cpp
index 1166b1016ec..a5569c0c767 100644
--- a/clang/test/SemaCXX/class-names.cpp
+++ b/clang/test/SemaCXX/class-names.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class C { };
C c;
diff --git a/clang/test/SemaCXX/class.cpp b/clang/test/SemaCXX/class.cpp
index 628253b4953..d2a8114f7b0 100644
--- a/clang/test/SemaCXX/class.cpp
+++ b/clang/test/SemaCXX/class.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class C {
public:
auto int errx; // expected-error {{error: storage class specified for a member declaration}}
diff --git a/clang/test/SemaCXX/complex-overload.cpp b/clang/test/SemaCXX/complex-overload.cpp
index 300d3499b3f..55d3c76d063 100644
--- a/clang/test/SemaCXX/complex-overload.cpp
+++ b/clang/test/SemaCXX/complex-overload.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
char *foo(float); // expected-note 3 {{candidate function}}
void test_foo_1(float fv, double dv, float _Complex fc, double _Complex dc) {
diff --git a/clang/test/SemaCXX/condition.cpp b/clang/test/SemaCXX/condition.cpp
index babb8271088..7c9cee59da6 100644
--- a/clang/test/SemaCXX/condition.cpp
+++ b/clang/test/SemaCXX/condition.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void test() {
int x;
diff --git a/clang/test/SemaCXX/const-cast.cpp b/clang/test/SemaCXX/const-cast.cpp
index 8424cf28d98..39d61db0dc9 100644
--- a/clang/test/SemaCXX/const-cast.cpp
+++ b/clang/test/SemaCXX/const-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct A {};
diff --git a/clang/test/SemaCXX/constructor-initializer.cpp b/clang/test/SemaCXX/constructor-initializer.cpp
index ded90107495..81d56eac9c3 100644
--- a/clang/test/SemaCXX/constructor-initializer.cpp
+++ b/clang/test/SemaCXX/constructor-initializer.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class A {
int m;
};
diff --git a/clang/test/SemaCXX/constructor.cpp b/clang/test/SemaCXX/constructor.cpp
index 68099ecac96..4e3f4177c40 100644
--- a/clang/test/SemaCXX/constructor.cpp
+++ b/clang/test/SemaCXX/constructor.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef int INT;
class Foo {
diff --git a/clang/test/SemaCXX/conversion-function.cpp b/clang/test/SemaCXX/conversion-function.cpp
index f9dd6005b90..b5dca080d44 100644
--- a/clang/test/SemaCXX/conversion-function.cpp
+++ b/clang/test/SemaCXX/conversion-function.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class X {
public:
operator bool();
diff --git a/clang/test/SemaCXX/convert-to-bool.cpp b/clang/test/SemaCXX/convert-to-bool.cpp
index 74d925a3d58..638afd0555b 100644
--- a/clang/test/SemaCXX/convert-to-bool.cpp
+++ b/clang/test/SemaCXX/convert-to-bool.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct ConvToBool {
operator bool() const;
};
diff --git a/clang/test/SemaCXX/converting-constructor.cpp b/clang/test/SemaCXX/converting-constructor.cpp
index edded175822..59b793e3f28 100644
--- a/clang/test/SemaCXX/converting-constructor.cpp
+++ b/clang/test/SemaCXX/converting-constructor.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class Z { };
class Y {
diff --git a/clang/test/SemaCXX/copy-initialization.cpp b/clang/test/SemaCXX/copy-initialization.cpp
index a56a886f55d..5b1fbaa4605 100644
--- a/clang/test/SemaCXX/copy-initialization.cpp
+++ b/clang/test/SemaCXX/copy-initialization.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class X {
public:
explicit X(const X&);
diff --git a/clang/test/SemaCXX/dcl_init_aggr.cpp b/clang/test/SemaCXX/dcl_init_aggr.cpp
index bed526d399a..10c15ccc906 100644
--- a/clang/test/SemaCXX/dcl_init_aggr.cpp
+++ b/clang/test/SemaCXX/dcl_init_aggr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
// C++ [dcl.init.aggr]p2
struct A {
int x;
diff --git a/clang/test/SemaCXX/decl-expr-ambiguity.cpp b/clang/test/SemaCXX/decl-expr-ambiguity.cpp
index 0cc9d7e0558..227834a26a4 100644
--- a/clang/test/SemaCXX/decl-expr-ambiguity.cpp
+++ b/clang/test/SemaCXX/decl-expr-ambiguity.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic-errors %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic-errors %s
void f() {
int a;
diff --git a/clang/test/SemaCXX/default1.cpp b/clang/test/SemaCXX/default1.cpp
index 28444207d86..be264ad62b1 100644
--- a/clang/test/SemaCXX/default1.cpp
+++ b/clang/test/SemaCXX/default1.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f(int i);
void f(int i = 0); // expected-note {{previous definition is here}}
void f(int i = 17); // expected-error {{redefinition of default argument}}
diff --git a/clang/test/SemaCXX/default2.cpp b/clang/test/SemaCXX/default2.cpp
index f3d726fbeed..f99e45415dc 100644
--- a/clang/test/SemaCXX/default2.cpp
+++ b/clang/test/SemaCXX/default2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f(int i, int j, int k = 3);
void f(int i, int j, int k);
diff --git a/clang/test/SemaCXX/dependent-types.cpp b/clang/test/SemaCXX/dependent-types.cpp
index a5d23ffaa48..b2a5c45787c 100644
--- a/clang/test/SemaCXX/dependent-types.cpp
+++ b/clang/test/SemaCXX/dependent-types.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
template<typename T, int Size> void f() {
T x1;
diff --git a/clang/test/SemaCXX/derived-to-base-ambig.cpp b/clang/test/SemaCXX/derived-to-base-ambig.cpp
index fa9fff48a9f..e15ddde9d91 100644
--- a/clang/test/SemaCXX/derived-to-base-ambig.cpp
+++ b/clang/test/SemaCXX/derived-to-base-ambig.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class A { };
class B : public A { };
class C : public A { };
diff --git a/clang/test/SemaCXX/destructor.cpp b/clang/test/SemaCXX/destructor.cpp
index f5b35cbfd39..3ba5fd59466 100644
--- a/clang/test/SemaCXX/destructor.cpp
+++ b/clang/test/SemaCXX/destructor.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class A {
public:
~A();
diff --git a/clang/test/SemaCXX/direct-initializer.cpp b/clang/test/SemaCXX/direct-initializer.cpp
index 8f4fbb2db6f..149b65c8d71 100644
--- a/clang/test/SemaCXX/direct-initializer.cpp
+++ b/clang/test/SemaCXX/direct-initializer.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int x(1);
int (x2)(1);
diff --git a/clang/test/SemaCXX/do-while-scope.cpp b/clang/test/SemaCXX/do-while-scope.cpp
index 8adaadedc43..4e4a48325c1 100644
--- a/clang/test/SemaCXX/do-while-scope.cpp
+++ b/clang/test/SemaCXX/do-while-scope.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void test() {
int x;
diff --git a/clang/test/SemaCXX/dynamic-cast.cpp b/clang/test/SemaCXX/dynamic-cast.cpp
index 1fa8c3dc2a3..42c5e0132a8 100644
--- a/clang/test/SemaCXX/dynamic-cast.cpp
+++ b/clang/test/SemaCXX/dynamic-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct A {};
struct B : A {};
diff --git a/clang/test/SemaCXX/elaborated-type-specifier.cpp b/clang/test/SemaCXX/elaborated-type-specifier.cpp
index fe4e210814c..c7bf46a5b14 100644
--- a/clang/test/SemaCXX/elaborated-type-specifier.cpp
+++ b/clang/test/SemaCXX/elaborated-type-specifier.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Test the use of elaborated-type-specifiers to inject the names of
// structs (or classes or unions) into an outer scope as described in
diff --git a/clang/test/SemaCXX/enum.cpp b/clang/test/SemaCXX/enum.cpp
index 96571134293..9668c84693d 100644
--- a/clang/test/SemaCXX/enum.cpp
+++ b/clang/test/SemaCXX/enum.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
enum E {
Val1,
Val2
diff --git a/clang/test/SemaCXX/expressions.cpp b/clang/test/SemaCXX/expressions.cpp
index 23983a1dbd0..6a2f30d33e5 100644
--- a/clang/test/SemaCXX/expressions.cpp
+++ b/clang/test/SemaCXX/expressions.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void choice(int);
int choice(bool);
diff --git a/clang/test/SemaCXX/fntype-decl.cpp b/clang/test/SemaCXX/fntype-decl.cpp
index 51aeab85f98..ae85ff45353 100644
--- a/clang/test/SemaCXX/fntype-decl.cpp
+++ b/clang/test/SemaCXX/fntype-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// PR2942
typedef void fn(int);
diff --git a/clang/test/SemaCXX/function-redecl.cpp b/clang/test/SemaCXX/function-redecl.cpp
index baad312a155..9f6783731d3 100644
--- a/clang/test/SemaCXX/function-redecl.cpp
+++ b/clang/test/SemaCXX/function-redecl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int foo(int);
namespace N {
diff --git a/clang/test/SemaCXX/function-type-qual.cpp b/clang/test/SemaCXX/function-type-qual.cpp
index dd3e550e1d7..f1d5aac7fc9 100644
--- a/clang/test/SemaCXX/function-type-qual.cpp
+++ b/clang/test/SemaCXX/function-type-qual.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f() const; // expected-error {{type qualifier is not allowed on this function}}
diff --git a/clang/test/SemaCXX/functional-cast.cpp b/clang/test/SemaCXX/functional-cast.cpp
index 9db742e732f..0be7ddb53ae 100644
--- a/clang/test/SemaCXX/functional-cast.cpp
+++ b/clang/test/SemaCXX/functional-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct SimpleValueInit {
int i;
diff --git a/clang/test/SemaCXX/i-c-e-cxx.cpp b/clang/test/SemaCXX/i-c-e-cxx.cpp
index 64ffe8bce8d..32d04e2da40 100644
--- a/clang/test/SemaCXX/i-c-e-cxx.cpp
+++ b/clang/test/SemaCXX/i-c-e-cxx.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// C++-specific tests for integral constant expressions.
diff --git a/clang/test/SemaCXX/implicit-int.cpp b/clang/test/SemaCXX/implicit-int.cpp
index f771810e6fa..6fa8dd3463d 100644
--- a/clang/test/SemaCXX/implicit-int.cpp
+++ b/clang/test/SemaCXX/implicit-int.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
x; // expected-error{{C++ requires a type specifier for all declarations}}
diff --git a/clang/test/SemaCXX/inherit.cpp b/clang/test/SemaCXX/inherit.cpp
index 7e04052c402..eaad97cc82a 100644
--- a/clang/test/SemaCXX/inherit.cpp
+++ b/clang/test/SemaCXX/inherit.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class A { };
class B1 : A { };
diff --git a/clang/test/SemaCXX/linkage-spec.cpp b/clang/test/SemaCXX/linkage-spec.cpp
index 6f25da0cd6a..40f3221667a 100644
--- a/clang/test/SemaCXX/linkage-spec.cpp
+++ b/clang/test/SemaCXX/linkage-spec.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
extern "C" {
extern "C" void f(int);
}
diff --git a/clang/test/SemaCXX/member-expr.cpp b/clang/test/SemaCXX/member-expr.cpp
index d5f9347ece3..58e5be955f6 100644
--- a/clang/test/SemaCXX/member-expr.cpp
+++ b/clang/test/SemaCXX/member-expr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class X{
public:
diff --git a/clang/test/SemaCXX/member-name-lookup.cpp b/clang/test/SemaCXX/member-name-lookup.cpp
index 3203067c1e9..871bc994568 100644
--- a/clang/test/SemaCXX/member-name-lookup.cpp
+++ b/clang/test/SemaCXX/member-name-lookup.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// XFAIL
// fails due to exact diagnostic matching
diff --git a/clang/test/SemaCXX/member-pointer.cpp b/clang/test/SemaCXX/member-pointer.cpp
index 449ff9f73d8..daee25533fd 100644
--- a/clang/test/SemaCXX/member-pointer.cpp
+++ b/clang/test/SemaCXX/member-pointer.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct A {};
enum B { Dummy };
diff --git a/clang/test/SemaCXX/ms-exception-spec.cpp b/clang/test/SemaCXX/ms-exception-spec.cpp
index ec4e29a89fd..b84ea178e1e 100644
--- a/clang/test/SemaCXX/ms-exception-spec.cpp
+++ b/clang/test/SemaCXX/ms-exception-spec.cpp
@@ -1,3 +1,3 @@
-// RUN: clang %s -fsyntax-only -verify -fms-extensions
+// RUN: clang-cc %s -fsyntax-only -verify -fms-extensions
void f() throw(...) { }
diff --git a/clang/test/SemaCXX/namespace.cpp b/clang/test/SemaCXX/namespace.cpp
index ea7737e8a94..24a0a4603d7 100644
--- a/clang/test/SemaCXX/namespace.cpp
+++ b/clang/test/SemaCXX/namespace.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
namespace A { // expected-note 2 {{previous definition is here}}
int A;
void f() { A = 0; }
diff --git a/clang/test/SemaCXX/nested-name-spec.cpp b/clang/test/SemaCXX/nested-name-spec.cpp
index 4b4d435f209..7aaa99175f0 100644
--- a/clang/test/SemaCXX/nested-name-spec.cpp
+++ b/clang/test/SemaCXX/nested-name-spec.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -std=c++98 -verify %s
+// RUN: clang-cc -fsyntax-only -std=c++98 -verify %s
namespace A {
struct C {
static int cx;
diff --git a/clang/test/SemaCXX/new-delete.cpp b/clang/test/SemaCXX/new-delete.cpp
index 76112641aff..5037a8d3245 100644
--- a/clang/test/SemaCXX/new-delete.cpp
+++ b/clang/test/SemaCXX/new-delete.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#include <stddef.h>
diff --git a/clang/test/SemaCXX/no-implicit-builtin-decls.cpp b/clang/test/SemaCXX/no-implicit-builtin-decls.cpp
index 8a0df9403a0..bd11f92f7e6 100644
--- a/clang/test/SemaCXX/no-implicit-builtin-decls.cpp
+++ b/clang/test/SemaCXX/no-implicit-builtin-decls.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f() {
void *p = malloc(sizeof(int) * 10); // expected-error{{no matching function for call to 'malloc'}}
diff --git a/clang/test/SemaCXX/overload-call-copycon.cpp b/clang/test/SemaCXX/overload-call-copycon.cpp
index 281f4ce3435..755e27adbac 100644
--- a/clang/test/SemaCXX/overload-call-copycon.cpp
+++ b/clang/test/SemaCXX/overload-call-copycon.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
class X { };
int& copycon(X x);
diff --git a/clang/test/SemaCXX/overload-call.cpp b/clang/test/SemaCXX/overload-call.cpp
index eed8223862d..94f352efc76 100644
--- a/clang/test/SemaCXX/overload-call.cpp
+++ b/clang/test/SemaCXX/overload-call.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
int* f(int) { return 0; }
float* f(float) { return 0; }
void f();
diff --git a/clang/test/SemaCXX/overload-decl.cpp b/clang/test/SemaCXX/overload-decl.cpp
index 96378bafb33..2bc832f558f 100644
--- a/clang/test/SemaCXX/overload-decl.cpp
+++ b/clang/test/SemaCXX/overload-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f();
void f(int);
void f(int, float);
diff --git a/clang/test/SemaCXX/overload-member-call.cpp b/clang/test/SemaCXX/overload-member-call.cpp
index 07936e7eecc..96e570da654 100644
--- a/clang/test/SemaCXX/overload-member-call.cpp
+++ b/clang/test/SemaCXX/overload-member-call.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct X {
int& f(int) const; // expected-note 2 {{candidate function}}
diff --git a/clang/test/SemaCXX/overloaded-builtin-operators.cpp b/clang/test/SemaCXX/overloaded-builtin-operators.cpp
index 242493076c7..5989dc27263 100644
--- a/clang/test/SemaCXX/overloaded-builtin-operators.cpp
+++ b/clang/test/SemaCXX/overloaded-builtin-operators.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct yes;
struct no;
diff --git a/clang/test/SemaCXX/overloaded-operator-decl.cpp b/clang/test/SemaCXX/overloaded-operator-decl.cpp
index 8008b200074..fc17faf6634 100644
--- a/clang/test/SemaCXX/overloaded-operator-decl.cpp
+++ b/clang/test/SemaCXX/overloaded-operator-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct X {
X();
X(int);
diff --git a/clang/test/SemaCXX/overloaded-operator.cpp b/clang/test/SemaCXX/overloaded-operator.cpp
index d51354e1699..2bf8a35d8bf 100644
--- a/clang/test/SemaCXX/overloaded-operator.cpp
+++ b/clang/test/SemaCXX/overloaded-operator.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class X { };
X operator+(X, X);
diff --git a/clang/test/SemaCXX/qualification-conversion.cpp b/clang/test/SemaCXX/qualification-conversion.cpp
index 689a7b37a56..01e503ddac6 100644
--- a/clang/test/SemaCXX/qualification-conversion.cpp
+++ b/clang/test/SemaCXX/qualification-conversion.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
int* quals1(int const * p);
int* quals2(int const * const * pp);
int* quals3(int const * * const * ppp); // expected-note{{candidate function}}
diff --git a/clang/test/SemaCXX/qualified-id-lookup.cpp b/clang/test/SemaCXX/qualified-id-lookup.cpp
index 2783710fcbd..254a18de1f3 100644
--- a/clang/test/SemaCXX/qualified-id-lookup.cpp
+++ b/clang/test/SemaCXX/qualified-id-lookup.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
namespace Ns {
int f(); // expected-note{{previous declaration is here}}
diff --git a/clang/test/SemaCXX/qualified-names-diag.cpp b/clang/test/SemaCXX/qualified-names-diag.cpp
index cb82f3189c7..a1591d01d45 100644
--- a/clang/test/SemaCXX/qualified-names-diag.cpp
+++ b/clang/test/SemaCXX/qualified-names-diag.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
namespace foo {
namespace wibble {
struct x { int y; };
diff --git a/clang/test/SemaCXX/qualified-names-print.cpp b/clang/test/SemaCXX/qualified-names-print.cpp
index 902655238ba..1cb19f0312e 100644
--- a/clang/test/SemaCXX/qualified-names-print.cpp
+++ b/clang/test/SemaCXX/qualified-names-print.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s 2>&1 | grep "N::M::X<INT>::value"
+// RUN: clang-cc -ast-print %s 2>&1 | grep "N::M::X<INT>::value"
namespace N {
namespace M {
template<typename T>
diff --git a/clang/test/SemaCXX/references.cpp b/clang/test/SemaCXX/references.cpp
index 8ee7745b925..9067a8661d7 100644
--- a/clang/test/SemaCXX/references.cpp
+++ b/clang/test/SemaCXX/references.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int g(int);
void f() {
diff --git a/clang/test/SemaCXX/reinterpret-cast.cpp b/clang/test/SemaCXX/reinterpret-cast.cpp
index e6d635242da..fd5ca8cf39d 100644
--- a/clang/test/SemaCXX/reinterpret-cast.cpp
+++ b/clang/test/SemaCXX/reinterpret-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
enum test { testval = 1 };
struct structure { int m; };
diff --git a/clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp b/clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp
index b39d1f0a69a..16b8659711e 100644
--- a/clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp
+++ b/clang/test/SemaCXX/reinterpret-fn-obj-pedantic.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c++98 -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -std=c++98 -pedantic %s
void fnptrs()
{
diff --git a/clang/test/SemaCXX/return-stack-addr.cpp b/clang/test/SemaCXX/return-stack-addr.cpp
index 9eadac7edd3..457de297b00 100644
--- a/clang/test/SemaCXX/return-stack-addr.cpp
+++ b/clang/test/SemaCXX/return-stack-addr.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int* ret_local() {
int x = 1;
diff --git a/clang/test/SemaCXX/rval-references.cpp b/clang/test/SemaCXX/rval-references.cpp
index df468147539..d3057602a08 100644
--- a/clang/test/SemaCXX/rval-references.cpp
+++ b/clang/test/SemaCXX/rval-references.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -std=c++0x %s
+// RUN: clang-cc -fsyntax-only -verify -std=c++0x %s
typedef int&& irr;
typedef irr& ilr_c1; // Collapses to int&
diff --git a/clang/test/SemaCXX/statements.cpp b/clang/test/SemaCXX/statements.cpp
index bfd8af5fa97..d6925fe032e 100644
--- a/clang/test/SemaCXX/statements.cpp
+++ b/clang/test/SemaCXX/statements.cpp
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -pedantic
+// RUN: clang-cc %s -fsyntax-only -pedantic
void foo() {
return foo();
diff --git a/clang/test/SemaCXX/static-assert.cpp b/clang/test/SemaCXX/static-assert.cpp
index 7e1ee467adf..caf76033af7 100644
--- a/clang/test/SemaCXX/static-assert.cpp
+++ b/clang/test/SemaCXX/static-assert.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -std=c++0x
+// RUN: clang-cc -fsyntax-only -verify %s -std=c++0x
int f();
diff --git a/clang/test/SemaCXX/static-cast.cpp b/clang/test/SemaCXX/static-cast.cpp
index bf7561d1d8e..8399e77085b 100644
--- a/clang/test/SemaCXX/static-cast.cpp
+++ b/clang/test/SemaCXX/static-cast.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct A {};
struct B : public A {}; // Single public base.
diff --git a/clang/test/SemaCXX/static-initializers.cpp b/clang/test/SemaCXX/static-initializers.cpp
index 0da412ab290..3d92a532ae1 100644
--- a/clang/test/SemaCXX/static-initializers.cpp
+++ b/clang/test/SemaCXX/static-initializers.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int f()
{
return 10;
diff --git a/clang/test/SemaCXX/template-specialization.cpp b/clang/test/SemaCXX/template-specialization.cpp
index 5442514abc9..b3bb08d7e6a 100644
--- a/clang/test/SemaCXX/template-specialization.cpp
+++ b/clang/test/SemaCXX/template-specialization.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<int N> void f(int (&array)[N]);
template<> void f<1>(int (&array)[1]) { }
diff --git a/clang/test/SemaCXX/this.cpp b/clang/test/SemaCXX/this.cpp
index b8bf4b7d3aa..0577d3c2b9b 100644
--- a/clang/test/SemaCXX/this.cpp
+++ b/clang/test/SemaCXX/this.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
int x = this; // expected-error {{error: invalid use of 'this' outside of a nonstatic member function}}
void f() {
diff --git a/clang/test/SemaCXX/try-catch.cpp b/clang/test/SemaCXX/try-catch.cpp
index cb5d0f84548..653deaa5fbc 100644
--- a/clang/test/SemaCXX/try-catch.cpp
+++ b/clang/test/SemaCXX/try-catch.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct A; // expected-note 3 {{forward declaration of 'struct A'}}
diff --git a/clang/test/SemaCXX/type-convert-construct.cpp b/clang/test/SemaCXX/type-convert-construct.cpp
index 64191a29d93..1840456bde8 100644
--- a/clang/test/SemaCXX/type-convert-construct.cpp
+++ b/clang/test/SemaCXX/type-convert-construct.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f() {
float v1 = float(1);
diff --git a/clang/test/SemaCXX/type-dependent-exprs.cpp b/clang/test/SemaCXX/type-dependent-exprs.cpp
index 7c2de699127..dd31ef020c6 100644
--- a/clang/test/SemaCXX/type-dependent-exprs.cpp
+++ b/clang/test/SemaCXX/type-dependent-exprs.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class X {
public:
virtual int f();
diff --git a/clang/test/SemaCXX/type-traits.cpp b/clang/test/SemaCXX/type-traits.cpp
index d008b01c34b..1a2e329b2a4 100644
--- a/clang/test/SemaCXX/type-traits.cpp
+++ b/clang/test/SemaCXX/type-traits.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#define T(b) (b) ? 1 : -1
#define F(b) (b) ? -1 : 1
diff --git a/clang/test/SemaCXX/typedef-redecl.cpp b/clang/test/SemaCXX/typedef-redecl.cpp
index c7e7d45284c..10be77cd1a6 100644
--- a/clang/test/SemaCXX/typedef-redecl.cpp
+++ b/clang/test/SemaCXX/typedef-redecl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef int INT;
typedef INT REALLY_INT; // expected-note {{previous definition is here}}
typedef REALLY_INT REALLY_REALLY_INT;
diff --git a/clang/test/SemaCXX/typeid.cpp b/clang/test/SemaCXX/typeid.cpp
index 80a70a7b562..f9ad7592187 100644
--- a/clang/test/SemaCXX/typeid.cpp
+++ b/clang/test/SemaCXX/typeid.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
void f()
{
diff --git a/clang/test/SemaCXX/user-defined-conversions.cpp b/clang/test/SemaCXX/user-defined-conversions.cpp
index c6941b947ee..0a4bb773d39 100644
--- a/clang/test/SemaCXX/user-defined-conversions.cpp
+++ b/clang/test/SemaCXX/user-defined-conversions.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct X {
operator bool();
};
diff --git a/clang/test/SemaCXX/using-directive.cpp b/clang/test/SemaCXX/using-directive.cpp
index 505c06d4605..767b49b76f3 100644
--- a/clang/test/SemaCXX/using-directive.cpp
+++ b/clang/test/SemaCXX/using-directive.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// XFAIL
// fails due to exact diagnostic matching
diff --git a/clang/test/SemaCXX/vararg-non-pod.cpp b/clang/test/SemaCXX/vararg-non-pod.cpp
index ac108e6ad55..1c5fe74a154 100644
--- a/clang/test/SemaCXX/vararg-non-pod.cpp
+++ b/clang/test/SemaCXX/vararg-non-pod.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -fblocks %s
+// RUN: clang-cc -fsyntax-only -verify -fblocks %s
extern char version[];
diff --git a/clang/test/SemaCXX/virtuals.cpp b/clang/test/SemaCXX/virtuals.cpp
index ad82edd5d8b..c2ac77b3047 100644
--- a/clang/test/SemaCXX/virtuals.cpp
+++ b/clang/test/SemaCXX/virtuals.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class A {
virtual void f();
diff --git a/clang/test/SemaCXX/warn-for-var-in-else.cpp b/clang/test/SemaCXX/warn-for-var-in-else.cpp
index dfbf35d17b2..3368da223a4 100644
--- a/clang/test/SemaCXX/warn-for-var-in-else.cpp
+++ b/clang/test/SemaCXX/warn-for-var-in-else.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// rdar://6425550
int bar();
void do_something(int);
diff --git a/clang/test/SemaCXX/wchar_t.cpp b/clang/test/SemaCXX/wchar_t.cpp
index e3cd77a195f..fc258da7d1a 100644
--- a/clang/test/SemaCXX/wchar_t.cpp
+++ b/clang/test/SemaCXX/wchar_t.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
wchar_t x;
void f(wchar_t p) {
diff --git a/clang/test/SemaObjC/DoubleMethod.m b/clang/test/SemaObjC/DoubleMethod.m
index 07e89120fb8..e43c1a0ab03 100644
--- a/clang/test/SemaObjC/DoubleMethod.m
+++ b/clang/test/SemaObjC/DoubleMethod.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Subclass
{
diff --git a/clang/test/SemaObjC/access-property-getter.m b/clang/test/SemaObjC/access-property-getter.m
index 903f53c25ea..50a30168890 100644
--- a/clang/test/SemaObjC/access-property-getter.m
+++ b/clang/test/SemaObjC/access-property-getter.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
@protocol NSObject
- (oneway void)release;
diff --git a/clang/test/SemaObjC/alias-test-1.m b/clang/test/SemaObjC/alias-test-1.m
index 6a33b98b366..39358cd62a6 100644
--- a/clang/test/SemaObjC/alias-test-1.m
+++ b/clang/test/SemaObjC/alias-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@compatibility_alias alias4 foo; // expected-warning {{cannot find interface declaration for 'foo'}}
diff --git a/clang/test/SemaObjC/alias-test-2.m b/clang/test/SemaObjC/alias-test-2.m
index 4eb2007d197..e0baf4e4d37 100644
--- a/clang/test/SemaObjC/alias-test-2.m
+++ b/clang/test/SemaObjC/alias-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Note: GCC doesn't produce any of the following errors.
@interface Super @end // expected-note {{previous definition is here}}
diff --git a/clang/test/SemaObjC/argument-checking.m b/clang/test/SemaObjC/argument-checking.m
index 820a2f09c79..1b6c10d29c6 100644
--- a/clang/test/SemaObjC/argument-checking.m
+++ b/clang/test/SemaObjC/argument-checking.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
struct S { int a; };
diff --git a/clang/test/SemaObjC/at-defs.m b/clang/test/SemaObjC/at-defs.m
index 5bbdd6a715e..4aa56c4e889 100644
--- a/clang/test/SemaObjC/at-defs.m
+++ b/clang/test/SemaObjC/at-defs.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
@interface Test {
double a;
diff --git a/clang/test/SemaObjC/attr-cleanup.m b/clang/test/SemaObjC/attr-cleanup.m
index 8490e6dd604..f4d057b2b83 100644
--- a/clang/test/SemaObjC/attr-cleanup.m
+++ b/clang/test/SemaObjC/attr-cleanup.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
@class NSString;
diff --git a/clang/test/SemaObjC/attr-deprecated.m b/clang/test/SemaObjC/attr-deprecated.m
index 87d6f2140a7..52f654ab5d7 100644
--- a/clang/test/SemaObjC/attr-deprecated.m
+++ b/clang/test/SemaObjC/attr-deprecated.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
@interface A {
int X __attribute__((deprecated));
diff --git a/clang/test/SemaObjC/attr-objc-exception.m b/clang/test/SemaObjC/attr-objc-exception.m
index 12d0b31ce83..3efb8cfa40c 100644
--- a/clang/test/SemaObjC/attr-objc-exception.m
+++ b/clang/test/SemaObjC/attr-objc-exception.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
__attribute__((__objc_exception__))
@interface NSException {
diff --git a/clang/test/SemaObjC/attr-objc-gc.m b/clang/test/SemaObjC/attr-objc-gc.m
index 1f2db346a1b..20da639c3cb 100644
--- a/clang/test/SemaObjC/attr-objc-gc.m
+++ b/clang/test/SemaObjC/attr-objc-gc.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
static id __attribute((objc_gc(weak))) a;
static id __attribute((objc_gc(strong))) b;
diff --git a/clang/test/SemaObjC/bad-receiver-1.m b/clang/test/SemaObjC/bad-receiver-1.m
index de90a1eccba..64ff3d19931 100644
--- a/clang/test/SemaObjC/bad-receiver-1.m
+++ b/clang/test/SemaObjC/bad-receiver-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface I
- (id) retain;
diff --git a/clang/test/SemaObjC/block-ivar.m b/clang/test/SemaObjC/block-ivar.m
index 422018359a8..231c9a23f8a 100644
--- a/clang/test/SemaObjC/block-ivar.m
+++ b/clang/test/SemaObjC/block-ivar.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -fblocks
+// RUN: clang-cc -fsyntax-only -verify %s -fblocks
@interface NSObject {
struct objc_object *isa;
diff --git a/clang/test/SemaObjC/blocks.m b/clang/test/SemaObjC/blocks.m
index 8e72be6e37e..6d525a990ca 100644
--- a/clang/test/SemaObjC/blocks.m
+++ b/clang/test/SemaObjC/blocks.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -fblocks %s
+// RUN: clang-cc -fsyntax-only -verify -fblocks %s
@protocol NSObject;
void bar(id(^)(void));
diff --git a/clang/test/SemaObjC/call-super-2.m b/clang/test/SemaObjC/call-super-2.m
index a1f8c8722e1..6b1804b3e20 100644
--- a/clang/test/SemaObjC/call-super-2.m
+++ b/clang/test/SemaObjC/call-super-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#include <stddef.h>
diff --git a/clang/test/SemaObjC/catch-stmt.m b/clang/test/SemaObjC/catch-stmt.m
index 33894a2c0b7..18b3ee3452b 100644
--- a/clang/test/SemaObjC/catch-stmt.m
+++ b/clang/test/SemaObjC/catch-stmt.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
@protocol P;
diff --git a/clang/test/SemaObjC/category-1.m b/clang/test/SemaObjC/category-1.m
index 84f4c1953e5..6ae775848e7 100644
--- a/clang/test/SemaObjC/category-1.m
+++ b/clang/test/SemaObjC/category-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface MyClass1 @end
diff --git a/clang/test/SemaObjC/category-method-lookup-2.m b/clang/test/SemaObjC/category-method-lookup-2.m
index 7bbba8bc4bd..76048cc2f74 100644
--- a/clang/test/SemaObjC/category-method-lookup-2.m
+++ b/clang/test/SemaObjC/category-method-lookup-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef struct objc_class *Class;
@interface NSObject
@@ -19,4 +19,4 @@ typedef struct objc_class *Class;
[[self class] classMethod];
}
-@end \ No newline at end of file
+@end
diff --git a/clang/test/SemaObjC/category-method-lookup.m b/clang/test/SemaObjC/category-method-lookup.m
index a7090084600..bda465783b5 100644
--- a/clang/test/SemaObjC/category-method-lookup.m
+++ b/clang/test/SemaObjC/category-method-lookup.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Foo
@end
diff --git a/clang/test/SemaObjC/check-dup-decl-methods-1.m b/clang/test/SemaObjC/check-dup-decl-methods-1.m
index 985a4c147f9..ae0cab0b5d4 100644
--- a/clang/test/SemaObjC/check-dup-decl-methods-1.m
+++ b/clang/test/SemaObjC/check-dup-decl-methods-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface SUPER
- (int) meth;
diff --git a/clang/test/SemaObjC/check-dup-objc-decls-1.m b/clang/test/SemaObjC/check-dup-objc-decls-1.m
index 54988501136..4181ac097b4 100644
--- a/clang/test/SemaObjC/check-dup-objc-decls-1.m
+++ b/clang/test/SemaObjC/check-dup-objc-decls-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Foo // expected-note {{previous definition is here}}
@end
diff --git a/clang/test/SemaObjC/class-bitfield.m b/clang/test/SemaObjC/class-bitfield.m
index a67927f3be4..01b532464c2 100644
--- a/clang/test/SemaObjC/class-bitfield.m
+++ b/clang/test/SemaObjC/class-bitfield.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
@interface X
{
diff --git a/clang/test/SemaObjC/class-conforming-protocol-1.m b/clang/test/SemaObjC/class-conforming-protocol-1.m
index 00f3204c628..a9712b23a6a 100644
--- a/clang/test/SemaObjC/class-conforming-protocol-1.m
+++ b/clang/test/SemaObjC/class-conforming-protocol-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol P1 @end
@protocol P2 @end
diff --git a/clang/test/SemaObjC/class-def-test-1.m b/clang/test/SemaObjC/class-def-test-1.m
index 2c625fa0bc0..da8a3267662 100644
--- a/clang/test/SemaObjC/class-def-test-1.m
+++ b/clang/test/SemaObjC/class-def-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol SUPER;
diff --git a/clang/test/SemaObjC/class-extension-dup-methods.m b/clang/test/SemaObjC/class-extension-dup-methods.m
index d13b218cc78..f50b293ade3 100644
--- a/clang/test/SemaObjC/class-extension-dup-methods.m
+++ b/clang/test/SemaObjC/class-extension-dup-methods.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Foo
- (int) garf; // expected-note {{ previous declaration is here}}
diff --git a/clang/test/SemaObjC/class-impl-1.m b/clang/test/SemaObjC/class-impl-1.m
index a3a185221b3..5cd8a751043 100644
--- a/clang/test/SemaObjC/class-impl-1.m
+++ b/clang/test/SemaObjC/class-impl-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef int INTF3; // expected-note {{previous definition is here}}
diff --git a/clang/test/SemaObjC/class-method-lookup.m b/clang/test/SemaObjC/class-method-lookup.m
index a62f0f0047f..cba93825a4e 100644
--- a/clang/test/SemaObjC/class-method-lookup.m
+++ b/clang/test/SemaObjC/class-method-lookup.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface MyBase
- (void) rootInstanceMethod;
diff --git a/clang/test/SemaObjC/class-proto-1.m b/clang/test/SemaObjC/class-proto-1.m
index da6811eeb8d..8f0f3d8826c 100644
--- a/clang/test/SemaObjC/class-proto-1.m
+++ b/clang/test/SemaObjC/class-proto-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface INTF1 @end
diff --git a/clang/test/SemaObjC/cocoa.m b/clang/test/SemaObjC/cocoa.m
index 543c285d7cf..cba4481a5b6 100644
--- a/clang/test/SemaObjC/cocoa.m
+++ b/clang/test/SemaObjC/cocoa.m
@@ -1,7 +1,9 @@
-// RUN: clang %s -print-stats &&
-// RUN: clang %s -disable-free &&
-// RUN: clang -x objective-c-header -o %t %s && clang -token-cache %t %s &&
-// RUN: clang -x objective-c-header -o %t %s && clang -token-cache %t %s -E %s -o /dev/null
+// RUN: clang-cc %s -print-stats &&
+// RUN: clang-cc %s -disable-free &&
+// RUN: clang-cc -x objective-c-header -o %t %s &&
+// RUN: clang-cc -token-cache %t %s &&
+// RUN: clang-cc -x objective-c-header -o %t %s &&
+// RUN: clang-cc -token-cache %t %s -E %s -o /dev/null
#ifdef __APPLE__
#include <Cocoa/Cocoa.h>
#endif
diff --git a/clang/test/SemaObjC/compare-qualified-id.m b/clang/test/SemaObjC/compare-qualified-id.m
index 1bcbd0edc06..86845c0358d 100644
--- a/clang/test/SemaObjC/compare-qualified-id.m
+++ b/clang/test/SemaObjC/compare-qualified-id.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
typedef unsigned int NSUInteger;
diff --git a/clang/test/SemaObjC/compatible-protocol-qualified-types.m b/clang/test/SemaObjC/compatible-protocol-qualified-types.m
index 583acb06562..3c27b5f0d3c 100644
--- a/clang/test/SemaObjC/compatible-protocol-qualified-types.m
+++ b/clang/test/SemaObjC/compatible-protocol-qualified-types.m
@@ -1,4 +1,4 @@
-// RUN: clang -pedantic -fsyntax-only -verify %s
+// RUN: clang-cc -pedantic -fsyntax-only -verify %s
typedef signed char BOOL;
@class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
diff --git a/clang/test/SemaObjC/comptypes-1.m b/clang/test/SemaObjC/comptypes-1.m
index ab5262e3392..4bca895ecb3 100644
--- a/clang/test/SemaObjC/comptypes-1.m
+++ b/clang/test/SemaObjC/comptypes-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
#define nil (void *)0;
#define Nil (void *)0;
diff --git a/clang/test/SemaObjC/comptypes-2.m b/clang/test/SemaObjC/comptypes-2.m
index d063d95cc24..c24b67b15ed 100644
--- a/clang/test/SemaObjC/comptypes-2.m
+++ b/clang/test/SemaObjC/comptypes-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#define nil (void *)0;
#define Nil (void *)0;
diff --git a/clang/test/SemaObjC/comptypes-3.m b/clang/test/SemaObjC/comptypes-3.m
index b47c9607864..2d8f19d806a 100644
--- a/clang/test/SemaObjC/comptypes-3.m
+++ b/clang/test/SemaObjC/comptypes-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#define nil (void *)0;
diff --git a/clang/test/SemaObjC/comptypes-4.m b/clang/test/SemaObjC/comptypes-4.m
index bda9050164b..598901148a8 100644
--- a/clang/test/SemaObjC/comptypes-4.m
+++ b/clang/test/SemaObjC/comptypes-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
extern void foo();
diff --git a/clang/test/SemaObjC/comptypes-5.m b/clang/test/SemaObjC/comptypes-5.m
index 9905fc4298a..afd8a4949ed 100644
--- a/clang/test/SemaObjC/comptypes-5.m
+++ b/clang/test/SemaObjC/comptypes-5.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -pedantic -verify %s
+// RUN: clang-cc -fsyntax-only -pedantic -verify %s
#define nil (void *)0;
diff --git a/clang/test/SemaObjC/comptypes-6.m b/clang/test/SemaObjC/comptypes-6.m
index 2edb181e83b..32176755ef7 100644
--- a/clang/test/SemaObjC/comptypes-6.m
+++ b/clang/test/SemaObjC/comptypes-6.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
@interface Derived
@end
diff --git a/clang/test/SemaObjC/comptypes-7.m b/clang/test/SemaObjC/comptypes-7.m
index 27b832b7369..faca6937cb7 100644
--- a/clang/test/SemaObjC/comptypes-7.m
+++ b/clang/test/SemaObjC/comptypes-7.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
#define nil (void *)0;
#define Nil (void *)0;
diff --git a/clang/test/SemaObjC/comptypes-8.m b/clang/test/SemaObjC/comptypes-8.m
index d13ba385d89..af9267e499f 100644
--- a/clang/test/SemaObjC/comptypes-8.m
+++ b/clang/test/SemaObjC/comptypes-8.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol MyProtocol
@end
diff --git a/clang/test/SemaObjC/comptypes-9.m b/clang/test/SemaObjC/comptypes-9.m
index 4f0a277e74e..caa93b49e6f 100644
--- a/clang/test/SemaObjC/comptypes-9.m
+++ b/clang/test/SemaObjC/comptypes-9.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
// FIXME: This test case tests the patch applied in: http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20080602/006017.html
// Eventually that logic should be treated as an extension.
diff --git a/clang/test/SemaObjC/comptypes-a.m b/clang/test/SemaObjC/comptypes-a.m
index 4abc9fdddbd..ccbadf69ada 100644
--- a/clang/test/SemaObjC/comptypes-a.m
+++ b/clang/test/SemaObjC/comptypes-a.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
typedef signed char BOOL;
typedef int NSInteger;
diff --git a/clang/test/SemaObjC/comptypes-legal.m b/clang/test/SemaObjC/comptypes-legal.m
index 71a2b297478..cd7f89b61d0 100644
--- a/clang/test/SemaObjC/comptypes-legal.m
+++ b/clang/test/SemaObjC/comptypes-legal.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
@protocol NSObject
@end
diff --git a/clang/test/SemaObjC/conditional-expr-2.m b/clang/test/SemaObjC/conditional-expr-2.m
index 260482a6da9..831f151cbe2 100644
--- a/clang/test/SemaObjC/conditional-expr-2.m
+++ b/clang/test/SemaObjC/conditional-expr-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface A
@end
diff --git a/clang/test/SemaObjC/conditional-expr-3.m b/clang/test/SemaObjC/conditional-expr-3.m
index eb313df029b..31d4834ff0a 100644
--- a/clang/test/SemaObjC/conditional-expr-3.m
+++ b/clang/test/SemaObjC/conditional-expr-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol P0
@end
@@ -64,4 +64,4 @@ void f10(int cond, id<P0,P1> x0, id<P0,P2> x1) {
int f11(int cond, A* a, B* b) {
return (cond? b : a)->x; // expected-error{{'A' does not have a member named 'x'}}
-} \ No newline at end of file
+}
diff --git a/clang/test/SemaObjC/conditional-expr-4.m b/clang/test/SemaObjC/conditional-expr-4.m
index 8fdcf97afd3..7d50ba60750 100644
--- a/clang/test/SemaObjC/conditional-expr-4.m
+++ b/clang/test/SemaObjC/conditional-expr-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
// XFAIL
// <rdar://problem/6212771>
diff --git a/clang/test/SemaObjC/conditional-expr.m b/clang/test/SemaObjC/conditional-expr.m
index 4792fa6644d..ec3613b2aa9 100644
--- a/clang/test/SemaObjC/conditional-expr.m
+++ b/clang/test/SemaObjC/conditional-expr.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
@protocol NSObject
@end
diff --git a/clang/test/SemaObjC/conflicting-ivar-test-1.m b/clang/test/SemaObjC/conflicting-ivar-test-1.m
index 3f27b2c1772..20ed1572247 100644
--- a/clang/test/SemaObjC/conflicting-ivar-test-1.m
+++ b/clang/test/SemaObjC/conflicting-ivar-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface INTF
{
diff --git a/clang/test/SemaObjC/continuation-class-err.m b/clang/test/SemaObjC/continuation-class-err.m
index bd60f55f0cc..f516a9326a9 100644
--- a/clang/test/SemaObjC/continuation-class-err.m
+++ b/clang/test/SemaObjC/continuation-class-err.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface ReadOnly
{
diff --git a/clang/test/SemaObjC/duplicate-ivar-check.m b/clang/test/SemaObjC/duplicate-ivar-check.m
index 6dcdc38dc30..a5e2cb918e0 100644
--- a/clang/test/SemaObjC/duplicate-ivar-check.m
+++ b/clang/test/SemaObjC/duplicate-ivar-check.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface B1 {
@public
diff --git a/clang/test/SemaObjC/enhanced-proto-2.m b/clang/test/SemaObjC/enhanced-proto-2.m
index 82e23c4b63f..0450d7ba9de 100644
--- a/clang/test/SemaObjC/enhanced-proto-2.m
+++ b/clang/test/SemaObjC/enhanced-proto-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
@protocol MyProto1
@optional
diff --git a/clang/test/SemaObjC/error-property-gc-attr.m b/clang/test/SemaObjC/error-property-gc-attr.m
index 3b646ac5f9c..9c94c78a871 100644
--- a/clang/test/SemaObjC/error-property-gc-attr.m
+++ b/clang/test/SemaObjC/error-property-gc-attr.m
@@ -1,4 +1,4 @@
-// RUN: clang -fobjc-gc -fsyntax-only -verify %s
+// RUN: clang-cc -fobjc-gc -fsyntax-only -verify %s
@interface INTF
{
diff --git a/clang/test/SemaObjC/exprs.m b/clang/test/SemaObjC/exprs.m
index 3918923409e..342449d9975 100644
--- a/clang/test/SemaObjC/exprs.m
+++ b/clang/test/SemaObjC/exprs.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// rdar://6597252
Class test1(Class X) {
@@ -16,4 +16,4 @@ void test2() {
@"baz"
" b\0larg"; // expected-warning {{literal contains NUL character}}
-} \ No newline at end of file
+}
diff --git a/clang/test/SemaObjC/foreach-1.m b/clang/test/SemaObjC/foreach-1.m
index 9de32949033..d3ca424a046 100644
--- a/clang/test/SemaObjC/foreach-1.m
+++ b/clang/test/SemaObjC/foreach-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@class NSArray;
diff --git a/clang/test/SemaObjC/format-strings-objc.m b/clang/test/SemaObjC/format-strings-objc.m
index 42c21705b50..4b8490291ad 100644
--- a/clang/test/SemaObjC/format-strings-objc.m
+++ b/clang/test/SemaObjC/format-strings-objc.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
//===----------------------------------------------------------------------===//
// The following code is reduced using delta-debugging from
diff --git a/clang/test/SemaObjC/forward-class-1.m b/clang/test/SemaObjC/forward-class-1.m
index 5eb36e704ae..d8eb311cf44 100644
--- a/clang/test/SemaObjC/forward-class-1.m
+++ b/clang/test/SemaObjC/forward-class-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@class FOO, BAR;
@class FOO, BAR;
diff --git a/clang/test/SemaObjC/gcc-cast-ext.m b/clang/test/SemaObjC/gcc-cast-ext.m
index 866aee9069e..5d6670e0f67 100644
--- a/clang/test/SemaObjC/gcc-cast-ext.m
+++ b/clang/test/SemaObjC/gcc-cast-ext.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fms-extensions
+// RUN: clang-cc %s -verify -fms-extensions
@class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
typedef struct _NSRange { } NSRange;
diff --git a/clang/test/SemaObjC/id-1.m b/clang/test/SemaObjC/id-1.m
index 758f10112b4..399c6ec22c6 100644
--- a/clang/test/SemaObjC/id-1.m
+++ b/clang/test/SemaObjC/id-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
/* Test attempt to redefine 'id' in an incompatible fashion. */
typedef int id; // expected-error {{typedef redefinition with different types}}
diff --git a/clang/test/SemaObjC/id_builtin.m b/clang/test/SemaObjC/id_builtin.m
index d7c916146fd..134753726cb 100644
--- a/clang/test/SemaObjC/id_builtin.m
+++ b/clang/test/SemaObjC/id_builtin.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// id is now builtin. There should be no errors.
id obj;
diff --git a/clang/test/SemaObjC/incompatible-protocol-qualified-types.m b/clang/test/SemaObjC/incompatible-protocol-qualified-types.m
index ad8c45e5e0a..862265ca647 100644
--- a/clang/test/SemaObjC/incompatible-protocol-qualified-types.m
+++ b/clang/test/SemaObjC/incompatible-protocol-qualified-types.m
@@ -1,4 +1,4 @@
-// RUN: clang -pedantic -fsyntax-only -verify %s
+// RUN: clang-cc -pedantic -fsyntax-only -verify %s
@protocol MyProto1
@end
diff --git a/clang/test/SemaObjC/interface-1.m b/clang/test/SemaObjC/interface-1.m
index b974b39a3a8..8af228e60de 100644
--- a/clang/test/SemaObjC/interface-1.m
+++ b/clang/test/SemaObjC/interface-1.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// rdar://5957506
@interface NSWhatever :
diff --git a/clang/test/SemaObjC/interface-layout-2.m b/clang/test/SemaObjC/interface-layout-2.m
index 50dd2f95457..ec03a00ca75 100644
--- a/clang/test/SemaObjC/interface-layout-2.m
+++ b/clang/test/SemaObjC/interface-layout-2.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
@interface A
{
int ivar;
diff --git a/clang/test/SemaObjC/interface-layout.m b/clang/test/SemaObjC/interface-layout.m
index 637de8e3ac6..70b140d1091 100644
--- a/clang/test/SemaObjC/interface-layout.m
+++ b/clang/test/SemaObjC/interface-layout.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
typedef struct objc_object {} *id;
typedef signed char BOOL;
typedef unsigned int NSUInteger;
diff --git a/clang/test/SemaObjC/interface-scope-2.m b/clang/test/SemaObjC/interface-scope-2.m
index e110959d15a..d054e714f3b 100644
--- a/clang/test/SemaObjC/interface-scope-2.m
+++ b/clang/test/SemaObjC/interface-scope-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -triple i686-apple-darwin9 %s
+// RUN: clang-cc -fsyntax-only -verify -triple i686-apple-darwin9 %s
// FIXME: must also compile as Objective-C++
// <rdar://problem/6487662>
diff --git a/clang/test/SemaObjC/interface-scope.m b/clang/test/SemaObjC/interface-scope.m
index 8f164a9f736..b4dfff683bb 100644
--- a/clang/test/SemaObjC/interface-scope.m
+++ b/clang/test/SemaObjC/interface-scope.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface I1 {
@private
diff --git a/clang/test/SemaObjC/interface-tu-variable.m b/clang/test/SemaObjC/interface-tu-variable.m
index f9929964d3b..667c632aa5c 100644
--- a/clang/test/SemaObjC/interface-tu-variable.m
+++ b/clang/test/SemaObjC/interface-tu-variable.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface XX
int x; // expected-error {{cannot declare variable inside a class, protocol or category}}
diff --git a/clang/test/SemaObjC/invalid-code.m b/clang/test/SemaObjC/invalid-code.m
index 27d4147cc69..6eacba05f4a 100644
--- a/clang/test/SemaObjC/invalid-code.m
+++ b/clang/test/SemaObjC/invalid-code.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// rdar://6124613
void test1() {
diff --git a/clang/test/SemaObjC/invalid-objc-decls-1.m b/clang/test/SemaObjC/invalid-objc-decls-1.m
index 9db5f79fb65..b65c061546f 100644
--- a/clang/test/SemaObjC/invalid-objc-decls-1.m
+++ b/clang/test/SemaObjC/invalid-objc-decls-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Super @end
Super s1; // expected-error{{Objective-C type cannot be statically allocated}}
diff --git a/clang/test/SemaObjC/invalid-receiver.m b/clang/test/SemaObjC/invalid-receiver.m
index 829ec5dc97e..e79df96942c 100644
--- a/clang/test/SemaObjC/invalid-receiver.m
+++ b/clang/test/SemaObjC/invalid-receiver.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef struct NotAClass {
int a, b;
diff --git a/clang/test/SemaObjC/invalid-typename.m b/clang/test/SemaObjC/invalid-typename.m
index e4a5b4e600d..4077f91a9a6 100644
--- a/clang/test/SemaObjC/invalid-typename.m
+++ b/clang/test/SemaObjC/invalid-typename.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@class NSString, NSArray;
diff --git a/clang/test/SemaObjC/ivar-access-tests.m b/clang/test/SemaObjC/ivar-access-tests.m
index ad8f603772e..ca3cc4cf1d4 100644
--- a/clang/test/SemaObjC/ivar-access-tests.m
+++ b/clang/test/SemaObjC/ivar-access-tests.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface MySuperClass
{
diff --git a/clang/test/SemaObjC/ivar-lookup.m b/clang/test/SemaObjC/ivar-lookup.m
index e599e9da016..b168976da13 100644
--- a/clang/test/SemaObjC/ivar-lookup.m
+++ b/clang/test/SemaObjC/ivar-lookup.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
@interface Test {
int x;
diff --git a/clang/test/SemaObjC/ivar-ref-misuse.m b/clang/test/SemaObjC/ivar-ref-misuse.m
index 814d465baf3..85ede5786d5 100644
--- a/clang/test/SemaObjC/ivar-ref-misuse.m
+++ b/clang/test/SemaObjC/ivar-ref-misuse.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Sprite {
int sprite, spree;
diff --git a/clang/test/SemaObjC/ivar-sem-check-1.m b/clang/test/SemaObjC/ivar-sem-check-1.m
index 1833a0f457b..ab9f6b163c5 100644
--- a/clang/test/SemaObjC/ivar-sem-check-1.m
+++ b/clang/test/SemaObjC/ivar-sem-check-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
struct S; // expected-note{{forward declaration of 'struct S'}}
typedef int FOO();
diff --git a/clang/test/SemaObjC/legacy-implementation-1.m b/clang/test/SemaObjC/legacy-implementation-1.m
index 76434471d14..63768ffb50e 100644
--- a/clang/test/SemaObjC/legacy-implementation-1.m
+++ b/clang/test/SemaObjC/legacy-implementation-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@implementation INTF // expected-warning {{cannot find interface declaration for 'INTF'}}
@end
diff --git a/clang/test/SemaObjC/message.m b/clang/test/SemaObjC/message.m
index 7dc4fc67b3f..94db0148261 100644
--- a/clang/test/SemaObjC/message.m
+++ b/clang/test/SemaObjC/message.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface foo
- (void)meth;
diff --git a/clang/test/SemaObjC/method-arg-decay.m b/clang/test/SemaObjC/method-arg-decay.m
index 571089a6152..4b045914c09 100644
--- a/clang/test/SemaObjC/method-arg-decay.m
+++ b/clang/test/SemaObjC/method-arg-decay.m
@@ -1,4 +1,4 @@
-// RUN: clang -checker-cfref -verify %s
+// RUN: clang-cc -checker-cfref -verify %s
typedef signed char BOOL;
typedef int NSInteger;
typedef unsigned int NSUInteger;
diff --git a/clang/test/SemaObjC/method-attributes.m b/clang/test/SemaObjC/method-attributes.m
index 5b2cab6a391..003cea4bd70 100644
--- a/clang/test/SemaObjC/method-attributes.m
+++ b/clang/test/SemaObjC/method-attributes.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify -fsyntax-only %s
+// RUN: clang-cc -verify -fsyntax-only %s
@class NSString;
diff --git a/clang/test/SemaObjC/method-bad-param.m b/clang/test/SemaObjC/method-bad-param.m
index 2e36a15264b..23fc675a4e9 100644
--- a/clang/test/SemaObjC/method-bad-param.m
+++ b/clang/test/SemaObjC/method-bad-param.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface foo
@end
diff --git a/clang/test/SemaObjC/method-conflict.m b/clang/test/SemaObjC/method-conflict.m
index c2fb7ca4386..042aed9284b 100644
--- a/clang/test/SemaObjC/method-conflict.m
+++ b/clang/test/SemaObjC/method-conflict.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
typedef unsigned int NSUInteger;
@@ -51,4 +51,4 @@ typedef NSUInteger XDSourceLanguage;
// GCC doesn't currently warn about this.
+ (NSUInteger) compartmentsForClassifier: (id <XDSCClassifier>) classifier withSpecification: (XDSCDisplaySpecification *) displaySpec { // expected-warning {{conflicting types for 'compartmentsForClassifier:withSpecification:'}}
}
-@end \ No newline at end of file
+@end
diff --git a/clang/test/SemaObjC/method-def-1.m b/clang/test/SemaObjC/method-def-1.m
index 7948eed580e..94194053e12 100644
--- a/clang/test/SemaObjC/method-def-1.m
+++ b/clang/test/SemaObjC/method-def-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface foo
- (int)meth;
diff --git a/clang/test/SemaObjC/method-def-2.m b/clang/test/SemaObjC/method-def-2.m
index d31a2b58b9d..84cdd70259f 100644
--- a/clang/test/SemaObjC/method-def-2.m
+++ b/clang/test/SemaObjC/method-def-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s
+// RUN: clang-cc -ast-print %s
extern void abort(void);
#define CHECK_IF(expr) if(!(expr)) abort()
diff --git a/clang/test/SemaObjC/method-encoding-2.m b/clang/test/SemaObjC/method-encoding-2.m
index 08a579b0a87..64a0bc4c323 100644
--- a/clang/test/SemaObjC/method-encoding-2.m
+++ b/clang/test/SemaObjC/method-encoding-2.m
@@ -1,4 +1,4 @@
-// RUN: clang %s
+// RUN: clang-cc %s
// TODO: We don't support rewrite of method definitions
@interface Intf
diff --git a/clang/test/SemaObjC/method-lookup-2.m b/clang/test/SemaObjC/method-lookup-2.m
index 9939e349547..dd0bca93644 100644
--- a/clang/test/SemaObjC/method-lookup-2.m
+++ b/clang/test/SemaObjC/method-lookup-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
@protocol NSObject
diff --git a/clang/test/SemaObjC/method-lookup-3.m b/clang/test/SemaObjC/method-lookup-3.m
index 28c2e1a3084..8ed583faebc 100644
--- a/clang/test/SemaObjC/method-lookup-3.m
+++ b/clang/test/SemaObjC/method-lookup-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef struct { int y; } Abstract;
diff --git a/clang/test/SemaObjC/method-lookup-4.m b/clang/test/SemaObjC/method-lookup-4.m
index f5a20f5a741..3b2548b92c1 100644
--- a/clang/test/SemaObjC/method-lookup-4.m
+++ b/clang/test/SemaObjC/method-lookup-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface NSObject {}
diff --git a/clang/test/SemaObjC/method-lookup.m b/clang/test/SemaObjC/method-lookup.m
index 4dfbc746627..917ad6b3ee9 100644
--- a/clang/test/SemaObjC/method-lookup.m
+++ b/clang/test/SemaObjC/method-lookup.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
typedef int NSInteger;
diff --git a/clang/test/SemaObjC/method-no-context.m b/clang/test/SemaObjC/method-no-context.m
index 484322e29ed..9351cb91579 100644
--- a/clang/test/SemaObjC/method-no-context.m
+++ b/clang/test/SemaObjC/method-no-context.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
- im0 { int a; return 0; // expected-error{{missing context for method declaration}}
// expected-error{{expected '}'}}
diff --git a/clang/test/SemaObjC/method-not-defined.m b/clang/test/SemaObjC/method-not-defined.m
index 62a8be72e7d..3848fa28c92 100644
--- a/clang/test/SemaObjC/method-not-defined.m
+++ b/clang/test/SemaObjC/method-not-defined.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Foo
@end
diff --git a/clang/test/SemaObjC/method-typecheck-1.m b/clang/test/SemaObjC/method-typecheck-1.m
index 391f25e4d84..aba0befb7fe 100644
--- a/clang/test/SemaObjC/method-typecheck-1.m
+++ b/clang/test/SemaObjC/method-typecheck-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface A
- (void) setMoo: (int) x; // expected-note {{previous definition is here}}
diff --git a/clang/test/SemaObjC/method-undef-category-warn-1.m b/clang/test/SemaObjC/method-undef-category-warn-1.m
index 792c24d748f..82fd3c8ba6f 100644
--- a/clang/test/SemaObjC/method-undef-category-warn-1.m
+++ b/clang/test/SemaObjC/method-undef-category-warn-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface MyClass1
@end
diff --git a/clang/test/SemaObjC/method-undef-extension-warn-1.m b/clang/test/SemaObjC/method-undef-extension-warn-1.m
index 00201c88a44..7ce015f886e 100644
--- a/clang/test/SemaObjC/method-undef-extension-warn-1.m
+++ b/clang/test/SemaObjC/method-undef-extension-warn-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface MyClass
@end
diff --git a/clang/test/SemaObjC/method-undefined-warn-1.m b/clang/test/SemaObjC/method-undefined-warn-1.m
index 9e646f82f73..fbb01dfb1f7 100644
--- a/clang/test/SemaObjC/method-undefined-warn-1.m
+++ b/clang/test/SemaObjC/method-undefined-warn-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface INTF
- (void) meth;
diff --git a/clang/test/SemaObjC/missing-method-context.m b/clang/test/SemaObjC/missing-method-context.m
index 20437b70ec1..2d0758b1fa8 100644
--- a/clang/test/SemaObjC/missing-method-context.m
+++ b/clang/test/SemaObjC/missing-method-context.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
- (void)compilerTestAgainst; // expected-error {{missing context for method declaration}}
void xx(); // expected-error {{expected method body}}
diff --git a/clang/test/SemaObjC/newproperty-class-method-1.m b/clang/test/SemaObjC/newproperty-class-method-1.m
index 155955c483f..4946210c8dc 100644
--- a/clang/test/SemaObjC/newproperty-class-method-1.m
+++ b/clang/test/SemaObjC/newproperty-class-method-1.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
@interface Subclass
+ (int)magicNumber;
diff --git a/clang/test/SemaObjC/nsobject-attribute.m b/clang/test/SemaObjC/nsobject-attribute.m
index 5243a72f69a..3544cb139aa 100644
--- a/clang/test/SemaObjC/nsobject-attribute.m
+++ b/clang/test/SemaObjC/nsobject-attribute.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef struct CGColor * __attribute__ ((NSObject)) CGColorRef;
static int count;
diff --git a/clang/test/SemaObjC/objc2-warn-weak-decl.m b/clang/test/SemaObjC/objc2-warn-weak-decl.m
index 8fde620e71e..a52ce8831ac 100644
--- a/clang/test/SemaObjC/objc2-warn-weak-decl.m
+++ b/clang/test/SemaObjC/objc2-warn-weak-decl.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -fobjc-gc -verify %s
+// RUN: clang-cc -fsyntax-only -fobjc-gc -verify %s
struct S {
__weak id p; // expected-warning {{__weak attribute cannot be specified on a field declaration}}
};
diff --git a/clang/test/SemaObjC/property-1.m b/clang/test/SemaObjC/property-1.m
index 64e26059dfe..40bb142d8df 100644
--- a/clang/test/SemaObjC/property-1.m
+++ b/clang/test/SemaObjC/property-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
@interface I
{
diff --git a/clang/test/SemaObjC/property-10.m b/clang/test/SemaObjC/property-10.m
index 26fde7bbf19..81b8ee199cb 100644
--- a/clang/test/SemaObjC/property-10.m
+++ b/clang/test/SemaObjC/property-10.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Wreadonly-setter-attrs -verify %s -fblocks
+// RUN: clang-cc -fsyntax-only -Wreadonly-setter-attrs -verify %s -fblocks
// Check property attribute consistency.
diff --git a/clang/test/SemaObjC/property-11.m b/clang/test/SemaObjC/property-11.m
index d28608aecfb..e8e60914716 100644
--- a/clang/test/SemaObjC/property-11.m
+++ b/clang/test/SemaObjC/property-11.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface NSSound
@end
diff --git a/clang/test/SemaObjC/property-12.m b/clang/test/SemaObjC/property-12.m
index b6ac1b7c420..50fb63bc006 100644
--- a/clang/test/SemaObjC/property-12.m
+++ b/clang/test/SemaObjC/property-12.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Wreadonly-setter-attrs -verify %s
+// RUN: clang-cc -fsyntax-only -Wreadonly-setter-attrs -verify %s
@protocol P0
@property(readonly,assign) id X; // expected-warning {{property attributes 'readonly' and 'assign' are mutually exclusive}}
diff --git a/clang/test/SemaObjC/property-13.m b/clang/test/SemaObjC/property-13.m
index bcf8299a4f0..d0e40dcf86e 100644
--- a/clang/test/SemaObjC/property-13.m
+++ b/clang/test/SemaObjC/property-13.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface NSObject
+ alloc;
diff --git a/clang/test/SemaObjC/property-2.m b/clang/test/SemaObjC/property-2.m
index 4472a8f6955..159e06b07af 100644
--- a/clang/test/SemaObjC/property-2.m
+++ b/clang/test/SemaObjC/property-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Tester
@property char PropertyAtomic_char;
diff --git a/clang/test/SemaObjC/property-3.m b/clang/test/SemaObjC/property-3.m
index 6e92f253025..a66b3d5e1e1 100644
--- a/clang/test/SemaObjC/property-3.m
+++ b/clang/test/SemaObjC/property-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
@interface I
{
diff --git a/clang/test/SemaObjC/property-4.m b/clang/test/SemaObjC/property-4.m
index b3000967fc1..56db28274c1 100644
--- a/clang/test/SemaObjC/property-4.m
+++ b/clang/test/SemaObjC/property-4.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
@interface Object
@end
diff --git a/clang/test/SemaObjC/property-5.m b/clang/test/SemaObjC/property-5.m
index 1a3124087a1..f463aae6291 100644
--- a/clang/test/SemaObjC/property-5.m
+++ b/clang/test/SemaObjC/property-5.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
@protocol P1 @end
@protocol P2 @end
diff --git a/clang/test/SemaObjC/property-6.m b/clang/test/SemaObjC/property-6.m
index a51994d3d49..8f77cf1ad21 100644
--- a/clang/test/SemaObjC/property-6.m
+++ b/clang/test/SemaObjC/property-6.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
# 1 "<command line>"
# 1 "/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h" 1 3
typedef signed char BOOL;
diff --git a/clang/test/SemaObjC/property-7.m b/clang/test/SemaObjC/property-7.m
index ef7a98ad89c..5812b97427a 100644
--- a/clang/test/SemaObjC/property-7.m
+++ b/clang/test/SemaObjC/property-7.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
typedef struct _NSZone NSZone;
diff --git a/clang/test/SemaObjC/property-8.m b/clang/test/SemaObjC/property-8.m
index 8ca0afc1ed4..49bd409f27c 100644
--- a/clang/test/SemaObjC/property-8.m
+++ b/clang/test/SemaObjC/property-8.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
typedef unsigned int NSUInteger;
typedef struct _NSZone NSZone;
diff --git a/clang/test/SemaObjC/property-9-impl-method.m b/clang/test/SemaObjC/property-9-impl-method.m
index e684c5ecae3..c97f3889119 100644
--- a/clang/test/SemaObjC/property-9-impl-method.m
+++ b/clang/test/SemaObjC/property-9-impl-method.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// rdar://5967199
typedef signed char BOOL;
diff --git a/clang/test/SemaObjC/property-9.m b/clang/test/SemaObjC/property-9.m
index 9aafcc9ef61..752f9c09ebf 100644
--- a/clang/test/SemaObjC/property-9.m
+++ b/clang/test/SemaObjC/property-9.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
@protocol NSObject - (BOOL)isEqual:(id)object; @end
diff --git a/clang/test/SemaObjC/property-category-1.m b/clang/test/SemaObjC/property-category-1.m
index 243b774870d..c1c5dca1149 100644
--- a/clang/test/SemaObjC/property-category-1.m
+++ b/clang/test/SemaObjC/property-category-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Object
+ (id)new;
diff --git a/clang/test/SemaObjC/property-category-2.m b/clang/test/SemaObjC/property-category-2.m
index 2b86a9e65d9..c245e36819c 100644
--- a/clang/test/SemaObjC/property-category-2.m
+++ b/clang/test/SemaObjC/property-category-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Test that a property can be synthesize in a category
// implementation with no error.
diff --git a/clang/test/SemaObjC/property-category-3.m b/clang/test/SemaObjC/property-category-3.m
index fdf78315c62..bf9e8cbd9d9 100644
--- a/clang/test/SemaObjC/property-category-3.m
+++ b/clang/test/SemaObjC/property-category-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol P
@property(readonly) int X;
diff --git a/clang/test/SemaObjC/property-error-readonly-assign.m b/clang/test/SemaObjC/property-error-readonly-assign.m
index 673dc25aa81..edeff09dfad 100644
--- a/clang/test/SemaObjC/property-error-readonly-assign.m
+++ b/clang/test/SemaObjC/property-error-readonly-assign.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface A
-(int) x;
diff --git a/clang/test/SemaObjC/property-impl-misuse.m b/clang/test/SemaObjC/property-impl-misuse.m
index e1913be0e36..7b956b5f7b4 100644
--- a/clang/test/SemaObjC/property-impl-misuse.m
+++ b/clang/test/SemaObjC/property-impl-misuse.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface I {
int Y;
diff --git a/clang/test/SemaObjC/property-inherited.m b/clang/test/SemaObjC/property-inherited.m
index 7669e44dab8..6c06b90a9f0 100644
--- a/clang/test/SemaObjC/property-inherited.m
+++ b/clang/test/SemaObjC/property-inherited.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify
+// RUN: clang-cc %s -fsyntax-only -verify
// <rdar://problem/6497242> Inherited overridden protocol declared objects don't work
diff --git a/clang/test/SemaObjC/property-ivar-mismatch.m b/clang/test/SemaObjC/property-ivar-mismatch.m
index a0bc929c46b..75c1e97c4ee 100644
--- a/clang/test/SemaObjC/property-ivar-mismatch.m
+++ b/clang/test/SemaObjC/property-ivar-mismatch.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Test that arithmatic types on property and its ivar have exact match.
@interface Test4
diff --git a/clang/test/SemaObjC/property-missing.m b/clang/test/SemaObjC/property-missing.m
index 23af00646a9..1aa94ce71b2 100644
--- a/clang/test/SemaObjC/property-missing.m
+++ b/clang/test/SemaObjC/property-missing.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// PR3234
diff --git a/clang/test/SemaObjC/property-nonfragile-abi.m b/clang/test/SemaObjC/property-nonfragile-abi.m
index 28ad942b59c..31d415e2ace 100644
--- a/clang/test/SemaObjC/property-nonfragile-abi.m
+++ b/clang/test/SemaObjC/property-nonfragile-abi.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -triple x86_64-apple-darwin9 -verify %s
+// RUN: clang-cc -fsyntax-only -triple x86_64-apple-darwin9 -verify %s
typedef signed char BOOL;
diff --git a/clang/test/SemaObjC/property-noprotocol-warning.m b/clang/test/SemaObjC/property-noprotocol-warning.m
index 211185f2b62..95ec15aa1e0 100644
--- a/clang/test/SemaObjC/property-noprotocol-warning.m
+++ b/clang/test/SemaObjC/property-noprotocol-warning.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Object
diff --git a/clang/test/SemaObjC/property-redundant-decl-accessor.m b/clang/test/SemaObjC/property-redundant-decl-accessor.m
index 8817787ddbe..ffd5129c8e5 100644
--- a/clang/test/SemaObjC/property-redundant-decl-accessor.m
+++ b/clang/test/SemaObjC/property-redundant-decl-accessor.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Werror -verify %s
+// RUN: clang-cc -fsyntax-only -Werror -verify %s
@interface MyClass {
const char *_myName;
diff --git a/clang/test/SemaObjC/property-typecheck-1.m b/clang/test/SemaObjC/property-typecheck-1.m
index 30d56081c5c..22e5e4af66d 100644
--- a/clang/test/SemaObjC/property-typecheck-1.m
+++ b/clang/test/SemaObjC/property-typecheck-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface A
-(float) x; // expected-note {{declared at}}
diff --git a/clang/test/SemaObjC/property-user-setter.m b/clang/test/SemaObjC/property-user-setter.m
index 489e3a7ab65..9b0380ede88 100644
--- a/clang/test/SemaObjC/property-user-setter.m
+++ b/clang/test/SemaObjC/property-user-setter.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface I0
@property(readonly) int x;
diff --git a/clang/test/SemaObjC/property-weak.m b/clang/test/SemaObjC/property-weak.m
index 2e5edbd5c50..293432fc828 100644
--- a/clang/test/SemaObjC/property-weak.m
+++ b/clang/test/SemaObjC/property-weak.m
@@ -1,4 +1,4 @@
-// RUN: clang -triple i386-apple-darwin9 -fsyntax-only -verify %s
+// RUN: clang-cc -triple i386-apple-darwin9 -fsyntax-only -verify %s
@interface foo
@property(nonatomic) int foo __attribute__((weak_import));
diff --git a/clang/test/SemaObjC/props-on-prots.m b/clang/test/SemaObjC/props-on-prots.m
index aa5be257954..a0c6e41f9d3 100644
--- a/clang/test/SemaObjC/props-on-prots.m
+++ b/clang/test/SemaObjC/props-on-prots.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
@class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
diff --git a/clang/test/SemaObjC/protocol-archane.m b/clang/test/SemaObjC/protocol-archane.m
index 647c5e74a65..3e70c050965 100644
--- a/clang/test/SemaObjC/protocol-archane.m
+++ b/clang/test/SemaObjC/protocol-archane.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// rdar://5986251
@protocol SomeProtocol
diff --git a/clang/test/SemaObjC/protocol-atttribute-1.m b/clang/test/SemaObjC/protocol-atttribute-1.m
index 1934091fe93..ae8441132c7 100644
--- a/clang/test/SemaObjC/protocol-atttribute-1.m
+++ b/clang/test/SemaObjC/protocol-atttribute-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
__attribute ((unavailable))
@protocol FwProto; // expected-note{{marked unavailable}}
diff --git a/clang/test/SemaObjC/protocol-expr-1.m b/clang/test/SemaObjC/protocol-expr-1.m
index dff2866020d..cc1c3231d5e 100644
--- a/clang/test/SemaObjC/protocol-expr-1.m
+++ b/clang/test/SemaObjC/protocol-expr-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol fproto;
diff --git a/clang/test/SemaObjC/protocol-expr-neg-1.m b/clang/test/SemaObjC/protocol-expr-neg-1.m
index 427e74417ab..9393fde3c3c 100644
--- a/clang/test/SemaObjC/protocol-expr-neg-1.m
+++ b/clang/test/SemaObjC/protocol-expr-neg-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@class Protocol;
diff --git a/clang/test/SemaObjC/protocol-forward-circular.m b/clang/test/SemaObjC/protocol-forward-circular.m
index 836d5b23507..40da96e0961 100644
--- a/clang/test/SemaObjC/protocol-forward-circular.m
+++ b/clang/test/SemaObjC/protocol-forward-circular.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol B;
@protocol C < B > // expected-warning{{cannot find protocol definition for 'B'}} // expected-note{{previous definition is here}}
diff --git a/clang/test/SemaObjC/protocol-id-test-1.m b/clang/test/SemaObjC/protocol-id-test-1.m
index 4e636d7e1c7..5e737a8fae0 100644
--- a/clang/test/SemaObjC/protocol-id-test-1.m
+++ b/clang/test/SemaObjC/protocol-id-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
@interface FF
- (void) Meth;
diff --git a/clang/test/SemaObjC/protocol-id-test-2.m b/clang/test/SemaObjC/protocol-id-test-2.m
index 3b4adcfb5b6..a55923c2105 100644
--- a/clang/test/SemaObjC/protocol-id-test-2.m
+++ b/clang/test/SemaObjC/protocol-id-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
@protocol P
@end
diff --git a/clang/test/SemaObjC/protocol-id-test-3.m b/clang/test/SemaObjC/protocol-id-test-3.m
index a4be20b4a5c..3c7f84a181f 100644
--- a/clang/test/SemaObjC/protocol-id-test-3.m
+++ b/clang/test/SemaObjC/protocol-id-test-3.m
@@ -1,4 +1,4 @@
-// RUN: clang -pedantic -fsyntax-only -verify %s
+// RUN: clang-cc -pedantic -fsyntax-only -verify %s
@protocol MyProto1
@end
diff --git a/clang/test/SemaObjC/protocol-implementation-inherited.m b/clang/test/SemaObjC/protocol-implementation-inherited.m
index 42c49958098..1aace211c84 100644
--- a/clang/test/SemaObjC/protocol-implementation-inherited.m
+++ b/clang/test/SemaObjC/protocol-implementation-inherited.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol P0
-bar;
diff --git a/clang/test/SemaObjC/protocol-lookup-2.m b/clang/test/SemaObjC/protocol-lookup-2.m
index 5d721e509ed..64d0c3acf03 100644
--- a/clang/test/SemaObjC/protocol-lookup-2.m
+++ b/clang/test/SemaObjC/protocol-lookup-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface NSObject @end
@protocol ProtocolA
diff --git a/clang/test/SemaObjC/protocol-lookup.m b/clang/test/SemaObjC/protocol-lookup.m
index ec02c2ba7db..4f928229cd1 100644
--- a/clang/test/SemaObjC/protocol-lookup.m
+++ b/clang/test/SemaObjC/protocol-lookup.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol NSObject
- retain;
- release;
diff --git a/clang/test/SemaObjC/protocol-test-1.m b/clang/test/SemaObjC/protocol-test-1.m
index c8e4080c5e3..6ca2bb875b5 100644
--- a/clang/test/SemaObjC/protocol-test-1.m
+++ b/clang/test/SemaObjC/protocol-test-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol PROTO1
@required
diff --git a/clang/test/SemaObjC/protocol-test-2.m b/clang/test/SemaObjC/protocol-test-2.m
index e5fff2da630..a882809f1c7 100644
--- a/clang/test/SemaObjC/protocol-test-2.m
+++ b/clang/test/SemaObjC/protocol-test-2.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface INTF1 @end
diff --git a/clang/test/SemaObjC/protocol-typecheck.m b/clang/test/SemaObjC/protocol-typecheck.m
index 5ffe73fd938..de66dedda70 100644
--- a/clang/test/SemaObjC/protocol-typecheck.m
+++ b/clang/test/SemaObjC/protocol-typecheck.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface NSObject @end
@protocol XCElementP @end
diff --git a/clang/test/SemaObjC/protocol-undef.m b/clang/test/SemaObjC/protocol-undef.m
index a490fa26fd8..34a33c72f83 100644
--- a/clang/test/SemaObjC/protocol-undef.m
+++ b/clang/test/SemaObjC/protocol-undef.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
@class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
diff --git a/clang/test/SemaObjC/rdr-6211479-array-property.m b/clang/test/SemaObjC/rdr-6211479-array-property.m
index 8b7067fbe2a..f8e4a07cba5 100644
--- a/clang/test/SemaObjC/rdr-6211479-array-property.m
+++ b/clang/test/SemaObjC/rdr-6211479-array-property.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// XFAIL
// <rdar://problem/6211479>
diff --git a/clang/test/SemaObjC/selector-1.m b/clang/test/SemaObjC/selector-1.m
index 1fd1d444a12..ee77015041d 100644
--- a/clang/test/SemaObjC/selector-1.m
+++ b/clang/test/SemaObjC/selector-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -verify %s
+// RUN: clang-cc -verify %s
@interface Lancelot @end
@implementation Lancelot
diff --git a/clang/test/SemaObjC/selector-overload.m b/clang/test/SemaObjC/selector-overload.m
index 7bd25444c7e..7c30f79ceae 100644
--- a/clang/test/SemaObjC/selector-overload.m
+++ b/clang/test/SemaObjC/selector-overload.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only
+// RUN: clang-cc %s -fsyntax-only
@interface NSObject
+ alloc;
diff --git a/clang/test/SemaObjC/static-ivar-ref-1.m b/clang/test/SemaObjC/static-ivar-ref-1.m
index a0b389e1ad6..3c37e9e8302 100644
--- a/clang/test/SemaObjC/static-ivar-ref-1.m
+++ b/clang/test/SemaObjC/static-ivar-ref-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -ast-print %s
+// RUN: clang-cc -ast-print %s
@interface current
{
diff --git a/clang/test/SemaObjC/string.m b/clang/test/SemaObjC/string.m
index e14d3b15c19..3f078f6543e 100644
--- a/clang/test/SemaObjC/string.m
+++ b/clang/test/SemaObjC/string.m
@@ -1,5 +1,5 @@
-// RUN: clang %s -verify -fsyntax-only &&
-// RUN: clang %s -verify -fsyntax-only -DDECLAREIT
+// RUN: clang-cc %s -verify -fsyntax-only &&
+// RUN: clang-cc %s -verify -fsyntax-only -DDECLAREIT
// a declaration of NSConstantString is not required.
#ifdef DECLAREIT
diff --git a/clang/test/SemaObjC/super-cat-prot.m b/clang/test/SemaObjC/super-cat-prot.m
index ef4c0ebc3f0..1ab0752faa3 100644
--- a/clang/test/SemaObjC/super-cat-prot.m
+++ b/clang/test/SemaObjC/super-cat-prot.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
typedef unsigned int NSUInteger;
@class NSInvocation, NSMethodSignature, NSCoder, NSString, NSEnumerator;
diff --git a/clang/test/SemaObjC/super-property-notation.m b/clang/test/SemaObjC/super-property-notation.m
index 4c963629481..3b0887f26ef 100644
--- a/clang/test/SemaObjC/super-property-notation.m
+++ b/clang/test/SemaObjC/super-property-notation.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface B
+(int) classGetter;
diff --git a/clang/test/SemaObjC/super.m b/clang/test/SemaObjC/super.m
index 7fe79e22ccc..9afd4eb983c 100644
--- a/clang/test/SemaObjC/super.m
+++ b/clang/test/SemaObjC/super.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Foo
- iMethod;
diff --git a/clang/test/SemaObjC/synchronized.m b/clang/test/SemaObjC/synchronized.m
index 365da92dd4b..d4914fd895f 100644
--- a/clang/test/SemaObjC/synchronized.m
+++ b/clang/test/SemaObjC/synchronized.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
typedef unsigned int NSUInteger;
typedef struct _NSZone NSZone;
diff --git a/clang/test/SemaObjC/try-catch.m b/clang/test/SemaObjC/try-catch.m
index 16e119db80c..bcb4e506d5f 100644
--- a/clang/test/SemaObjC/try-catch.m
+++ b/clang/test/SemaObjC/try-catch.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
typedef struct _NSZone NSZone;
diff --git a/clang/test/SemaObjC/typedef-class.m b/clang/test/SemaObjC/typedef-class.m
index 1bb3f87aa5a..128815602d4 100644
--- a/clang/test/SemaObjC/typedef-class.m
+++ b/clang/test/SemaObjC/typedef-class.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
typedef unsigned int NSUInteger;
typedef struct _NSZone NSZone;
diff --git a/clang/test/SemaObjC/undef-class-messagin-error.m b/clang/test/SemaObjC/undef-class-messagin-error.m
index 6d162ac4e21..114b6ca5f6f 100644
--- a/clang/test/SemaObjC/undef-class-messagin-error.m
+++ b/clang/test/SemaObjC/undef-class-messagin-error.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface _Child
+ (int) flashCache;
diff --git a/clang/test/SemaObjC/undef-protocol-methods-1.m b/clang/test/SemaObjC/undef-protocol-methods-1.m
index 9ad3593c6c4..05245523fb6 100644
--- a/clang/test/SemaObjC/undef-protocol-methods-1.m
+++ b/clang/test/SemaObjC/undef-protocol-methods-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol P1
- (void) P1proto;
diff --git a/clang/test/SemaObjC/undef-superclass-1.m b/clang/test/SemaObjC/undef-superclass-1.m
index ba233f8c4e6..0d670f8c080 100644
--- a/clang/test/SemaObjC/undef-superclass-1.m
+++ b/clang/test/SemaObjC/undef-superclass-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@class SUPER, Y;
diff --git a/clang/test/SemaObjC/undefined-protocol-type-1.m b/clang/test/SemaObjC/undefined-protocol-type-1.m
index 117f418ab1c..572d55f2685 100644
--- a/clang/test/SemaObjC/undefined-protocol-type-1.m
+++ b/clang/test/SemaObjC/undefined-protocol-type-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol p1, p4;
@protocol p2 @end
diff --git a/clang/test/SemaObjC/unused.m b/clang/test/SemaObjC/unused.m
index cbe15a1abb5..88c6f1054c8 100644
--- a/clang/test/SemaObjC/unused.m
+++ b/clang/test/SemaObjC/unused.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang-cc %s -verify -fsyntax-only
#include <stdio.h>
@interface Greeter
diff --git a/clang/test/SemaObjC/va-method-1.m b/clang/test/SemaObjC/va-method-1.m
index 077982abbf5..3c8998f983c 100644
--- a/clang/test/SemaObjC/va-method-1.m
+++ b/clang/test/SemaObjC/va-method-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
#include <stdarg.h>
diff --git a/clang/test/SemaObjC/warn-selector-selection.m b/clang/test/SemaObjC/warn-selector-selection.m
index 777666dfd93..4ab89b7e1e2 100644
--- a/clang/test/SemaObjC/warn-selector-selection.m
+++ b/clang/test/SemaObjC/warn-selector-selection.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Object
- (void)foo;
diff --git a/clang/test/SemaObjC/warn-weak-field.m b/clang/test/SemaObjC/warn-weak-field.m
index a342acb156f..be222eea058 100644
--- a/clang/test/SemaObjC/warn-weak-field.m
+++ b/clang/test/SemaObjC/warn-weak-field.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -fobjc-gc -verify %s
+// RUN: clang-cc -fsyntax-only -fobjc-gc -verify %s
struct S {
__weak id w; // expected-warning {{__weak attribute cannot be specified on a field declaration}}
diff --git a/clang/test/SemaObjC/weak-attr-ivar.m b/clang/test/SemaObjC/weak-attr-ivar.m
index e48e06a7fd5..9e0e8cb4b3a 100644
--- a/clang/test/SemaObjC/weak-attr-ivar.m
+++ b/clang/test/SemaObjC/weak-attr-ivar.m
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
typedef signed char BOOL;
typedef unsigned int NSUInteger;
diff --git a/clang/test/SemaObjCXX/blocks.mm b/clang/test/SemaObjCXX/blocks.mm
index 34f75a023d3..3d421a878e5 100644
--- a/clang/test/SemaObjCXX/blocks.mm
+++ b/clang/test/SemaObjCXX/blocks.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -fblocks %s
+// RUN: clang-cc -fsyntax-only -verify -fblocks %s
@protocol NSObject;
void bar(id(^)(void));
diff --git a/clang/test/SemaObjCXX/cocoa.mm b/clang/test/SemaObjCXX/cocoa.mm
index d6cbc04f942..00b6d747c3d 100644
--- a/clang/test/SemaObjCXX/cocoa.mm
+++ b/clang/test/SemaObjCXX/cocoa.mm
@@ -1,5 +1,6 @@
-// RUN: clang %s -print-stats &&
-// RUN: clang -x objective-c++-header -o %t %s && clang -token-cache %t %s
+// RUN: clang-cc %s -print-stats &&
+// RUN: clang-cc -x objective-c++-header -o %t %s &&
+// RUN: clang-cc -token-cache %t %s
#ifdef __APPLE__
#include <Cocoa/Cocoa.h>
#endif
diff --git a/clang/test/SemaObjCXX/linkage-spec.mm b/clang/test/SemaObjCXX/linkage-spec.mm
index c8221d470ee..2cc0936b2ed 100644
--- a/clang/test/SemaObjCXX/linkage-spec.mm
+++ b/clang/test/SemaObjCXX/linkage-spec.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
extern "C" {
@class Protocol;
}
diff --git a/clang/test/SemaObjCXX/objc-decls-inside-namespace.mm b/clang/test/SemaObjCXX/objc-decls-inside-namespace.mm
index 3ad3508c0a7..cedfcfdb9e4 100644
--- a/clang/test/SemaObjCXX/objc-decls-inside-namespace.mm
+++ b/clang/test/SemaObjCXX/objc-decls-inside-namespace.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
namespace C {
diff --git a/clang/test/SemaObjCXX/overload.mm b/clang/test/SemaObjCXX/overload.mm
index 397a4712570..8ab22e1ca73 100644
--- a/clang/test/SemaObjCXX/overload.mm
+++ b/clang/test/SemaObjCXX/overload.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface Foo
@end
diff --git a/clang/test/SemaObjCXX/protocol-lookup.mm b/clang/test/SemaObjCXX/protocol-lookup.mm
index ec02c2ba7db..4f928229cd1 100644
--- a/clang/test/SemaObjCXX/protocol-lookup.mm
+++ b/clang/test/SemaObjCXX/protocol-lookup.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@protocol NSObject
- retain;
- release;
diff --git a/clang/test/SemaObjCXX/reserved-keyword-selectors.mm b/clang/test/SemaObjCXX/reserved-keyword-selectors.mm
index 79f747fe8a1..2875f935273 100644
--- a/clang/test/SemaObjCXX/reserved-keyword-selectors.mm
+++ b/clang/test/SemaObjCXX/reserved-keyword-selectors.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
@interface A
- (void)asm;
diff --git a/clang/test/SemaObjCXX/vararg-non-pod.mm b/clang/test/SemaObjCXX/vararg-non-pod.mm
index 70028c7e581..eeed09e6163 100644
--- a/clang/test/SemaObjCXX/vararg-non-pod.mm
+++ b/clang/test/SemaObjCXX/vararg-non-pod.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
extern char version[];
diff --git a/clang/test/SemaObjCXX/void_to_obj.mm b/clang/test/SemaObjCXX/void_to_obj.mm
index bd2ef147bde..d1fbf6b6907 100644
--- a/clang/test/SemaObjCXX/void_to_obj.mm
+++ b/clang/test/SemaObjCXX/void_to_obj.mm
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// <rdar://problem/6463729>
@class XX;
diff --git a/clang/test/SemaTemplate/class-template-decl.cpp b/clang/test/SemaTemplate/class-template-decl.cpp
index ff381329283..475c7b95192 100644
--- a/clang/test/SemaTemplate/class-template-decl.cpp
+++ b/clang/test/SemaTemplate/class-template-decl.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T> class A;
diff --git a/clang/test/SemaTemplate/class-template-id-2.cpp b/clang/test/SemaTemplate/class-template-id-2.cpp
index e77555f2f97..c4388a7c155 100644
--- a/clang/test/SemaTemplate/class-template-id-2.cpp
+++ b/clang/test/SemaTemplate/class-template-id-2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
namespace N {
template<typename T> class A { };
diff --git a/clang/test/SemaTemplate/class-template-id.cpp b/clang/test/SemaTemplate/class-template-id.cpp
index 86100ef71d7..e0e1cba9a53 100644
--- a/clang/test/SemaTemplate/class-template-id.cpp
+++ b/clang/test/SemaTemplate/class-template-id.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T, typename U = float> struct A { };
typedef A<int> A_int;
diff --git a/clang/test/SemaTemplate/class-template-spec.cpp b/clang/test/SemaTemplate/class-template-spec.cpp
index 90ab39f32e9..b3dc3b2dca2 100644
--- a/clang/test/SemaTemplate/class-template-spec.cpp
+++ b/clang/test/SemaTemplate/class-template-spec.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T, typename U = int> struct A; // expected-note 2{{template is declared here}}
template<> struct A<double, double>; // expected-note{{forward declaration}}
diff --git a/clang/test/SemaTemplate/default-arguments.cpp b/clang/test/SemaTemplate/default-arguments.cpp
index cc0da1942d4..572227cb61d 100644
--- a/clang/test/SemaTemplate/default-arguments.cpp
+++ b/clang/test/SemaTemplate/default-arguments.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T, int N = 2> struct X; // expected-note{{template is declared here}}
diff --git a/clang/test/SemaTemplate/fibonacci.cpp b/clang/test/SemaTemplate/fibonacci.cpp
index b56d8cdf693..aa3b4b1b671 100644
--- a/clang/test/SemaTemplate/fibonacci.cpp
+++ b/clang/test/SemaTemplate/fibonacci.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
// FIXME: The Fibonacci/FibonacciEval dance is here to work around our
// inability to parse injected-class-name<template-argument-list>.
diff --git a/clang/test/SemaTemplate/fun-template-def.cpp b/clang/test/SemaTemplate/fun-template-def.cpp
index e9871bb5c92..fdcf6ee92ca 100644
--- a/clang/test/SemaTemplate/fun-template-def.cpp
+++ b/clang/test/SemaTemplate/fun-template-def.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
// Tests that dependent expressions are always allowed, whereas non-dependent
// are checked as usual.
diff --git a/clang/test/SemaTemplate/instantiate-array.cpp b/clang/test/SemaTemplate/instantiate-array.cpp
index d67645e0417..29279b43689 100644
--- a/clang/test/SemaTemplate/instantiate-array.cpp
+++ b/clang/test/SemaTemplate/instantiate-array.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s -std=c++0x
+// RUN: clang-cc -fsyntax-only -verify %s -std=c++0x
#ifndef __GXX_EXPERIMENTAL_CXX0X__
#define __CONCAT(__X, __Y) __CONCAT1(__X, __Y)
diff --git a/clang/test/SemaTemplate/instantiate-enum.cpp b/clang/test/SemaTemplate/instantiate-enum.cpp
index 665746cfd4d..a7acf22a45a 100644
--- a/clang/test/SemaTemplate/instantiate-enum.cpp
+++ b/clang/test/SemaTemplate/instantiate-enum.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
template<typename T, T I, int J>
struct adder {
diff --git a/clang/test/SemaTemplate/instantiate-expr-1.cpp b/clang/test/SemaTemplate/instantiate-expr-1.cpp
index 2ea0641b007..13ee3ab525b 100644
--- a/clang/test/SemaTemplate/instantiate-expr-1.cpp
+++ b/clang/test/SemaTemplate/instantiate-expr-1.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<int I, int J>
struct Bitfields {
diff --git a/clang/test/SemaTemplate/instantiate-expr-2.cpp b/clang/test/SemaTemplate/instantiate-expr-2.cpp
index b2c43ee76e0..aa898dd0565 100644
--- a/clang/test/SemaTemplate/instantiate-expr-2.cpp
+++ b/clang/test/SemaTemplate/instantiate-expr-2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s
+// RUN: clang-cc -fsyntax-only %s
typedef char one_byte;
typedef char (&two_bytes)[2];
typedef char (&four_bytes)[4];
diff --git a/clang/test/SemaTemplate/instantiate-field.cpp b/clang/test/SemaTemplate/instantiate-field.cpp
index dbfbd470600..8e2a3758b0d 100644
--- a/clang/test/SemaTemplate/instantiate-field.cpp
+++ b/clang/test/SemaTemplate/instantiate-field.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T>
struct X {
diff --git a/clang/test/SemaTemplate/instantiate-method.cpp b/clang/test/SemaTemplate/instantiate-method.cpp
index 3497cbec022..5baf2ad1b23 100644
--- a/clang/test/SemaTemplate/instantiate-method.cpp
+++ b/clang/test/SemaTemplate/instantiate-method.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T>
class X {
public:
diff --git a/clang/test/SemaTemplate/instantiate-typedef.cpp b/clang/test/SemaTemplate/instantiate-typedef.cpp
index 3e7c464d2cf..abdc37a0620 100644
--- a/clang/test/SemaTemplate/instantiate-typedef.cpp
+++ b/clang/test/SemaTemplate/instantiate-typedef.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T>
struct add_pointer {
diff --git a/clang/test/SemaTemplate/instantiation-backtrace.cpp b/clang/test/SemaTemplate/instantiation-backtrace.cpp
index 10c2de03814..869662268dd 100644
--- a/clang/test/SemaTemplate/instantiation-backtrace.cpp
+++ b/clang/test/SemaTemplate/instantiation-backtrace.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T> struct A; // expected-note 4{{template is declared here}}
template<typename T> struct B : A<T*> { }; // expected-error{{implicit instantiation of undefined template}} \
diff --git a/clang/test/SemaTemplate/instantiation-default-1.cpp b/clang/test/SemaTemplate/instantiation-default-1.cpp
index 3060fdc6fd6..ecb1fb73f90 100644
--- a/clang/test/SemaTemplate/instantiation-default-1.cpp
+++ b/clang/test/SemaTemplate/instantiation-default-1.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T, typename U = const T> struct Def1;
template<> struct Def1<int> {
diff --git a/clang/test/SemaTemplate/instantiation-default-2.cpp b/clang/test/SemaTemplate/instantiation-default-2.cpp
index 9d6b047f377..740832c5ba3 100644
--- a/clang/test/SemaTemplate/instantiation-default-2.cpp
+++ b/clang/test/SemaTemplate/instantiation-default-2.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T, T Value> struct Constant; // expected-note{{template parameter is declared here}} \
// FIXME: bad location expected-error{{a non-type template parameter cannot have type 'float'}}
diff --git a/clang/test/SemaTemplate/instantiation-default-3.cpp b/clang/test/SemaTemplate/instantiation-default-3.cpp
index b9379d6690e..521edf66f24 100644
--- a/clang/test/SemaTemplate/instantiation-default-3.cpp
+++ b/clang/test/SemaTemplate/instantiation-default-3.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T> struct A { };
diff --git a/clang/test/SemaTemplate/instantiation-depth.cpp b/clang/test/SemaTemplate/instantiation-depth.cpp
index 06317d88d48..522c4e1cbb5 100644
--- a/clang/test/SemaTemplate/instantiation-depth.cpp
+++ b/clang/test/SemaTemplate/instantiation-depth.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -ftemplate-depth=5 -verify %s
+// RUN: clang-cc -fsyntax-only -ftemplate-depth=5 -verify %s
template<typename T> struct X : X<T*> { }; // expected-error{{recursive template instantiation exceeded maximum depth of 5}} \
// expected-note{{use -ftemplate-depth-N to increase recursive template instantiation depth}} \
diff --git a/clang/test/SemaTemplate/nested-name-spec-template.cpp b/clang/test/SemaTemplate/nested-name-spec-template.cpp
index 8db2bc34296..f856268d6ee 100644
--- a/clang/test/SemaTemplate/nested-name-spec-template.cpp
+++ b/clang/test/SemaTemplate/nested-name-spec-template.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
namespace N {
namespace M {
diff --git a/clang/test/SemaTemplate/qualified-names-diag.cpp b/clang/test/SemaTemplate/qualified-names-diag.cpp
index 74e61bbb274..bf4ae118769 100644
--- a/clang/test/SemaTemplate/qualified-names-diag.cpp
+++ b/clang/test/SemaTemplate/qualified-names-diag.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
namespace std {
template<typename T> class vector { };
diff --git a/clang/test/SemaTemplate/right-angle-brackets-0x.cpp b/clang/test/SemaTemplate/right-angle-brackets-0x.cpp
index e11dfe9f75d..57b6ee22410 100644
--- a/clang/test/SemaTemplate/right-angle-brackets-0x.cpp
+++ b/clang/test/SemaTemplate/right-angle-brackets-0x.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -std=c++0x -verify %s
+// RUN: clang-cc -fsyntax-only -std=c++0x -verify %s
template<typename T> struct X;
template<int I> struct Y;
diff --git a/clang/test/SemaTemplate/right-angle-brackets-98.cpp b/clang/test/SemaTemplate/right-angle-brackets-98.cpp
index 1994e3d965c..764bb7bae07 100644
--- a/clang/test/SemaTemplate/right-angle-brackets-98.cpp
+++ b/clang/test/SemaTemplate/right-angle-brackets-98.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -std=c++98 -verify %s
+// RUN: clang-cc -fsyntax-only -std=c++98 -verify %s
template<typename T> struct X;
template<int I> struct Y;
diff --git a/clang/test/SemaTemplate/temp_arg.cpp b/clang/test/SemaTemplate/temp_arg.cpp
index b974c622a4f..e873b8e2a61 100644
--- a/clang/test/SemaTemplate/temp_arg.cpp
+++ b/clang/test/SemaTemplate/temp_arg.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T,
int I,
template<typename> class TT>
diff --git a/clang/test/SemaTemplate/temp_arg_nontype.cpp b/clang/test/SemaTemplate/temp_arg_nontype.cpp
index 381947269e9..4faa72b8e3d 100644
--- a/clang/test/SemaTemplate/temp_arg_nontype.cpp
+++ b/clang/test/SemaTemplate/temp_arg_nontype.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -std=c++98 -verify %s
+// RUN: clang-cc -fsyntax-only -std=c++98 -verify %s
template<int N> struct A; // expected-note 5{{template parameter is declared here}}
A<0> *a0;
diff --git a/clang/test/SemaTemplate/temp_arg_template.cpp b/clang/test/SemaTemplate/temp_arg_template.cpp
index 781ada9cfe7..a5e9f75fa77 100644
--- a/clang/test/SemaTemplate/temp_arg_template.cpp
+++ b/clang/test/SemaTemplate/temp_arg_template.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<template<typename T> class X> struct A; // expected-note 2{{previous template template parameter is here}}
diff --git a/clang/test/SemaTemplate/temp_arg_type.cpp b/clang/test/SemaTemplate/temp_arg_type.cpp
index 94e4505f405..b322dae98b9 100644
--- a/clang/test/SemaTemplate/temp_arg_type.cpp
+++ b/clang/test/SemaTemplate/temp_arg_type.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
template<typename T> class A; // expected-note 2 {{template parameter is declared here}}
// [temp.arg.type]p1
diff --git a/clang/test/SemaTemplate/temp_param.cpp b/clang/test/SemaTemplate/temp_param.cpp
index 1f10cc49c10..c042f0849a0 100644
--- a/clang/test/SemaTemplate/temp_param.cpp
+++ b/clang/test/SemaTemplate/temp_param.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: clang-cc -fsyntax-only -verify %s
class X;
OpenPOWER on IntegriCloud