<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Thanks! it was actually my earlier commit that broke it, it just didn’t turn up until a second build happened.<div class=""><br class=""></div><div class="">Fixed in r275496<br class=""><div class=""><br class=""></div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Jul 14, 2016, at 2:55 PM, Vitaly Buka <<a href="mailto:vitalybuka@google.com" class="">vitalybuka@google.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">The patch breaks this test: <a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/14659/steps/check-clang%20msan/logs/stdio" class="">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/14659/steps/check-clang%20msan/logs/stdio</a></div><br class=""><div class="gmail_quote"><div dir="ltr" class="">On Thu, Jul 14, 2016 at 1:16 PM Ben Langmuir via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a>> wrote:<br class=""></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: benlangmuir<br class="">
Date: Thu Jul 14 15:08:43 2016<br class="">
New Revision: 275464<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=275464&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=275464&view=rev</a><br class="">
Log:<br class="">
Attempt to workaround Windows bots after my previous commit<br class="">
<br class="">
For some reason it seems the second invocation is getting DMOD_OTHER_H<br class="">
set to a path with/forward/slashes, but one of the use sites<br class="">
has\back\slashes. There should be no difference with what was already<br class="">
there, but for now try to avoid checking those paths.<br class="">
<br class="">
Modified:<br class="">
cfe/trunk/test/Index/index-module.m<br class="">
<br class="">
Modified: cfe/trunk/test/Index/index-module.m<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/index-module.m?rev=275464&r1=275463&r2=275464&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/index-module.m?rev=275464&r1=275463&r2=275464&view=diff</a><br class="">
==============================================================================<br class="">
--- cfe/trunk/test/Index/index-module.m (original)<br class="">
+++ cfe/trunk/test/Index/index-module.m Thu Jul 14 15:08:43 2016<br class="">
@@ -20,7 +20,7 @@ int glob;<br class="">
// CHECK-NOT: [indexDeclaration]<br class="">
<br class="">
// RUN: c-index-test -index-tu %t.cache/DependsOnModule.pcm | FileCheck %s -check-prefix=CHECK-DMOD<br class="">
-// RUN: c-index-test -index-tu %t.cache.sys/DependsOnModule.pcm | FileCheck %s -check-prefix=CHECK-DMOD<br class="">
+// RUN: c-index-test -index-tu %t.cache.sys/DependsOnModule.pcm | FileCheck %s -check-prefix=CHECK-DMOD-AST<br class="">
<br class="">
// CHECK-DMOD: [startedTranslationUnit]<br class="">
// CHECK-DMOD-NEXT: [ppIncludedFile]: [[DMOD_MODULE_H:.*/Modules/Inputs/DependsOnModule\.framework[/\\]Headers[/\\]DependsOnModule\.h]] | {{.*}} | hash loc: <invalid> | {{.*}} | module: DependsOnModule<br class="">
@@ -31,7 +31,6 @@ int glob;<br class="">
// 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<br class="">
// CHECK-DMOD-NEXT: [ppIncludedFile]: [[DMOD_PRIVATE_H:.*/Modules/Inputs/DependsOnModule.framework[/\\]PrivateHeaders[/\\]DependsOnModulePrivate.h]] | {{.*}} | hash loc: <invalid> | {{.*}} | module: DependsOnModule.Private.DependsOnModule<br class="">
// CHECK-DMOD-NEXT: [importedASTFile]: {{.*}}.cache{{(.sys)?[/\\]}}Module.pcm | loc: [[DMOD_MODULE_H]]:1:1 | name: "Module" | isImplicit: 1<br class="">
-//<br class="">
// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: depends_on_module_other | {{.*}} | loc: [[DMOD_OTHER_H]]:1:5<br class="">
// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: template | {{.*}} | loc: [[DMOD_NOT_CXX_H]]:1:12<br class="">
// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: sub_framework | {{.*}} | loc: [[DMOD_SUB_H]]:2:8<br class="">
@@ -39,6 +38,8 @@ int glob;<br class="">
// CHECK-DMOD-NEXT: [indexDeclaration]: kind: variable | name: depends_on_module_private | {{.*}} | loc: [[DMOD_PRIVATE_H]]:1:5<br class="">
// CHECK-DMOD-NOT: [indexDeclaration]<br class="">
<br class="">
+// CHECK-DMOD-AST: [importedASTFile]: {{.*}}.cache.sys{{[/\\]}}Module.pcm | loc: {{.*}}DependsOnModule.h:1:1 | name: "Module" | isImplicit: 1<br class="">
+<br class="">
// RUN: c-index-test -index-tu %t.cache/Module.pcm | FileCheck %s -check-prefix=CHECK-TMOD<br class="">
<br class="">
// CHECK-TMOD: [startedTranslationUnit]<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
cfe-commits mailing list<br class="">
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank" class="">cfe-commits@lists.llvm.org</a><br class="">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank" class="">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br class="">
</blockquote></div>
</div></blockquote></div><br class=""></div></div></body></html>