From 6eb1201c90f6eea2768aa6f9315793c93669dddf Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Sun, 8 Nov 2009 01:46:19 +0000 Subject: [PATCH] Move test/Index input files into a sub directory (not scanned as tests). llvm-svn: 86431 --- clang/test/Index/{ => Inputs}/c-index-pch.h | 0 clang/test/Index/{ => Inputs}/foo.h | 0 clang/test/Index/Inputs/lit.local.cfg | 1 + clang/test/Index/{ => Inputs}/objc.h | 0 clang/test/Index/{ => Inputs}/t1.c | 3 --- clang/test/Index/{ => Inputs}/t1.m | 3 --- clang/test/Index/{ => Inputs}/t2.c | 3 --- clang/test/Index/{ => Inputs}/t2.m | 3 --- clang/test/Index/c-index-pch.c | 2 +- clang/test/Index/find-decls.c | 14 ++++++------- clang/test/Index/find-defs.c | 12 +++++------ clang/test/Index/find-refs.c | 22 ++++++++++----------- clang/test/Index/objc-decls.m | 10 +++++----- clang/test/Index/objc-message.m | 18 ++++++++--------- 14 files changed, 40 insertions(+), 51 deletions(-) rename clang/test/Index/{ => Inputs}/c-index-pch.h (100%) rename clang/test/Index/{ => Inputs}/foo.h (100%) create mode 100644 clang/test/Index/Inputs/lit.local.cfg rename clang/test/Index/{ => Inputs}/objc.h (100%) rename clang/test/Index/{ => Inputs}/t1.c (89%) rename clang/test/Index/{ => Inputs}/t1.m (83%) rename clang/test/Index/{ => Inputs}/t2.c (75%) rename clang/test/Index/{ => Inputs}/t2.m (78%) diff --git a/clang/test/Index/c-index-pch.h b/clang/test/Index/Inputs/c-index-pch.h similarity index 100% rename from clang/test/Index/c-index-pch.h rename to clang/test/Index/Inputs/c-index-pch.h diff --git a/clang/test/Index/foo.h b/clang/test/Index/Inputs/foo.h similarity index 100% rename from clang/test/Index/foo.h rename to clang/test/Index/Inputs/foo.h diff --git a/clang/test/Index/Inputs/lit.local.cfg b/clang/test/Index/Inputs/lit.local.cfg new file mode 100644 index 000000000000..e6f55eef7af5 --- /dev/null +++ b/clang/test/Index/Inputs/lit.local.cfg @@ -0,0 +1 @@ +config.suffixes = [] diff --git a/clang/test/Index/objc.h b/clang/test/Index/Inputs/objc.h similarity index 100% rename from clang/test/Index/objc.h rename to clang/test/Index/Inputs/objc.h diff --git a/clang/test/Index/t1.c b/clang/test/Index/Inputs/t1.c similarity index 89% rename from clang/test/Index/t1.c rename to clang/test/Index/Inputs/t1.c index 45e04881244d..ceaad4c7f3a6 100644 --- a/clang/test/Index/t1.c +++ b/clang/test/Index/Inputs/t1.c @@ -26,6 +26,3 @@ void field_test(void) { } int (^CP)(int) = ^(int x) { return x * global_var; }; - -// Suppress 'no run line' failure. -// RUN: true diff --git a/clang/test/Index/t1.m b/clang/test/Index/Inputs/t1.m similarity index 83% rename from clang/test/Index/t1.m rename to clang/test/Index/Inputs/t1.m index b2a7a3726d20..b7c86cd6aac7 100644 --- a/clang/test/Index/t1.m +++ b/clang/test/Index/Inputs/t1.m @@ -18,6 +18,3 @@ static void foo() { +(void) my_method: (int)param { } @end - -// Suppress 'no run line' failure. -// RUN: true diff --git a/clang/test/Index/t2.c b/clang/test/Index/Inputs/t2.c similarity index 75% rename from clang/test/Index/t2.c rename to clang/test/Index/Inputs/t2.c index bf52869ec8d9..76d5d6ceeb41 100644 --- a/clang/test/Index/t2.c +++ b/clang/test/Index/Inputs/t2.c @@ -9,6 +9,3 @@ void bar_func(void) { struct MyStruct *ms; ms->field_var = 10; } - -// Suppress 'no run line' failure. -// RUN: true diff --git a/clang/test/Index/t2.m b/clang/test/Index/Inputs/t2.m similarity index 78% rename from clang/test/Index/t2.m rename to clang/test/Index/Inputs/t2.m index 00d2f1d92b05..3f103eeb1dc7 100644 --- a/clang/test/Index/t2.m +++ b/clang/test/Index/Inputs/t2.m @@ -11,6 +11,3 @@ static void foo() { -(void) my_method: (int)param { } @end - -// Suppress 'no run line' failure. -// RUN: true diff --git a/clang/test/Index/c-index-pch.c b/clang/test/Index/c-index-pch.c index 789325d76a35..cbd078633c11 100644 --- a/clang/test/Index/c-index-pch.c +++ b/clang/test/Index/c-index-pch.c @@ -1,4 +1,4 @@ -// RUN: clang-cc -emit-pch -x c -o %t.pch %S/c-index-pch.h +// RUN: clang-cc -emit-pch -x c -o %t.pch %S/Inputs/c-index-pch.h // RUN: clang-cc -include-pch %t.pch -x c -emit-pch -o %t.ast %s // RUN: c-index-test %t.ast all | FileCheck -check-prefix=ALL %s // RUN: c-index-test %t.ast local | FileCheck -check-prefix=LOCAL %s diff --git a/clang/test/Index/find-decls.c b/clang/test/Index/find-decls.c index 06c9a408c5ce..99a32428005b 100644 --- a/clang/test/Index/find-decls.c +++ b/clang/test/Index/find-decls.c @@ -1,25 +1,25 @@ -// RUN: clang-cc -fblocks -emit-pch %S/t1.c -o %t1.ast -// RUN: clang-cc -fblocks -emit-pch %S/t2.c -o %t2.ast +// RUN: clang-cc -fblocks -emit-pch %S/Inputs/t1.c -o %t1.ast +// RUN: clang-cc -fblocks -emit-pch %S/Inputs/t2.c -o %t2.ast -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:8:7 -print-decls > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:8:7 -print-decls > %t // RUN: cat %t | count 3 // RUN: grep 'foo.h:4:6,' %t | count 2 // RUN: grep 't2.c:5:6,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:5:47 -print-decls > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:5:47 -print-decls > %t // RUN: cat %t | count 1 // RUN: grep 't1.c:5:12,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:6:20 -print-decls > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:6:20 -print-decls > %t // RUN: cat %t | count 1 // RUN: grep 't1.c:3:19,' %t // field test -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:21:6 -print-decls > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:21:6 -print-decls > %t // RUN: cat %t | count 1 // RUN: grep 't1.c:12:7,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:22:21 -print-decls > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:22:21 -print-decls > %t // RUN: cat %t | count 1 // RUN: grep 't1.c:16:7,' %t diff --git a/clang/test/Index/find-defs.c b/clang/test/Index/find-defs.c index 1a1af579c011..fb540727341a 100644 --- a/clang/test/Index/find-defs.c +++ b/clang/test/Index/find-defs.c @@ -1,18 +1,18 @@ -// RUN: clang-cc -fblocks -emit-pch %S/t1.c -o %t1.ast -// RUN: clang-cc -fblocks -emit-pch %S/t2.c -o %t2.ast +// RUN: clang-cc -fblocks -emit-pch %S/Inputs/t1.c -o %t1.ast +// RUN: clang-cc -fblocks -emit-pch %S/Inputs/t2.c -o %t2.ast -// RUN: index-test %t1.ast %t2.ast -point-at %S/foo.h:1:14 -print-defs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/foo.h:1:14 -print-defs > %t // RUN: cat %t | count 1 // RUN: grep 't2.c:3:5,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/foo.h:3:9 -print-defs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/foo.h:3:9 -print-defs > %t // RUN: cat %t | count 1 // RUN: grep 't1.c:3:6,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/foo.h:4:9 -print-defs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/foo.h:4:9 -print-defs > %t // RUN: cat %t | count 1 // RUN: grep 't2.c:5:6,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:8:7 -print-defs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:8:7 -print-defs > %t // RUN: cat %t | count 1 // RUN: grep 't2.c:5:6,' %t diff --git a/clang/test/Index/find-refs.c b/clang/test/Index/find-refs.c index 8afcd0965a1b..5209e141b629 100644 --- a/clang/test/Index/find-refs.c +++ b/clang/test/Index/find-refs.c @@ -1,30 +1,30 @@ -// RUN: clang-cc -fblocks -emit-pch %S/t1.c -o %t1.ast -// RUN: clang-cc -fblocks -emit-pch %S/t2.c -o %t2.ast +// RUN: clang-cc -fblocks -emit-pch %S/Inputs/t1.c -o %t1.ast +// RUN: clang-cc -fblocks -emit-pch %S/Inputs/t2.c -o %t2.ast -// RUN: index-test %t1.ast %t2.ast -point-at %S/foo.h:1:14 -print-refs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/foo.h:1:14 -print-refs > %t // RUN: cat %t | count 4 // RUN: grep 't1.c:4:19,' %t // RUN: grep 't1.c:28:40,' %t // RUN: grep 't2.c:6:3,' %t // RUN: grep 't2.c:7:12,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/foo.h:3:9 -print-refs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/foo.h:3:9 -print-refs > %t // RUN: cat %t | count 1 // RUN: grep 't2.c:7:3,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/foo.h:4:9 -print-refs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/foo.h:4:9 -print-refs > %t // RUN: cat %t | count 1 // RUN: grep 't1.c:8:3,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:3:22 -print-refs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:3:22 -print-refs > %t // RUN: cat %t | count 1 // RUN: grep 't1.c:6:17,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:4:11 -print-refs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:4:11 -print-refs > %t // RUN: cat %t | count 1 // RUN: grep 't1.c:6:5,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:5:30 -print-refs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:5:30 -print-refs > %t // RUN: cat %t | count 3 // RUN: grep 't1.c:5:27,' %t // RUN: grep 't1.c:5:44,' %t @@ -33,15 +33,15 @@ // field test // FIXME: References point at the start of MemberExpr, make them point at the field instead. -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:12:7 -print-refs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:12:7 -print-refs > %t // RUN: cat %t | count 1 // RUN: grep 't1.c:21:3,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:16:7 -print-refs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/t1.c:16:7 -print-refs > %t // RUN: cat %t | count 1 // RUN: grep 't1.c:22:3,' %t -// RUN: index-test %t1.ast %t2.ast -point-at %S/foo.h:7:11 -print-refs > %t +// RUN: index-test %t1.ast %t2.ast -point-at %S/Inputs/foo.h:7:11 -print-refs > %t // RUN: cat %t | count 2 // RUN: grep 't1.c:25:3,' %t // RUN: grep 't2.c:10:3,' %t diff --git a/clang/test/Index/objc-decls.m b/clang/test/Index/objc-decls.m index 56051d52e3ca..ff396788771d 100644 --- a/clang/test/Index/objc-decls.m +++ b/clang/test/Index/objc-decls.m @@ -1,16 +1,16 @@ -// RUN: clang-cc -emit-pch %S/t1.m -o %t1.m.ast -// RUN: clang-cc -emit-pch %S/t2.m -o %t2.m.ast +// RUN: clang-cc -emit-pch %S/Inputs/t1.m -o %t1.m.ast +// RUN: clang-cc -emit-pch %S/Inputs/t2.m -o %t2.m.ast -// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/t1.m:12:12 -print-decls > %t +// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/Inputs/t1.m:12:12 -print-decls > %t // RUN: cat %t | count 2 // RUN: grep 'objc.h:2:9,' %t | count 2 -// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/objc.h:5:13 -print-decls > %t +// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/Inputs/objc.h:5:13 -print-decls > %t // RUN: cat %t | count 3 // RUN: grep 'objc.h:5:1,' %t | count 2 // RUN: grep 't1.m:15:1,' %t | count 1 -// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/objc.h:10:13 -print-decls > %t +// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/Inputs/objc.h:10:13 -print-decls > %t // RUN: cat %t | count 3 // RUN: grep 'objc.h:10:1,' %t | count 2 // RUN: grep 't2.m:11:1,' %t | count 1 diff --git a/clang/test/Index/objc-message.m b/clang/test/Index/objc-message.m index 9b709ccc0c98..de61278af87e 100644 --- a/clang/test/Index/objc-message.m +++ b/clang/test/Index/objc-message.m @@ -1,38 +1,38 @@ -// RUN: clang-cc -emit-pch %S/t1.m -o %t1.m.ast -// RUN: clang-cc -emit-pch %S/t2.m -o %t2.m.ast +// RUN: clang-cc -emit-pch %S/Inputs/t1.m -o %t1.m.ast +// RUN: clang-cc -emit-pch %S/Inputs/t2.m -o %t2.m.ast -// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/objc.h:5:13 -print-refs > %t +// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/Inputs/objc.h:5:13 -print-refs > %t // RUN: cat %t | count 1 // RUN: grep 't1.m:6:3,' %t -// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/objc.h:6:13 -print-refs > %t +// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/Inputs/objc.h:6:13 -print-refs > %t // RUN: cat %t | count 2 // RUN: grep 't1.m:7:3,' %t // RUN: grep 't2.m:7:3,' %t -// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/objc.h:10:13 -print-refs > %t +// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/Inputs/objc.h:10:13 -print-refs > %t // RUN: cat %t | count 2 // RUN: grep 't1.m:6:3,' %t // RUN: grep 't2.m:6:3,' %t -// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/t1.m:6:15 -print-decls > %t +// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/Inputs/t1.m:6:15 -print-decls > %t // RUN: cat %t | count 6 // RUN: grep 'objc.h:5:1,' %t | count 2 // RUN: grep 'objc.h:10:1,' %t | count 2 // RUN: grep 't1.m:15:1,' %t // RUN: grep 't2.m:11:1,' %t -// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/t1.m:7:15 -print-decls > %t +// RUN: index-test %t1.m.ast %t2.m.ast -point-at %S/Inputs/t1.m:7:15 -print-decls > %t // RUN: cat %t | count 3 // RUN: grep 'objc.h:6:1,' %t | count 2 // RUN: grep 't1.m:18:1,' %t -// RUN: index-test %t2.m.ast %t1.m.ast -point-at %S/t2.m:6:15 -print-decls > %t +// RUN: index-test %t2.m.ast %t1.m.ast -point-at %S/Inputs/t2.m:6:15 -print-decls > %t // RUN: cat %t | count 3 // RUN: grep 'objc.h:10:1,' %t | count 2 // RUN: grep 't2.m:11:1,' %t -// RUN: index-test %t2.m.ast %t1.m.ast -point-at %S/t2.m:7:15 -print-decls > %t +// RUN: index-test %t2.m.ast %t1.m.ast -point-at %S/Inputs/t2.m:7:15 -print-decls > %t // RUN: cat %t | count 3 // RUN: grep 'objc.h:6:1,' %t | count 2 // RUN: grep 't1.m:18:1,' %t