maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[c-index-test] For the '-remap-file=' option use ':' instead of ';' for separator. 

lldb does not like semicolon as part of an option.

llvm-svn: 196485
This commit is contained in:
Argyrios Kyrtzidis 2013-12-05 08:19:18 +00:00
parent fcf30326fd
commit a60d8ae09d
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/test/Index/Inputs/crash-recovery-code-complete-remap.c
View File

@ -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

2
clang/test/Index/crash-recovery-code-complete.c
View File

@ -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

2
clang/test/Index/crash-recovery-reparse.c
View File

@ -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

2
clang/test/Index/preamble-reparse-cmd-define.c
View File

@ -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:

2
clang/test/Index/preamble-reparse.c
View File

@ -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]

2
clang/test/Index/remap-complete.c
View File

@ -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() { }

2
clang/test/Index/remap-cursor-at.c
View File

@ -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

2
clang/test/Index/remap-load.c
View File

@ -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]

14
clang/tools/c-index-test/c-index-test.c
View File

@ -137,10 +137,10 @@ int parse_remapped_files(int argc, const char **argv, int start_arg,
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 char **argv, int start_arg,
}
/* 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 char **argv, int start_arg,
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 char **argv, int start_arg,
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;