[llvm-branch-commits] [cfe-branch] r143945 - in /cfe/branches/release_30: ./ test/PCH/reloc.c

[Chandler Carruth]

Author: chandlerc
Date: Mon Nov  7 04:33:32 2011
New Revision: 143945

URL: http://llvm.org/viewvc/llvm-project?rev=143945&view=rev
Log:
Merging r143863:
------------------------------------------------------------------------
r143863 | chandlerc | 2011-11-05 23:59:15 -0700 (Sat, 05 Nov 2011) | 4 lines

This test was assuming that /usr/include was in the system header search
path. That assumption should never have been true, but it was until
I fixed it. Now that its fixed, add a triple here to get correct
behavior even on Windows.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_30/   (props changed)
    cfe/branches/release_30/test/PCH/reloc.c

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  7 04:33:32 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823,143836,143838-143842
+/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751-143752,143798,143801,143804-143807,143822-143823,143836,143838-143842,143863
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/test/PCH/reloc.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/test/PCH/reloc.c?rev=143945&r1=143944&r2=143945&view=diff
==============================================================================
--- cfe/branches/release_30/test/PCH/reloc.c (original)
+++ cfe/branches/release_30/test/PCH/reloc.c Mon Nov  7 04:33:32 2011
@@ -1,6 +1,8 @@
-// RUN: %clang --relocatable-pch -o %t -isysroot %S/libroot %S/libroot/usr/include/reloc.h
-// RUN: %clang -fsyntax-only -include-pch %t -isysroot %S/libroot %s -Xclang -verify
-// RUN: not %clang -include-pch %t %s
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 --relocatable-pch -o %t \
+// RUN:   -isysroot %S/libroot %S/libroot/usr/include/reloc.h
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 -fsyntax-only \
+// RUN:   -include-pch %t -isysroot %S/libroot %s -Xclang -verify
+// RUN: not %clang -ccc-host-triple x86_64-apple-darwin10 -include-pch %t %s
 
 #include <reloc.h>
 
@@ -8,7 +10,5 @@
 int y = 5; // expected-error{{redefinition}}
 
 
-
-
 // expected-note{{previous definition}}
 // expected-note{{previous definition}}