Then r196529 came at perfect timing! On Dec 5, 2013, at 12:16 PM, Aaron Ballman <[email protected]> wrote:
> This commit seems to have broken builds on Windows. > > http://bb.pgr.jp/builders/cmake-clang-i686-mingw32/builds/6138 > > I am also seeing this with ToT and MSVC 12. > > ~Aaron > > On Thu, Dec 5, 2013 at 3:19 AM, Argyrios Kyrtzidis <[email protected]> wrote: >> Author: akirtzidis >> Date: Thu Dec 5 02:19:18 2013 >> New Revision: 196485 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=196485&view=rev >> Log: >> [c-index-test] For the '-remap-file=' option use ':' instead of ';' for >> separator. >> >> lldb does not like semicolon as part of an option. >> >> Modified: >> cfe/trunk/test/Index/Inputs/crash-recovery-code-complete-remap.c >> cfe/trunk/test/Index/crash-recovery-code-complete.c >> cfe/trunk/test/Index/crash-recovery-reparse.c >> cfe/trunk/test/Index/preamble-reparse-cmd-define.c >> cfe/trunk/test/Index/preamble-reparse.c >> cfe/trunk/test/Index/remap-complete.c >> cfe/trunk/test/Index/remap-cursor-at.c >> cfe/trunk/test/Index/remap-load.c >> cfe/trunk/tools/c-index-test/c-index-test.c >> >> Modified: cfe/trunk/test/Index/Inputs/crash-recovery-code-complete-remap.c >> URL: >> 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 >> ============================================================================== >> --- cfe/trunk/test/Index/Inputs/crash-recovery-code-complete-remap.c >> (original) >> +++ cfe/trunk/test/Index/Inputs/crash-recovery-code-complete-remap.c Thu Dec >> 5 02:19:18 2013 >> @@ -1,6 +1,6 @@ >> // RUN: echo env CINDEXTEST_EDITING=1 \ >> // RUN: not c-index-test -test-load-source-reparse 1 local \ >> -// RUN: -remap-file="%s;%S/Inputs/crash-recovery-code-complete-remap.c" \ >> +// RUN: -remap-file="%s:%S/Inputs/crash-recovery-code-complete-remap.c" \ >> // RUN: %s 2> %t.err >> // RUN: FileCheck < %t.err -check-prefix=CHECK-CODE-COMPLETE-CRASH %s >> // CHECK-CODE-COMPLETE-CRASH: Unable to reparse translation unit >> >> Modified: cfe/trunk/test/Index/crash-recovery-code-complete.c >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/crash-recovery-code-complete.c?rev=196485&r1=196484&r2=196485&view=diff >> ============================================================================== >> --- cfe/trunk/test/Index/crash-recovery-code-complete.c (original) >> +++ cfe/trunk/test/Index/crash-recovery-code-complete.c Thu Dec 5 02:19:18 >> 2013 >> @@ -1,6 +1,6 @@ >> // RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_PREAMBLE_FILE=%t-preamble.pch \ >> // RUN: not c-index-test -code-completion-at=%s:20:1 \ >> -// RUN: "-remap-file=%s;%S/Inputs/crash-recovery-code-complete-remap.c" \ >> +// RUN: "-remap-file=%s:%S/Inputs/crash-recovery-code-complete-remap.c" \ >> // RUN: %s 2> %t.err >> // RUN: FileCheck < %t.err -check-prefix=CHECK-CODE-COMPLETE-CRASH %s >> // RUN: test ! -e %t-preamble.pch >> >> Modified: cfe/trunk/test/Index/crash-recovery-reparse.c >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/crash-recovery-reparse.c?rev=196485&r1=196484&r2=196485&view=diff >> ============================================================================== >> --- cfe/trunk/test/Index/crash-recovery-reparse.c (original) >> +++ cfe/trunk/test/Index/crash-recovery-reparse.c Thu Dec 5 02:19:18 2013 >> @@ -1,6 +1,6 @@ >> // RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_PREAMBLE_FILE=%t-preamble.pch \ >> // RUN: not c-index-test -test-load-source-reparse 1 local \ >> -// RUN: -remap-file="%s;%S/Inputs/crash-recovery-reparse-remap.c" \ >> +// RUN: -remap-file="%s:%S/Inputs/crash-recovery-reparse-remap.c" \ >> // RUN: %s 2> %t.err >> // RUN: FileCheck < %t.err -check-prefix=CHECK-REPARSE-SOURCE-CRASH %s >> // RUN: test ! -e $t-preamble.pch >> >> Modified: cfe/trunk/test/Index/preamble-reparse-cmd-define.c >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/preamble-reparse-cmd-define.c?rev=196485&r1=196484&r2=196485&view=diff >> ============================================================================== >> --- cfe/trunk/test/Index/preamble-reparse-cmd-define.c (original) >> +++ cfe/trunk/test/Index/preamble-reparse-cmd-define.c Thu Dec 5 02:19:18 >> 2013 >> @@ -1,6 +1,6 @@ >> // RUN: c-index-test -write-pch %t.h.pch %s.h >> // RUN: env CINDEXTEST_EDITING=1 CINDEXTEST_REMAP_AFTER_TRIAL=1 c-index-test >> -test-load-source-reparse 3 local \ >> -// RUN: "-remap-file=%s;%s.remap" %s -include %t.h -D CMD_MACRO=1 >> 2>&1 | FileCheck %s >> +// RUN: "-remap-file=%s:%s.remap" %s -include %t.h -D CMD_MACRO=1 >> 2>&1 | FileCheck %s >> >> // CHECK-NOT: error: >> >> >> Modified: cfe/trunk/test/Index/preamble-reparse.c >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/preamble-reparse.c?rev=196485&r1=196484&r2=196485&view=diff >> ============================================================================== >> --- cfe/trunk/test/Index/preamble-reparse.c (original) >> +++ cfe/trunk/test/Index/preamble-reparse.c Thu Dec 5 02:19:18 2013 >> @@ -1,2 +1,2 @@ >> -// 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 >> +// 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 >> // CHECK: preamble-reparse-1.c:1:5: VarDecl=x:1:5 Extent=[1:1 - 1:6] >> >> Modified: cfe/trunk/test/Index/remap-complete.c >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/remap-complete.c?rev=196485&r1=196484&r2=196485&view=diff >> ============================================================================== >> --- cfe/trunk/test/Index/remap-complete.c (original) >> +++ cfe/trunk/test/Index/remap-complete.c Thu Dec 5 02:19:18 2013 >> @@ -1,4 +1,4 @@ >> -// RUN: c-index-test -code-completion-at=%s:6:2 >> -remap-file="%s;%S/Inputs/remap-complete-to.c" %s | FileCheck %s >> +// RUN: c-index-test -code-completion-at=%s:6:2 >> -remap-file="%s:%S/Inputs/remap-complete-to.c" %s | FileCheck %s >> >> // CHECK: FunctionDecl:{ResultType int}{TypedText f0}{LeftParen (} >> void f() { } >> >> Modified: cfe/trunk/test/Index/remap-cursor-at.c >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/remap-cursor-at.c?rev=196485&r1=196484&r2=196485&view=diff >> ============================================================================== >> --- cfe/trunk/test/Index/remap-cursor-at.c (original) >> +++ cfe/trunk/test/Index/remap-cursor-at.c Thu Dec 5 02:19:18 2013 >> @@ -1,4 +1,4 @@ >> -// 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 >> +// 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 >> >> // CHECK: ParmDecl=parm1:1:13 (Definition) >> // CHECK: DeclRefExpr=parm2:1:26 >> >> Modified: cfe/trunk/test/Index/remap-load.c >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/remap-load.c?rev=196485&r1=196484&r2=196485&view=diff >> ============================================================================== >> --- cfe/trunk/test/Index/remap-load.c (original) >> +++ cfe/trunk/test/Index/remap-load.c Thu Dec 5 02:19:18 2013 >> @@ -1,4 +1,4 @@ >> -// RUN: c-index-test -test-load-source all >> -remap-file="%s;%S/Inputs/remap-load-to.c" %s | FileCheck >> -check-prefix=CHECK %s >> +// RUN: c-index-test -test-load-source all >> -remap-file="%s:%S/Inputs/remap-load-to.c" %s | FileCheck >> -check-prefix=CHECK %s >> >> // CHECK: remap-load.c:1:5: FunctionDecl=foo:1:5 (Definition) Extent=[1:1 - >> 3:2] >> // CHECK: remap-load.c:1:13: ParmDecl=parm1:1:13 (Definition) Extent=[1:9 - >> 1:18] >> >> Modified: cfe/trunk/tools/c-index-test/c-index-test.c >> URL: >> http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/c-index-test.c?rev=196485&r1=196484&r2=196485&view=diff >> ============================================================================== >> --- cfe/trunk/tools/c-index-test/c-index-test.c (original) >> +++ cfe/trunk/tools/c-index-test/c-index-test.c Thu Dec 5 02:19:18 2013 >> @@ -137,10 +137,10 @@ int parse_remapped_files(int argc, const >> char *filename; >> char *contents; >> FILE *to_file; >> - const char *semi = strchr(arg_string, ';'); >> - if (!semi) { >> + const char *colon = strchr(arg_string, ':'); >> + if (!colon) { >> fprintf(stderr, >> - "error: -remap-file=from;to argument is missing semicolon\n"); >> + "error: -remap-file=from:to argument is missing semicolon\n"); >> free_remapped_files(*unsaved_files, i); >> *unsaved_files = 0; >> *num_unsaved_files = 0; >> @@ -148,10 +148,10 @@ int parse_remapped_files(int argc, const >> } >> >> /* Open the file that we're remapping to. */ >> - to_file = fopen(semi + 1, "rb"); >> + to_file = fopen(colon + 1, "rb"); >> if (!to_file) { >> fprintf(stderr, "error: cannot open file %s that we are remapping >> to\n", >> - semi + 1); >> + colon + 1); >> free_remapped_files(*unsaved_files, i); >> *unsaved_files = 0; >> *num_unsaved_files = 0; >> @@ -167,7 +167,7 @@ int parse_remapped_files(int argc, const >> contents = (char *)malloc(unsaved->Length + 1); >> if (fread(contents, 1, unsaved->Length, to_file) != unsaved->Length) { >> fprintf(stderr, "error: unexpected %s reading 'to' file %s\n", >> - (feof(to_file) ? "EOF" : "error"), semi + 1); >> + (feof(to_file) ? "EOF" : "error"), colon + 1); >> fclose(to_file); >> free_remapped_files(*unsaved_files, i); >> free(contents); >> @@ -182,7 +182,7 @@ int parse_remapped_files(int argc, const >> fclose(to_file); >> >> /* Copy the file name that we're remapping from. */ >> - filename_len = semi - arg_string; >> + filename_len = colon - arg_string; >> filename = (char *)malloc(filename_len + 1); >> memcpy(filename, arg_string, filename_len); >> filename[filename_len] = 0; >> >> >> _______________________________________________ >> cfe-commits mailing list >> [email protected] >> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
