From 7cf0cd3893bdf7bf1577e52a1565a87e563c57e8 Mon Sep 17 00:00:00 2001 From: Michael Gottesman Date: Mon, 1 Oct 2012 23:39:44 +0000 Subject: [PATCH] [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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@164978 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Index/annotate-macro-args.m | 10 +++++----- test/Index/get-cursor-macro-args.m | 6 +++--- test/Preprocessor/import_self.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/Index/annotate-macro-args.m b/test/Index/annotate-macro-args.m index b92c0b29eb..3bba5f41e3 100644 --- a/test/Index/annotate-macro-args.m +++ b/test/Index/annotate-macro-args.m @@ -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] diff --git a/test/Index/get-cursor-macro-args.m b/test/Index/get-cursor-macro-args.m index 4945fd389a..0996e8a365 100644 --- a/test/Index/get-cursor-macro-args.m +++ b/test/Index/get-cursor-macro-args.m @@ -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 diff --git a/test/Preprocessor/import_self.c b/test/Preprocessor/import_self.c index 8ba0b19c94..494d95f0f8 100644 --- a/test/Preprocessor/import_self.c +++ b/test/Preprocessor/import_self.c @@ -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 -- 2.40.0