<html><head><meta http-equiv="Content-Type" content="text/html charset=iso-8859-1"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;"><br><div><div>On Dec 5, 2013, at 12:38 AM, Alp Toker <<a href="mailto:alp@nuanti.com">alp@nuanti.com</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div style="font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;">On 05/12/2013 08:19, Argyrios Kyrtzidis wrote:<br><blockquote type="cite">Author: akirtzidis<br>Date: Thu Dec 5 02:19:18 2013<br>New Revision: 196485<br><br>URL: <a href="http://llvm.org/viewvc/llvm-project?rev=196485&view=rev">http://llvm.org/viewvc/llvm-project?rev=196485&view=rev</a><br>Log:<br>[c-index-test] For the '-remap-file=' option use ':' instead of ';' for separator.<br><br>lldb does not like semicolon as part of an option.<br><br>Modified:<br> cfe/trunk/test/Index/Inputs/crash-recovery-code-complete-remap.c<br> cfe/trunk/test/Index/crash-recovery-code-complete.c<br> cfe/trunk/test/Index/crash-recovery-reparse.c<br> cfe/trunk/test/Index/preamble-reparse-cmd-define.c<br> cfe/trunk/test/Index/preamble-reparse.c<br> cfe/trunk/test/Index/remap-complete.c<br> cfe/trunk/test/Index/remap-cursor-at.c<br> cfe/trunk/test/Index/remap-load.c<br> cfe/trunk/tools/c-index-test/c-index-test.c<br><br>Modified: cfe/trunk/test/Index/Inputs/crash-recovery-code-complete-remap.c<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/Inputs/crash-recovery-code-complete-remap.c?rev=196485&r1=196484&r2=196485&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/Inputs/crash-recovery-code-complete-remap.c?rev=196485&r1=196484&r2=196485&view=diff</a><br>==============================================================================<br>--- cfe/trunk/test/Index/Inputs/crash-recovery-code-complete-remap.c (original)<br>+++ cfe/trunk/test/Index/Inputs/crash-recovery-code-complete-remap.c Thu Dec 5 02:19:18 2013<br>@@ -1,6 +1,6 @@<br> // RUN: echo env CINDEXTEST_EDITING=1 \<br> // RUN: not c-index-test -test-load-source-reparse 1 local \<br>-// RUN: -remap-file="%s;%S/Inputs/crash-recovery-code-complete-remap.c" \<br>+// RUN: -remap-file="%s:%S/Inputs/crash-recovery-code-complete-remap.c" \<br> // RUN: %s 2> %t.err<br></blockquote><br>Hi Argyrios,<br><br>I know this test is already XFAIL: win32 but accepting a colon here is only going to make fixing the test on Windows harder because %s and %S have a drive letter prefix on Windows.<br></div></blockquote><div><br></div><div>Changed it to a comma in r196529, thanks for reviewing!</div><br><blockquote type="cite"><div style="font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; line-height: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;"><br>Alp.<br><br><br><br><blockquote type="cite"> // RUN: FileCheck < %t.err -check-prefix=CHECK-CODE-COMPLETE-CRASH %s<br> // CHECK-CODE-COMPLETE-CRASH: Unable to reparse translation unit<br><br>Modified: cfe/trunk/test/Index/crash-recovery-code-complete.c<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/crash-recovery-code-complete.c?rev=196485&r1=196484&r2=196485&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/crash-recovery-code-complete.c?rev=196485&r1=196484&r2=196485&view=diff</a><br>==============================================================================<br>--- cfe/trunk/test/Index/crash-recovery-code-complete.c (original)<br>+++ cfe/trunk/test/Index/crash-recovery-code-complete.c Thu Dec 5 02:19:18 2013<br>@@ -1,6 +1,6 @@<br> // RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_PREAMBLE_FILE=%t-preamble.pch \<br> // RUN: not c-index-test -code-completion-at=%s:20:1 \<br>-// RUN: "-remap-file=%s;%S/Inputs/crash-recovery-code-complete-remap.c" \<br>+// RUN: "-remap-file=%s:%S/Inputs/crash-recovery-code-complete-remap.c" \<br> // RUN: %s 2> %t.err<br> // RUN: FileCheck < %t.err -check-prefix=CHECK-CODE-COMPLETE-CRASH %s<br> // RUN: test ! -e %t-preamble.pch<br><br>Modified: cfe/trunk/test/Index/crash-recovery-reparse.c<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/crash-recovery-reparse.c?rev=196485&r1=196484&r2=196485&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/crash-recovery-reparse.c?rev=196485&r1=196484&r2=196485&view=diff</a><br>==============================================================================<br>--- cfe/trunk/test/Index/crash-recovery-reparse.c (original)<br>+++ cfe/trunk/test/Index/crash-recovery-reparse.c Thu Dec 5 02:19:18 2013<br>@@ -1,6 +1,6 @@<br> // RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_PREAMBLE_FILE=%t-preamble.pch \<br> // RUN: not c-index-test -test-load-source-reparse 1 local \<br>-// RUN: -remap-file="%s;%S/Inputs/crash-recovery-reparse-remap.c" \<br>+// RUN: -remap-file="%s:%S/Inputs/crash-recovery-reparse-remap.c" \<br> // RUN: %s 2> %t.err<br> // RUN: FileCheck < %t.err -check-prefix=CHECK-REPARSE-SOURCE-CRASH %s<br> // RUN: test ! -e $t-preamble.pch<br><br>Modified: cfe/trunk/test/Index/preamble-reparse-cmd-define.c<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/preamble-reparse-cmd-define.c?rev=196485&r1=196484&r2=196485&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/preamble-reparse-cmd-define.c?rev=196485&r1=196484&r2=196485&view=diff</a><br>==============================================================================<br>--- cfe/trunk/test/Index/preamble-reparse-cmd-define.c (original)<br>+++ cfe/trunk/test/Index/preamble-reparse-cmd-define.c Thu Dec 5 02:19:18 2013<br>@@ -1,6 +1,6 @@<br> // RUN: c-index-test -write-pch %t.h.pch %s.h<br> // RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_REMAP_AFTER_TRIAL=1 c-index-test -test-load-source-reparse 3 local \<br>-// RUN: "-remap-file=%s;%s.remap" %s -include %t.h -D CMD_MACRO=1 2>&1 | FileCheck %s<br>+// RUN: "-remap-file=%s:%s.remap" %s -include %t.h -D CMD_MACRO=1 2>&1 | FileCheck %s<br> // CHECK-NOT: error:<br> <br>Modified: cfe/trunk/test/Index/preamble-reparse.c<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/preamble-reparse.c?rev=196485&r1=196484&r2=196485&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/preamble-reparse.c?rev=196485&r1=196484&r2=196485&view=diff</a><br>==============================================================================<br>--- cfe/trunk/test/Index/preamble-reparse.c (original)<br>+++ cfe/trunk/test/Index/preamble-reparse.c Thu Dec 5 02:19:18 2013<br>@@ -1,2 +1,2 @@<br>-// RUN: env CINDEXTEST_EDITING=1 c-index-test -test-load-source-reparse 5 local "-remap-file=%S/Inputs/preamble-reparse-1.c;%S/Inputs/preamble-reparse-2.c" %S/Inputs/preamble-reparse-1.c | FileCheck %s<br>+// RUN: env CINDEXTEST_EDITING=1 c-index-test -test-load-source-reparse 5 local "-remap-file=%S/Inputs/preamble-reparse-1.c:%S/Inputs/preamble-reparse-2.c" %S/Inputs/preamble-reparse-1.c | FileCheck %s<br> // CHECK: preamble-reparse-1.c:1:5: VarDecl=x:1:5 Extent=[1:1 - 1:6]<br><br>Modified: cfe/trunk/test/Index/remap-complete.c<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/remap-complete.c?rev=196485&r1=196484&r2=196485&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/remap-complete.c?rev=196485&r1=196484&r2=196485&view=diff</a><br>==============================================================================<br>--- cfe/trunk/test/Index/remap-complete.c (original)<br>+++ cfe/trunk/test/Index/remap-complete.c Thu Dec 5 02:19:18 2013<br>@@ -1,4 +1,4 @@<br>-// RUN: c-index-test -code-completion-at=%s:6:2 -remap-file="%s;%S/Inputs/remap-complete-to.c" %s | FileCheck %s<br>+// RUN: c-index-test -code-completion-at=%s:6:2 -remap-file="%s:%S/Inputs/remap-complete-to.c" %s | FileCheck %s<br> // CHECK: FunctionDecl:{ResultType int}{TypedText f0}{LeftParen (}<br> void f() { }<br><br>Modified: cfe/trunk/test/Index/remap-cursor-at.c<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/remap-cursor-at.c?rev=196485&r1=196484&r2=196485&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/remap-cursor-at.c?rev=196485&r1=196484&r2=196485&view=diff</a><br>==============================================================================<br>--- cfe/trunk/test/Index/remap-cursor-at.c (original)<br>+++ cfe/trunk/test/Index/remap-cursor-at.c Thu Dec 5 02:19:18 2013<br>@@ -1,4 +1,4 @@<br>-// RUN: c-index-test -cursor-at=%s:1:15 -cursor-at=%s:2:21 -remap-file="%s;%S/Inputs/remap-load-to.c" %s | FileCheck %s<br>+// RUN: c-index-test -cursor-at=%s:1:15 -cursor-at=%s:2:21 -remap-file="%s:%S/Inputs/remap-load-to.c" %s | FileCheck %s<br> // CHECK: ParmDecl=parm1:1:13 (Definition)<br> // CHECK: DeclRefExpr=parm2:1:26<br><br>Modified: cfe/trunk/test/Index/remap-load.c<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/remap-load.c?rev=196485&r1=196484&r2=196485&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/remap-load.c?rev=196485&r1=196484&r2=196485&view=diff</a><br>==============================================================================<br>--- cfe/trunk/test/Index/remap-load.c (original)<br>+++ cfe/trunk/test/Index/remap-load.c Thu Dec 5 02:19:18 2013<br>@@ -1,4 +1,4 @@<br>-// RUN: c-index-test -test-load-source all -remap-file="%s;%S/Inputs/remap-load-to.c" %s | FileCheck -check-prefix=CHECK %s<br>+// RUN: c-index-test -test-load-source all -remap-file="%s:%S/Inputs/remap-load-to.c" %s | FileCheck -check-prefix=CHECK %s<br> // CHECK: remap-load.c:1:5: FunctionDecl=foo:1:5 (Definition) Extent=[1:1 - 3:2]<br> // CHECK: remap-load.c:1:13: ParmDecl=parm1:1:13 (Definition) Extent=[1:9 - 1:18]<br><br>Modified: cfe/trunk/tools/c-index-test/c-index-test.c<br>URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/c-index-test.c?rev=196485&r1=196484&r2=196485&view=diff">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/c-index-test.c?rev=196485&r1=196484&r2=196485&view=diff</a><br>==============================================================================<br>--- cfe/trunk/tools/c-index-test/c-index-test.c (original)<br>+++ cfe/trunk/tools/c-index-test/c-index-test.c Thu Dec 5 02:19:18 2013<br>@@ -137,10 +137,10 @@ int parse_remapped_files(int argc, const<br> char *filename;<br> char *contents;<br> FILE *to_file;<br>- const char *semi = strchr(arg_string, ';');<br>- if (!semi) {<br>+ const char *colon = strchr(arg_string, ':');<br>+ if (!colon) {<br> fprintf(stderr,<br>- "error: -remap-file=from;to argument is missing semicolon\n");<br>+ "error: -remap-file=from:to argument is missing semicolon\n");<br> free_remapped_files(*unsaved_files, i);<br> *unsaved_files = 0;<br> *num_unsaved_files = 0;<br>@@ -148,10 +148,10 @@ int parse_remapped_files(int argc, const<br> }<br> /* Open the file that we're remapping to. */<br>- to_file = fopen(semi + 1, "rb");<br>+ to_file = fopen(colon + 1, "rb");<br> if (!to_file) {<br> fprintf(stderr, "error: cannot open file %s that we are remapping to\n",<br>- semi + 1);<br>+ colon + 1);<br> free_remapped_files(*unsaved_files, i);<br> *unsaved_files = 0;<br> *num_unsaved_files = 0;<br>@@ -167,7 +167,7 @@ int parse_remapped_files(int argc, const<br> contents = (char *)malloc(unsaved->Length + 1);<br> if (fread(contents, 1, unsaved->Length, to_file) != unsaved->Length) {<br> fprintf(stderr, "error: unexpected %s reading 'to' file %s\n",<br>- (feof(to_file) ? "EOF" : "error"), semi + 1);<br>+ (feof(to_file) ? "EOF" : "error"), colon + 1);<br> fclose(to_file);<br> free_remapped_files(*unsaved_files, i);<br> free(contents);<br>@@ -182,7 +182,7 @@ int parse_remapped_files(int argc, const<br> fclose(to_file);<br> /* Copy the file name that we're remapping from. */<br>- filename_len = semi - arg_string;<br>+ filename_len = colon - arg_string;<br> filename = (char *)malloc(filename_len + 1);<br> memcpy(filename, arg_string, filename_len);<br> filename[filename_len] = 0;<br><br><br>_______________________________________________<br>cfe-commits mailing list<br><a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits<br></blockquote><br>--<span class="Apple-converted-space"> </span><br><a href="http://www.nuanti.com/">http://www.nuanti.com</a><br>the browser experts</div></blockquote></div><br></body></html>