maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fixed checkin of wrong old files. Hopefully this is the end of the test failure. 

llvm-svn: 187287
This commit is contained in:
John Thompson 2013-07-27 02:06:36 +00:00
parent e51b4bcd66
commit 3e4ff3f0e4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang-tools-extra/test/modularize/Inputs/InconsistentSubHeader.h
View File

@ -1,11 +1,11 @@
// Set up so TypeInt only defined during InconsistentHeader1.h include. // Set up so TypeInt only defined during InconsistentHeader1.h include.
#ifdef SYMBOL1 #ifdef SYMBOL1
#define SYMBOL 1 #define SYMBOL 1
#define FUNC_STYLE(a, b) a || b #define FUNC_STYLE(a, b) a||b
#endif #endif
#ifdef SYMBOL2 #ifdef SYMBOL2
#define SYMBOL 2 #define SYMBOL 2
#define FUNC_STYLE(a, b) a &&b #define FUNC_STYLE(a, b) a&&b
#endif #endif
#if SYMBOL == 1 #if SYMBOL == 1

4
clang-tools-extra/test/modularize/ProblemsInconsistent.modularize
View File

@ -17,14 +17,14 @@ Inputs/InconsistentHeader2.h
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentHeader1.h # CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentHeader1.h
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h # CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:4:9: # CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:4:9:
# CHECK-NEXT: #define FUNC_STYLE(a, b) a || b # CHECK-NEXT: #define FUNC_STYLE(a, b) a||b
# CHECK-NEXT: ^ # CHECK-NEXT: ^
# CHECK-NEXT: Macro defined here. # CHECK-NEXT: Macro defined here.
# CHECK-NEXT: 'FUNC_STYLE(1, 0);' expanded to: '1&&0' with respect to these inclusion paths: # CHECK-NEXT: 'FUNC_STYLE(1, 0);' expanded to: '1&&0' with respect to these inclusion paths:
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentHeader2.h # CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentHeader2.h
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h # CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:8:9: # CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:8:9:
# CHECK-NEXT: #define FUNC_STYLE(a, b) a &&b # CHECK-NEXT: #define FUNC_STYLE(a, b) a&&b
# CHECK-NEXT: ^ # CHECK-NEXT: ^
# CHECK-NEXT: Macro defined here. # CHECK-NEXT: Macro defined here.
# CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:11:5: # CHECK-NEXT: {{.*}}{{[/\\]}}Inputs{{[/\\]}}InconsistentSubHeader.h:11:5: