[cfe-commits] r164978 - in /cfe/trunk/test: Index/annotate-macro-args.m Index/get-cursor-macro-args.m Preprocessor/import_self.c

[NAKAMURA Takumi]

Michael,

In Lit, both %S and %t are expanded to absolute paths. Fixed in r164982.
I wish it would not break yours.

...Takumi

2012/10/2 Michael Gottesman <mgottesman at apple.com>:
> Author: mgottesman
> Date: Mon Oct  1 18:39:44 2012
> New Revision: 164978
>
> URL: http://llvm.org/viewvc/llvm-project?rev=164978&view=rev
> Log:
> [clang-tests] Changed relative paths to absolute paths in run command for annotate-macro-args.m, get-cursor-macro-args.m, import_self.c.
>
> This fixes make check-all failures when make -C is used to run the tests.
>
> Modified:
>     cfe/trunk/test/Index/annotate-macro-args.m
>     cfe/trunk/test/Index/get-cursor-macro-args.m
>     cfe/trunk/test/Preprocessor/import_self.c
>
> Modified: cfe/trunk/test/Index/annotate-macro-args.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/annotate-macro-args.m?rev=164978&r1=164977&r2=164978&view=diff
> ==============================================================================
> --- cfe/trunk/test/Index/annotate-macro-args.m (original)
> +++ cfe/trunk/test/Index/annotate-macro-args.m Mon Oct  1 18:39:44 2012
> @@ -1,11 +1,11 @@
>  // Test without PCH
> -// RUN: c-index-test -test-annotate-tokens=%S/annotate-macro-args.h:9:1:10:1 %s -include annotate-macro-args.h | FileCheck -check-prefix=CHECK1 %s
> -// RUN: c-index-test -test-annotate-tokens=%S/annotate-macro-args.h:15:1:16:1 %s -include annotate-macro-args.h | FileCheck -check-prefix=CHECK2 %s
> +// RUN: c-index-test -test-annotate-tokens=%S/annotate-macro-args.h:9:1:10:1 %s -include %S/annotate-macro-args.h | FileCheck -check-prefix=CHECK1 %s
> +// RUN: c-index-test -test-annotate-tokens=%S/annotate-macro-args.h:15:1:16:1 %s -include %S/annotate-macro-args.h | FileCheck -check-prefix=CHECK2 %s
>
>  // Test with PCH
> -// RUN: c-index-test -write-pch %t.pch -x objective-c-header %S/annotate-macro-args.h -Xclang -detailed-preprocessing-record
> -// RUN: c-index-test -test-annotate-tokens=%S/annotate-macro-args.h:9:1:10:1 %s -include-pch %t.pch | FileCheck -check-prefix=CHECK1 %s
> -// RUN: c-index-test -test-annotate-tokens=%S/annotate-macro-args.h:15:1:16:1 %s -include-pch %t.pch | FileCheck -check-prefix=CHECK2 %s
> +// RUN: c-index-test -write-pch %S/%t.pch -x objective-c-header %S/annotate-macro-args.h -Xclang -detailed-preprocessing-record
> +// RUN: c-index-test -test-annotate-tokens=%S/annotate-macro-args.h:9:1:10:1 %s -include-pch %S/%t.pch | FileCheck -check-prefix=CHECK1 %s
> +// RUN: c-index-test -test-annotate-tokens=%S/annotate-macro-args.h:15:1:16:1 %s -include-pch %S/%t.pch | FileCheck -check-prefix=CHECK2 %s
>
>  // CHECK1: Identifier: "MACRO" [9:3 - 9:8] macro expansion=MACRO:6:9
>  // CHECK1: Punctuation: "(" [9:8 - 9:9]
>
> Modified: cfe/trunk/test/Index/get-cursor-macro-args.m
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/get-cursor-macro-args.m?rev=164978&r1=164977&r2=164978&view=diff
> ==============================================================================
> --- cfe/trunk/test/Index/get-cursor-macro-args.m (original)
> +++ cfe/trunk/test/Index/get-cursor-macro-args.m Mon Oct  1 18:39:44 2012
> @@ -3,15 +3,15 @@
>  // RUN:              -cursor-at=%S/get-cursor-macro-args.h:9:21 \
>  // RUN:              -cursor-at=%S/get-cursor-macro-args.h:15:12 \
>  // RUN:              -cursor-at=%S/get-cursor-macro-args.h:15:20 \
> -// RUN:       %s -include get-cursor-macro-args.h | FileCheck %s
> +// RUN:       %s -include %S/get-cursor-macro-args.h | FileCheck %s
>
>  // Test with PCH
> -// RUN: c-index-test -write-pch %t.pch -x objective-c-header %S/get-cursor-macro-args.h
> +// RUN: c-index-test -write-pch %S/%t.pch -x objective-c-header %S/get-cursor-macro-args.h
>  // RUN: c-index-test -cursor-at=%S/get-cursor-macro-args.h:9:12 \
>  // RUN:              -cursor-at=%S/get-cursor-macro-args.h:9:21 \
>  // RUN:              -cursor-at=%S/get-cursor-macro-args.h:15:12 \
>  // RUN:              -cursor-at=%S/get-cursor-macro-args.h:15:20 \
> -// RUN:       %s -include-pch %t.pch | FileCheck %s
> +// RUN:       %s -include-pch %S/%t.pch | FileCheck %s
>
>  // CHECK:      ObjCClassRef=MyClass:1:12
>  // CHECK-NEXT: ObjCMessageExpr=meth:2:8
>
> Modified: cfe/trunk/test/Preprocessor/import_self.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Preprocessor/import_self.c?rev=164978&r1=164977&r2=164978&view=diff
> ==============================================================================
> --- cfe/trunk/test/Preprocessor/import_self.c (original)
> +++ cfe/trunk/test/Preprocessor/import_self.c Mon Oct  1 18:39:44 2012
> @@ -1,4 +1,4 @@
> -// RUN: %clang_cc1 -E -I. %s | grep BODY_OF_FILE | wc -l | grep 1
> +// RUN: %clang_cc1 -E -I%S %s | grep BODY_OF_FILE | wc -l | grep 1
>
>  // This #import should have no effect, as we're importing the current file.
>  #import <import_self.c>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits