r275464 - Attempt to workaround Windows bots after my previous commit

[Ben Langmuir via cfe-commits]

Thanks! it was actually my earlier commit that broke it, it just didn’t turn up until a second build happened.

Fixed in r275496


> On Jul 14, 2016, at 2:55 PM, Vitaly Buka <vitalybuka at google.com> wrote:
> 
> The patch breaks this test: http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/14659/steps/check-clang%20msan/logs/stdio <http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/14659/steps/check-clang%20msan/logs/stdio>
> On Thu, Jul 14, 2016 at 1:16 PM Ben Langmuir via cfe-commits <cfe-commits at lists.llvm.org <mailto:cfe-commits at lists.llvm.org>> wrote:
> Author: benlangmuir
> Date: Thu Jul 14 15:08:43 2016
> New Revision: 275464
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=275464&view=rev <http://llvm.org/viewvc/llvm-project?rev=275464&view=rev>
> Log:
> Attempt to workaround Windows bots after my previous commit
> 
> For some reason it seems the second invocation is getting DMOD_OTHER_H
> set to a path with/forward/slashes, but one of the use sites
> has\back\slashes. There should be no difference with what was already
> there, but for now try to avoid checking those 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=275464&r1=275463&r2=275464&view=diff <http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/index-module.m?rev=275464&r1=275463&r2=275464&view=diff>
> ==============================================================================
> --- cfe/trunk/test/Index/index-module.m (original)
> +++ cfe/trunk/test/Index/index-module.m Thu Jul 14 15:08:43 2016
> @@ -20,7 +20,7 @@ int glob;
>  // CHECK-NOT: [indexDeclaration]
> 
>  // RUN: c-index-test -index-tu %t.cache/DependsOnModule.pcm | FileCheck %s -check-prefix=CHECK-DMOD
> -// RUN: c-index-test -index-tu %t.cache.sys/DependsOnModule.pcm | FileCheck %s -check-prefix=CHECK-DMOD
> +// RUN: c-index-test -index-tu %t.cache.sys/DependsOnModule.pcm | FileCheck %s -check-prefix=CHECK-DMOD-AST
> 
>  // CHECK-DMOD:      [startedTranslationUnit]
>  // CHECK-DMOD-NEXT: [ppIncludedFile]: [[DMOD_MODULE_H:.*/Modules/Inputs/DependsOnModule\.framework[/\\]Headers[/\\]DependsOnModule\.h]] | {{.*}} | hash loc: <invalid> | {{.*}} | module: DependsOnModule
> @@ -31,7 +31,6 @@ int glob;
>  // 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 | isModule: 0 | module: DependsOnModule.SubFramework.Other
>  // CHECK-DMOD-NEXT: [ppIncludedFile]: [[DMOD_PRIVATE_H:.*/Modules/Inputs/DependsOnModule.framework[/\\]PrivateHeaders[/\\]DependsOnModulePrivate.h]] | {{.*}} | hash loc: <invalid> | {{.*}} | module: DependsOnModule.Private.DependsOnModule
>  // CHECK-DMOD-NEXT: [importedASTFile]: {{.*}}.cache{{(.sys)?[/\\]}}Module.pcm | loc: [[DMOD_MODULE_H]]:1:1 | 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: template | {{.*}} | loc: [[DMOD_NOT_CXX_H]]:1:12
>  // CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: sub_framework | {{.*}} | loc: [[DMOD_SUB_H]]:2:8
> @@ -39,6 +38,8 @@ int glob;
>  // CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: depends_on_module_private | {{.*}} | loc: [[DMOD_PRIVATE_H]]:1:5
>  // CHECK-DMOD-NOT: [indexDeclaration]
> 
> +// CHECK-DMOD-AST: [importedASTFile]: {{.*}}.cache.sys{{[/\\]}}Module.pcm | loc: {{.*}}DependsOnModule.h:1:1 | name: "Module" | isImplicit: 1
> +
>  // RUN: c-index-test -index-tu %t.cache/Module.pcm | FileCheck %s -check-prefix=CHECK-TMOD
> 
>  // CHECK-TMOD:      [startedTranslationUnit]
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org <mailto:cfe-commits at lists.llvm.org>
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits <http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160714/35f4e3c8/attachment.html>