[llvm-branch-commits] [cfe-branch] r226833 - Merging r226754:

[Hans Wennborg]

Author: hans
Date: Thu Jan 22 10:44:22 2015
New Revision: 226833

URL: http://llvm.org/viewvc/llvm-project?rev=226833&view=rev
Log:
Merging r226754:
------------------------------------------------------------------------
r226754 | hans | 2015-01-21 16:45:20 -0800 (Wed, 21 Jan 2015) | 9 lines

Fix compiler_builtins.m test to not rely on including system stdlib.h and malloc.h

Importing _Builtin_intrinsics.sse and avx would transitively pull in those
headers, and the test would fail when building in an environment where
they were not available on the include path.

This fixes PR20995 for me.

Differential Revision: http://reviews.llvm.org/D7112
------------------------------------------------------------------------

Added:
    cfe/branches/release_36/test/Modules/Inputs/System/usr/include/malloc.h
      - copied unchanged from r226754, cfe/trunk/test/Modules/Inputs/System/usr/include/malloc.h
    cfe/branches/release_36/test/Modules/Inputs/System/usr/include/stdlib.h
      - copied unchanged from r226754, cfe/trunk/test/Modules/Inputs/System/usr/include/stdlib.h
Modified:
    cfe/branches/release_36/   (props changed)
    cfe/branches/release_36/test/Modules/compiler_builtins.m

Propchange: cfe/branches/release_36/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 22 10:44:22 2015
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:226008,226049,226136,226282,226624
+/cfe/trunk:226008,226049,226136,226282,226624,226754
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_36/test/Modules/compiler_builtins.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_36/test/Modules/compiler_builtins.m?rev=226833&r1=226832&r2=226833&view=diff
==============================================================================
--- cfe/branches/release_36/test/Modules/compiler_builtins.m (original)
+++ cfe/branches/release_36/test/Modules/compiler_builtins.m Thu Jan 22 10:44:22 2015
@@ -1,6 +1,6 @@
 // RUN: rm -rf %t
-// RUN: %clang -fsyntax-only -fmodules -fmodules-cache-path=%t -D__need_wint_t %s -Xclang -verify
-// RUN: %clang -fsyntax-only -std=c99 -fmodules -fmodules-cache-path=%t -D__need_wint_t %s -Xclang -verify
+// RUN: %clang -fsyntax-only -fmodules -fmodules-cache-path=%t -D__need_wint_t %s -I%S/Inputs/System/usr/include -Xclang -verify
+// RUN: %clang -fsyntax-only -std=c99 -fmodules -fmodules-cache-path=%t -D__need_wint_t %s -I%S/Inputs/System/usr/include -Xclang -verify
 // expected-no-diagnostics
 
 #ifdef __SSE__