r265218 - [test] Don't use "UNSUPPORTED" in FileCheck prefixes

[Robinson, Paul via cfe-commits]

Is it worth teaching FileCheck about lit-defined keywords, and
reject check-prefixes that end in one of them?
Offhand that would be UNSUPPORTED, RUN, REQUIRES, XFAIL
(I haven't actually gone to look at what lit knows).
--paulr

> -----Original Message-----
> From: cfe-commits [mailto:cfe-commits-bounces at lists.llvm.org] On Behalf Of
> Greg Parker via cfe-commits
> Sent: Friday, April 01, 2016 10:29 PM
> To: cfe-commits at lists.llvm.org
> Subject: r265218 - [test] Don't use "UNSUPPORTED" in FileCheck prefixes
> 
> Author: gparker
> Date: Sat Apr  2 00:29:00 2016
> New Revision: 265218
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=265218&view=rev
> Log:
> [test] Don't use "UNSUPPORTED" in FileCheck prefixes
> 
> lit uses "UNSUPPORTED:" for its own purposes and may be
> confused if that text appears elsewhere in the test file.
> 
> Modified:
>     cfe/trunk/test/Driver/arc.c
>     cfe/trunk/test/Driver/objc-weak.m
> 
> Modified: cfe/trunk/test/Driver/arc.c
> URL: http://llvm.org/viewvc/llvm-
> project/cfe/trunk/test/Driver/arc.c?rev=265218&r1=265217&r2=265218&view=di
> ff
> ==========================================================================
> ====
> --- cfe/trunk/test/Driver/arc.c (original)
> +++ cfe/trunk/test/Driver/arc.c Sat Apr  2 00:29:00 2016
> @@ -3,7 +3,7 @@
>  // RUN: not %clang -x objective-c++ -target i386-apple-darwin10 -m32 -
> fobjc-arc %s -fsyntax-only 2>&1 | FileCheck %s
>  // RUN: not %clang -x c -target i386-apple-darwin10 -m32 -fobjc-arc %s -
> fsyntax-only 2>&1 | FileCheck -check-prefix NOTOBJC %s
>  // RUN: not %clang -x c++ -target i386-apple-darwin10 -m32 -fobjc-arc %s
> -fsyntax-only 2>&1 | FileCheck -check-prefix NOTOBJC %s
> -// RUN: not %clang -x objective-c -target x86_64-apple-darwin11 -mmacosx-
> version-min=10.5 -fobjc-arc %s -fsyntax-only 2>&1 | FileCheck -check-
> prefix UNSUPPORTED %s
> +// RUN: not %clang -x objective-c -target x86_64-apple-darwin11 -mmacosx-
> version-min=10.5 -fobjc-arc %s -fsyntax-only 2>&1 | FileCheck -check-
> prefix NOTSUPPORTED %s
> 
>  // Just to test clang is working.
>  # foo
> @@ -14,4 +14,4 @@
>  // NOTOBJC-NOT: error: -fobjc-arc is not supported on platforms using the
> legacy runtime
>  // NOTOBJC: invalid preprocessing directive
> 
> -// UNSUPPORTED: error: -fobjc-arc is not supported on versions of OS X
> prior to 10.6
> +// NOTSUPPORTED: error: -fobjc-arc is not supported on versions of OS X
> prior to 10.6
> 
> Modified: cfe/trunk/test/Driver/objc-weak.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/objc-
> weak.m?rev=265218&r1=265217&r2=265218&view=diff
> ==========================================================================
> ====
> --- cfe/trunk/test/Driver/objc-weak.m (original)
> +++ cfe/trunk/test/Driver/objc-weak.m Sat Apr  2 00:29:00 2016
> @@ -10,9 +10,9 @@
>  // ARC-NO-WEAK: -fobjc-arc
>  // ARC-NO-WEAK: -fno-objc-weak
> 
> -// RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.5 -S -
> ### %s -fobjc-arc -fobjc-weak 2>&1 | FileCheck %s --check-prefix ARC-WEAK-
> UNSUPPORTED
> -// RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.5 -S -
> ### %s -fno-objc-weak -fobjc-weak -fobjc-arc  2>&1 | FileCheck %s --check-
> prefix ARC-WEAK-UNSUPPORTED
> -// ARC-WEAK-UNSUPPORTED: error: -fobjc-weak is not supported on the
> current deployment target
> +// RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.5 -S -
> ### %s -fobjc-arc -fobjc-weak 2>&1 | FileCheck %s --check-prefix ARC-WEAK-
> NOTSUPPORTED
> +// RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.5 -S -
> ### %s -fno-objc-weak -fobjc-weak -fobjc-arc  2>&1 | FileCheck %s --check-
> prefix ARC-WEAK-NOTSUPPORTED
> +// ARC-WEAK-NOTSUPPORTED: error: -fobjc-weak is not supported on the
> current deployment target
> 
>  // RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.7 -S -
> ### %s -fobjc-weak 2>&1 | FileCheck %s --check-prefix MRC-WEAK
>  // RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.7 -S -
> ### %s -fno-objc-weak -fobjc-weak 2>&1 | FileCheck %s --check-prefix MRC-
> WEAK
> @@ -22,6 +22,6 @@
>  // RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.7 -S -
> ### %s -fobjc-weak -fno-objc-weak 2>&1 | FileCheck %s --check-prefix MRC-
> NO-WEAK
>  // MRC-NO-WEAK: -fno-objc-weak
> 
> -// RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.5 -S -
> ### %s -fobjc-weak 2>&1 | FileCheck %s --check-prefix MRC-WEAK-UNSUPPORTED
> -// RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.5 -S -
> ### %s -fno-objc-weak -fobjc-weak 2>&1 | FileCheck %s --check-prefix MRC-
> WEAK-UNSUPPORTED
> -// MRC-WEAK-UNSUPPORTED: error: -fobjc-weak is not supported on the
> current deployment target
> +// RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.5 -S -
> ### %s -fobjc-weak 2>&1 | FileCheck %s --check-prefix MRC-WEAK-
> NOTSUPPORTED
> +// RUN: %clang -target x86_64-apple-macosx -mmacosx-version-min=10.5 -S -
> ### %s -fno-objc-weak -fobjc-weak 2>&1 | FileCheck %s --check-prefix MRC-
> WEAK-NOTSUPPORTED
> +// MRC-WEAK-NOTSUPPORTED: error: -fobjc-weak is not supported on the
> current deployment target
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits