Author: chapuni
Date: Fri Oct 12 09:11:32 2012
New Revision: 165794
URL: http://llvm.org/viewvc/llvm-project?rev=165794&view=rev
Log:
clang/test/Index/index-module.m: Tweak expressions to fit Win32 paths.
Modified:
cfe/trunk/test/Index/index-module.m
Modified: cfe/trunk/test/Index/index-module.m
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/index-module.m?rev=165794&r1=165793&r2=165794&view=diff
==============================================================================
--- cfe/trunk/test/Index/index-module.m (original)
+++ cfe/trunk/test/Index/index-module.m Fri Oct 12 09:11:32 2012
@@ -8,47 +8,45 @@
// RUN: -Xclang -fdisable-module-hash | FileCheck %s
// CHECK-NOT: [indexDeclaration]
-// CHECK: [importedASTFile]: {{.*}}/DependsOnModule.pcm | loc: 2:2 | name:
"DependsOnModule" | isImplicit: 1
+// CHECK: [importedASTFile]: [[PCM:.*[/\\]DependsOnModule\.pcm]] | loc: 2:2 |
name: "DependsOnModule" | isImplicit: 1
// CHECK-NOT: [indexDeclaration]
-// CHECK: [importedASTFile]: {{.*}}/DependsOnModule.pcm | loc: 3:1 | name:
"DependsOnModule" | isImplicit: 0
+// CHECK: [importedASTFile]: [[PCM]] | loc: 3:1 | name: "DependsOnModule" |
isImplicit: 0
// CHECK-NEXT: [indexDeclaration]: kind: variable | name: glob | {{.*}} | loc:
4:5
// CHECK-NOT: [indexDeclaration]
// RUN: c-index-test -index-tu %t.cache/DependsOnModule.pcm | FileCheck %s
-check-prefix=CHECK-DMOD
// CHECK-DMOD: [startedTranslationUnit]
-// CHECK-DMOD-NEXT: [ppIncludedFile]:
{{.*}}/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h |
{{.*}} | hash loc: <invalid>
-// CHECK-DMOD-NEXT: [ppIncludedFile]:
{{.*}}/Modules/Inputs/DependsOnModule.framework/Headers/other.h | {{.*}} | hash
loc: <invalid>
-// CHECK-DMOD-NEXT: [ppIncludedFile]:
{{.*}}/Modules/Inputs/DependsOnModule.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
| {{.*}} | hash loc: <invalid>
-// CHECK-DMOD-NEXT: [ppIncludedFile]:
{{.*}}/Modules/Inputs/DependsOnModule.framework/Frameworks/SubFramework.framework/Headers/Other.h
| name: "SubFramework/Other.h" | hash loc:
{{.*}}/Modules/Inputs/DependsOnModule.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h:1:1
| isImport: 0 | isAngled: 0
-// CHECK-DMOD-NEXT: [ppIncludedFile]:
{{.*}}/Modules/Inputs/DependsOnModule.framework/PrivateHeaders/DependsOnModulePrivate.h
| {{.*}} | hash loc: <invalid>
-// CHECK-DMOD-NEXT: [importedASTFile]: {{.*}}.cache/Module.pcm | loc:
{{.*}}/Modules/Inputs/DependsOnModule.framework/Headers/DependsOnModule.h:1:2 |
name: "Module" | isImplicit: 1
-// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name:
depends_on_module_other | {{.*}} | loc:
{{.*}}/Modules/Inputs/DependsOnModule.framework/Headers/other.h:1:5
-// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: sub_framework |
{{.*}} | loc:
{{.*}}/Modules/Inputs/DependsOnModule.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h:2:8
-// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name:
sub_framework_other | {{.*}} | loc:
{{.*}}/Modules/Inputs/DependsOnModule.framework/Frameworks/SubFramework.framework/Headers/Other.h:1:9
-// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name:
depends_on_module_private | {{.*}} | loc:
{{.*}}/Modules/Inputs/DependsOnModule.framework/PrivateHeaders/DependsOnModulePrivate.h:1:5
+// CHECK-DMOD-NEXT: [ppIncludedFile]:
[[DMOD_MODULE_H:.*/Modules/Inputs/DependsOnModule\.framework[/\\]Headers[/\\]DependsOnModule\.h]]
| {{.*}} | hash loc: <invalid>
+// CHECK-DMOD-NEXT: [ppIncludedFile]:
[[DMOD_OTHER_H:.*/Modules/Inputs/DependsOnModule\.framework[/\\]Headers[/\\]other\.h]]
| {{.*}} | hash loc: <invalid>
+// CHECK-DMOD-NEXT: [ppIncludedFile]:
[[DMOD_SUB_H:.*/Modules/Inputs/DependsOnModule\.framework[/\\]Frameworks[/\\]SubFramework\.framework[/\\]Headers[/\\]SubFramework\.h]]
| {{.*}} | hash loc: <invalid>
+// CHECK-DMOD-NEXT: [ppIncludedFile]:
[[DMOD_SUB_OTHER_H:.*/Modules/Inputs/DependsOnModule.framework[/\\]Frameworks/SubFramework\.framework/Headers/Other\.h]]
| name: "SubFramework/Other.h" | hash loc: [[DMOD_SUB_H]]:1:1 | isImport: 0 |
isAngled: 0
+// CHECK-DMOD-NEXT: [ppIncludedFile]:
[[DMOD_PRIVATE_H:.*/Modules/Inputs/DependsOnModule.framework[/\\]PrivateHeaders[/\\]DependsOnModulePrivate.h]]
| {{.*}} | hash loc: <invalid>
+// CHECK-DMOD-NEXT: [importedASTFile]: {{.*}}.cache{{[/\\]}}Module.pcm | loc:
[[DMOD_MODULE_H]]:1:2 | name: "Module" | isImplicit: 1
+// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name:
depends_on_module_other | {{.*}} | loc: [[DMOD_OTHER_H]]:1:5
+// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: sub_framework |
{{.*}} | loc: [[DMOD_SUB_H]]:2:8
+// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name:
sub_framework_other | {{.*}} | loc: [[DMOD_SUB_OTHER_H]]:1:9
+// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name:
depends_on_module_private | {{.*}} | loc: [[DMOD_PRIVATE_H]]:1:5
// CHECK-DMOD-NOT: [indexDeclaration]
// RUN: c-index-test -index-tu %t.cache/Module.pcm | FileCheck %s
-check-prefix=CHECK-TMOD
// CHECK-TMOD: [startedTranslationUnit]
-// CHECK-TMOD-NEXT: [ppIncludedFile]:
{{.*}}/Modules/Inputs/Module.framework/Headers/Module.h | {{.*}} | hash loc:
<invalid>
-// CHECK-TMOD-NEXT: [ppIncludedFile]:
{{.*}}/Modules/Inputs/Module.framework/Headers/Sub.h | name: "Module/Sub.h" |
hash loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:23:1 |
isImport: 0 | isAngled: 1
-// CHECK-TMOD-NEXT: [ppIncludedFile]:
{{.*}}/Modules/Inputs/Module.framework/Headers/Sub2.h | name: "Module/Sub2.h" |
hash loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Sub.h:1:1 | isImport:
0 | isAngled: 1
-// CHECK-TMOD-NEXT: [ppIncludedFile]:
{{.*}}/Modules/Inputs/Module.framework/Headers/Buried/Treasure.h | name:
"Module/Buried/Treasure.h" | hash loc:
{{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:24:1 | isImport: 0 |
isAngled: 1
-// CHECK-TMOD-NEXT: [ppIncludedFile]:
{{.*}}/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
| {{.*}} | hash loc: <invalid>
-// CHECK-TMOD-NEXT: [indexDeclaration]: kind: function | name:
getModuleVersion | {{.*}} | loc:
{{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:9:13
-// CHECK-TMOD-NEXT: [indexDeclaration]: kind: objc-class | name: Module |
{{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:15:12
+// CHECK-TMOD-NEXT: [ppIncludedFile]:
[[TMOD_MODULE_H:.*/Modules/Inputs/Module\.framework[/\\]Headers[/\\]Module\.h]]
| {{.*}} | hash loc: <invalid>
+// CHECK-TMOD-NEXT: [ppIncludedFile]:
[[TMODHDR:.*/Modules/Inputs/Module.framework[/\\]Headers.]]Sub.h | name:
"Module/Sub.h" | hash loc: [[TMOD_MODULE_H]]:23:1 | isImport: 0 | isAngled: 1
+// CHECK-TMOD-NEXT: [ppIncludedFile]: [[TMODHDR]]Sub2.h | name:
"Module/Sub2.h" | hash loc: [[TMODHDR]]Sub.h:1:1 | isImport: 0 | isAngled: 1
+// CHECK-TMOD-NEXT: [ppIncludedFile]: [[TMODHDR]]Buried/Treasure.h | name:
"Module/Buried/Treasure.h" | hash loc: [[TMOD_MODULE_H]]:24:1 | isImport: 0 |
isAngled: 1
+// CHECK-TMOD-NEXT: [ppIncludedFile]:
[[TMOD_SUB_H:.*[/\\]Modules[/\\]Inputs[/\\]Module\.framework[/\\]Frameworks[/\\]SubFramework\.framework[/\\]Headers[/\\]SubFramework\.h]]
| {{.*}} | hash loc: <invalid>
+// CHECK-TMOD-NEXT: [indexDeclaration]: kind: function | name:
getModuleVersion | {{.*}} | loc: [[TMOD_MODULE_H]]:9:13
+// CHECK-TMOD-NEXT: [indexDeclaration]: kind: objc-class | name: Module |
{{.*}} | loc: [[TMOD_MODULE_H]]:15:12
// CHECK-TMOD-NEXT: <ObjCContainerInfo>: kind: interface
-// CHECK-TMOD-NEXT: [indexDeclaration]: kind: objc-class-method | name:
version | {{.*}} | loc:
{{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:16:1
-// CHECK-TMOD-NEXT: [indexDeclaration]: kind: objc-class-method | name: alloc
| {{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:17:1
-// CHECK-TMOD-NEXT: [importedASTFile]: {{.*}}.cache/Module.pcm | loc:
{{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:23:2 | name:
"Module.Sub" | isImplicit: 1
-// CHECK-TMOD-NEXT: [importedASTFile]: {{.*}}.cache/Module.pcm | loc:
{{.*}}/Modules/Inputs/Module.framework/Headers/Module.h:24:2 | name:
"Module.Buried.Treasure" | isImplicit: 1
-// CHECK-TMOD-NEXT: [importedASTFile]: {{.*}}.cache/Module.pcm | loc:
{{.*}}/Modules/Inputs/Module.framework/Headers/Sub.h:1:2 | name: "Module.Sub2"
| isImplicit: 1
-// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name: Module_Sub |
{{.*}} | loc: {{.*}}/Modules/Inputs/Module.framework/Headers/Sub.h:2:6
-// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name: Module_Sub2 |
USR: c:@Module_Sub2 | {{.*}} | loc:
{{.*}}/Modules/Inputs/Module.framework/Headers/Sub2.h:1:6
-// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name: Buried_Treasure
| {{.*}} | loc:
{{.*}}/Modules/Inputs/Module.framework/Headers/Buried/Treasure.h:1:11
-// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name:
module_subframework | {{.*}} | loc:
{{.*}}/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h:4:7
+// CHECK-TMOD-NEXT: [indexDeclaration]: kind: objc-class-method | name:
version | {{.*}} | loc: [[TMOD_MODULE_H]]:16:1
+// CHECK-TMOD-NEXT: [indexDeclaration]: kind: objc-class-method | name: alloc
| {{.*}} | loc: [[TMOD_MODULE_H]]:17:1
+// CHECK-TMOD-NEXT: [importedASTFile]: [[PCM:.*\.cache/Module\.pcm]] | loc:
[[TMOD_MODULE_H]]:23:2 | name: "Module.Sub" | isImplicit: 1
+// CHECK-TMOD-NEXT: [importedASTFile]: [[PCM]] | loc: [[TMOD_MODULE_H]]:24:2 |
name: "Module.Buried.Treasure" | isImplicit: 1
+// CHECK-TMOD-NEXT: [importedASTFile]: [[PCM]] | loc: [[TMODHDR]]Sub.h:1:2 |
name: "Module.Sub2" | isImplicit: 1
+// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name: Module_Sub |
{{.*}} | loc: [[TMODHDR]]Sub.h:2:6
+// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name: Module_Sub2 |
USR: c:@Module_Sub2 | {{.*}} | loc: [[TMODHDR]]Sub2.h:1:6
+// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name: Buried_Treasure
| {{.*}} | loc: [[TMODHDR]]Buried/Treasure.h:1:11
+// CHECK-TMOD-NEXT: [indexDeclaration]: kind: variable | name:
module_subframework | {{.*}} | loc: [[TMOD_SUB_H]]:4:7
// CHECK-TMOD-NOT: [indexDeclaration]
-
-// XFAIL: mingw32,win32
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
