diff options
| author | Ted Kremenek <kremenek@apple.com> | 2012-02-02 00:16:13 +0000 |
|---|---|---|
| committer | Ted Kremenek <kremenek@apple.com> | 2012-02-02 00:16:13 +0000 |
| commit | 7f4bd16b53ab3904f270f610be421a74078bd6da (patch) | |
| tree | 44b34aaba39656f25da69bfa3202260a0bfb9f25 /clang/test | |
| parent | ccded6e44731dec951bbceda655dcae88380191b (diff) | |
| download | bcm5719-llvm-7f4bd16b53ab3904f270f610be421a74078bd6da.tar.gz bcm5719-llvm-7f4bd16b53ab3904f270f610be421a74078bd6da.zip | |
Per discussion on cfe-dev, remove '#error' and '#warning' from diagnostic text.
llvm-svn: 149566
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/Frontend/rewrite-macros.c | 2 | ||||
| -rw-r--r-- | clang/test/Index/retain-target-options.c | 2 | ||||
| -rw-r--r-- | clang/test/Misc/serialized-diags-no-category.c | 2 | ||||
| -rw-r--r-- | clang/test/Misc/warn-in-system-header.c | 2 | ||||
| -rw-r--r-- | clang/test/Preprocessor/line-directive.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/clang/test/Frontend/rewrite-macros.c b/clang/test/Frontend/rewrite-macros.c index f44e545728e..bc7479693bf 100644 --- a/clang/test/Frontend/rewrite-macros.c +++ b/clang/test/Frontend/rewrite-macros.c @@ -9,7 +9,7 @@ A(1,2) _Pragma("mark") // RUN: grep "//#warning eek" %t -/* expected-warning {{#warning eek}} */ #warning eek +/* expected-warning {{eek}} */ #warning eek // RUN: grep "//#pragma mark mark" %t #pragma mark mark diff --git a/clang/test/Index/retain-target-options.c b/clang/test/Index/retain-target-options.c index 797971d12ce..2fba476fb1e 100644 --- a/clang/test/Index/retain-target-options.c +++ b/clang/test/Index/retain-target-options.c @@ -2,7 +2,7 @@ // RUN: c-index-test -test-load-source-reparse 1 all -target x86_64-apple-darwin10.0.0 -msse4.1 %s 2>&1 | FileCheck %s // RUN: c-index-test -test-load-source-reparse 5 all -target x86_64-apple-darwin10.0.0 -msse4.1 %s 2>&1 | FileCheck %s -// CHECK: error: #error SSE4_1 used +// CHECK: error: SSE4_1 used #if defined(__SSE4_1__) #error SSE4_1 used #endif diff --git a/clang/test/Misc/serialized-diags-no-category.c b/clang/test/Misc/serialized-diags-no-category.c index 9c92ac33309..3074892e0eb 100644 --- a/clang/test/Misc/serialized-diags-no-category.c +++ b/clang/test/Misc/serialized-diags-no-category.c @@ -7,6 +7,6 @@ // This test case tests that we can handle both fatal errors and errors without categories. -// CHECK: {{.*[/\\]}}serialized-diags-no-category.c:1:2: error: #error foo [] +// CHECK: {{.*[/\\]}}serialized-diags-no-category.c:1:2: error: foo [] // CHECK: Number of diagnostics: 2 diff --git a/clang/test/Misc/warn-in-system-header.c b/clang/test/Misc/warn-in-system-header.c index 7e4615e65ef..6e0237d0dcd 100644 --- a/clang/test/Misc/warn-in-system-header.c +++ b/clang/test/Misc/warn-in-system-header.c @@ -1,4 +1,4 @@ // RUN: %clang_cc1 -isystem %S %s -fsyntax-only -verify #include <warn-in-system-header.h> -// expected-warning {{#warning}} +// expected-warning {{the cake is a lie}} diff --git a/clang/test/Preprocessor/line-directive.c b/clang/test/Preprocessor/line-directive.c index 102469449e1..28e93029a5c 100644 --- a/clang/test/Preprocessor/line-directive.c +++ b/clang/test/Preprocessor/line-directive.c @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s -// RUN: %clang_cc1 -E %s 2>&1 | grep 'blonk.c:92:2: error: #error ABC' -// RUN: %clang_cc1 -E %s 2>&1 | grep 'blonk.c:93:2: error: #error DEF' +// RUN: %clang_cc1 -E %s 2>&1 | grep 'blonk.c:92:2: error: ABC' +// RUN: %clang_cc1 -E %s 2>&1 | grep 'blonk.c:93:2: error: DEF' #line 'a' // expected-error {{#line directive requires a positive integer argument}} #line 0 // expected-error {{#line directive requires a positive integer argument}} |
