r302771 - Make tests from r302765 windows friendly

[Bruno Cardoso Lopes via cfe-commits]

Author: bruno
Date: Thu May 11 02:06:52 2017
New Revision: 302771

URL: http://llvm.org/viewvc/llvm-project?rev=302771&view=rev
Log:
Make tests from r302765 windows friendly

and appease:
http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/2030

Modified:
    cfe/trunk/test/Modules/redefinition-same-header.m
    cfe/trunk/test/Sema/redefinition-same-header.c
    cfe/trunk/test/SemaCXX/modules-ts.cppm

Modified: cfe/trunk/test/Modules/redefinition-same-header.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/redefinition-same-header.m?rev=302771&r1=302770&r2=302771&view=diff
==============================================================================
--- cfe/trunk/test/Modules/redefinition-same-header.m (original)
+++ cfe/trunk/test/Modules/redefinition-same-header.m Thu May 11 02:06:52 2017
@@ -3,18 +3,18 @@
 // RUN:   -fimplicit-module-maps -fmodules-cache-path=%t.tmp %s -verify
 
 // expected-error at Inputs/SameHeader/C.h:3 {{redefinition of 'c'}}
-// expected-note-re at Inputs/SameHeader/B.h:3 {{'{{.*}}/C.h' included multiple times, additional include site in header from module 'X.B'}}
+// expected-note-re at Inputs/SameHeader/B.h:3 {{'{{.*}}C.h' included multiple times, additional include site in header from module 'X.B'}}
 // expected-note at Inputs/SameHeader/module.modulemap:6 {{X.B defined here}}
-// expected-note-re at redefinition-same-header.m:20 {{'{{.*}}/C.h' included multiple times, additional include site here}}
+// expected-note-re at redefinition-same-header.m:20 {{'{{.*}}C.h' included multiple times, additional include site here}}
 
 // expected-error at Inputs/SameHeader/C.h:5 {{redefinition of 'aaa'}}
-// expected-note-re at Inputs/SameHeader/B.h:3 {{'{{.*}}/C.h' included multiple times, additional include site in header from module 'X.B'}}
+// expected-note-re at Inputs/SameHeader/B.h:3 {{'{{.*}}C.h' included multiple times, additional include site in header from module 'X.B'}}
 // expected-note at Inputs/SameHeader/module.modulemap:6 {{X.B defined here}}
-// expected-note-re at redefinition-same-header.m:20 {{'{{.*}}/C.h' included multiple times, additional include site here}}
+// expected-note-re at redefinition-same-header.m:20 {{'{{.*}}C.h' included multiple times, additional include site here}}
 
 // expected-error at Inputs/SameHeader/C.h:9 {{redefinition of 'fd_set'}}
-// expected-note-re at Inputs/SameHeader/B.h:3 {{'{{.*}}/C.h' included multiple times, additional include site in header from module 'X.B'}}
+// expected-note-re at Inputs/SameHeader/B.h:3 {{'{{.*}}C.h' included multiple times, additional include site in header from module 'X.B'}}
 // expected-note at Inputs/SameHeader/module.modulemap:6 {{X.B defined here}}
-// expected-note-re at redefinition-same-header.m:20 {{'{{.*}}/C.h' included multiple times, additional include site here}}
+// expected-note-re at 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

Modified: cfe/trunk/test/Sema/redefinition-same-header.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Sema/redefinition-same-header.c?rev=302771&r1=302770&r2=302771&view=diff
==============================================================================
--- cfe/trunk/test/Sema/redefinition-same-header.c (original)
+++ cfe/trunk/test/Sema/redefinition-same-header.c Thu May 11 02:06:52 2017
@@ -5,8 +5,8 @@
 
 // expected-error at a.h:1 {{redefinition of 'yyy'}}
 // expected-note at a.h:1 {{unguarded header; consider using #ifdef guards or #pragma once}}
-// expected-note-re at redefinition-same-header.c:11 {{'{{.*}}/a.h' included multiple times, additional include site here}}
-// expected-note-re at redefinition-same-header.c:12 {{'{{.*}}/a.h' included multiple times, additional include site here}}
+// expected-note-re at redefinition-same-header.c:11 {{'{{.*}}a.h' included multiple times, additional include site here}}
+// expected-note-re at redefinition-same-header.c:12 {{'{{.*}}a.h' included multiple times, additional include site here}}
 
 #include "a.h"
 #include "a.h"

Modified: cfe/trunk/test/SemaCXX/modules-ts.cppm
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/modules-ts.cppm?rev=302771&r1=302770&r2=302771&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/modules-ts.cppm (original)
+++ cfe/trunk/test/SemaCXX/modules-ts.cppm Thu May 11 02:06:52 2017
@@ -18,7 +18,7 @@ int n;
 #if TEST >= 2
 // expected-error at -2 {{redefinition of '}}
 // expected-note at -3 {{unguarded header; consider using #ifdef guards or #pragma once}}
-// expected-note-re at modules-ts.cppm:1 {{'{{.*}}/modules-ts.cppm' included multiple times, additional include site here}}
+// expected-note-re at modules-ts.cppm:1 {{'{{.*}}modules-ts.cppm' included multiple times, additional include site here}}
 #endif
 
 #if TEST == 0