diff options
| author | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2017-05-11 07:06:52 +0000 |
|---|---|---|
| committer | Bruno Cardoso Lopes <bruno.cardoso@gmail.com> | 2017-05-11 07:06:52 +0000 |
| commit | f3fde7e851bb059a73c433c72051234030a0ead5 (patch) | |
| tree | 1a74bd8b31a64cc30686bd3b15c96273628fbb7e | |
| parent | b3c1f567373d5895752b69d1ccece90813447fa9 (diff) | |
| download | bcm5719-llvm-f3fde7e851bb059a73c433c72051234030a0ead5.tar.gz bcm5719-llvm-f3fde7e851bb059a73c433c72051234030a0ead5.zip | |
Make tests from r302765 windows friendly
and appease:
http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/2030
llvm-svn: 302771
| -rw-r--r-- | clang/test/Modules/redefinition-same-header.m | 12 | ||||
| -rw-r--r-- | clang/test/Sema/redefinition-same-header.c | 4 | ||||
| -rw-r--r-- | clang/test/SemaCXX/modules-ts.cppm | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/clang/test/Modules/redefinition-same-header.m b/clang/test/Modules/redefinition-same-header.m index 13b84be0683..f1c6cbbcaa2 100644 --- a/clang/test/Modules/redefinition-same-header.m +++ b/clang/test/Modules/redefinition-same-header.m @@ -3,18 +3,18 @@ // RUN: -fimplicit-module-maps -fmodules-cache-path=%t.tmp %s -verify // expected-error@Inputs/SameHeader/C.h:3 {{redefinition of 'c'}} -// expected-note-re@Inputs/SameHeader/B.h:3 {{'{{.*}}/C.h' included multiple times, additional include site in header from module 'X.B'}} +// expected-note-re@Inputs/SameHeader/B.h:3 {{'{{.*}}C.h' included multiple times, additional include site in header from module 'X.B'}} // expected-note@Inputs/SameHeader/module.modulemap:6 {{X.B defined here}} -// expected-note-re@redefinition-same-header.m:20 {{'{{.*}}/C.h' included multiple times, additional include site here}} +// expected-note-re@redefinition-same-header.m:20 {{'{{.*}}C.h' included multiple times, additional include site here}} // expected-error@Inputs/SameHeader/C.h:5 {{redefinition of 'aaa'}} -// expected-note-re@Inputs/SameHeader/B.h:3 {{'{{.*}}/C.h' included multiple times, additional include site in header from module 'X.B'}} +// expected-note-re@Inputs/SameHeader/B.h:3 {{'{{.*}}C.h' included multiple times, additional include site in header from module 'X.B'}} // expected-note@Inputs/SameHeader/module.modulemap:6 {{X.B defined here}} -// expected-note-re@redefinition-same-header.m:20 {{'{{.*}}/C.h' included multiple times, additional include site here}} +// expected-note-re@redefinition-same-header.m:20 {{'{{.*}}C.h' included multiple times, additional include site here}} // expected-error@Inputs/SameHeader/C.h:9 {{redefinition of 'fd_set'}} -// expected-note-re@Inputs/SameHeader/B.h:3 {{'{{.*}}/C.h' included multiple times, additional include site in header from module 'X.B'}} +// expected-note-re@Inputs/SameHeader/B.h:3 {{'{{.*}}C.h' included multiple times, additional include site in header from module 'X.B'}} // expected-note@Inputs/SameHeader/module.modulemap:6 {{X.B defined here}} -// expected-note-re@redefinition-same-header.m:20 {{'{{.*}}/C.h' included multiple times, additional include site here}} +// expected-note-re@redefinition-same-header.m:20 {{'{{.*}}C.h' included multiple times, additional include site here}} #include "A.h" // maps to a modular #include "C.h" // textual include diff --git a/clang/test/Sema/redefinition-same-header.c b/clang/test/Sema/redefinition-same-header.c index d523edbf03c..be5bd1d71c9 100644 --- a/clang/test/Sema/redefinition-same-header.c +++ b/clang/test/Sema/redefinition-same-header.c @@ -5,8 +5,8 @@ // expected-error@a.h:1 {{redefinition of 'yyy'}} // expected-note@a.h:1 {{unguarded header; consider using #ifdef guards or #pragma once}} -// expected-note-re@redefinition-same-header.c:11 {{'{{.*}}/a.h' included multiple times, additional include site here}} -// expected-note-re@redefinition-same-header.c:12 {{'{{.*}}/a.h' included multiple times, additional include site here}} +// expected-note-re@redefinition-same-header.c:11 {{'{{.*}}a.h' included multiple times, additional include site here}} +// expected-note-re@redefinition-same-header.c:12 {{'{{.*}}a.h' included multiple times, additional include site here}} #include "a.h" #include "a.h" diff --git a/clang/test/SemaCXX/modules-ts.cppm b/clang/test/SemaCXX/modules-ts.cppm index a4988a4b5ce..d1d7aaa96e6 100644 --- a/clang/test/SemaCXX/modules-ts.cppm +++ b/clang/test/SemaCXX/modules-ts.cppm @@ -18,7 +18,7 @@ int n; #if TEST >= 2 // expected-error@-2 {{redefinition of '}} // expected-note@-3 {{unguarded header; consider using #ifdef guards or #pragma once}} -// expected-note-re@modules-ts.cppm:1 {{'{{.*}}/modules-ts.cppm' included multiple times, additional include site here}} +// expected-note-re@modules-ts.cppm:1 {{'{{.*}}modules-ts.cppm' included multiple times, additional include site here}} #endif #if TEST == 0 |
