[llvm-branch-commits] [cfe-branch] r351343 - Merging r351334:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Wed Jan 16 05:42:45 2019
New Revision: 351343

URL: http://llvm.org/viewvc/llvm-project?rev=351343&view=rev
Log:
Merging r351334:
------------------------------------------------------------------------
r351334 | ibiryukov | 2019-01-16 14:18:59 +0100 (Wed, 16 Jan 2019) | 8 lines

Set '-target' flag in the test checking the MacOS include dir

To fix a buildbot failure on PS4, see
http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-ubuntu-fast/builds/42251

The test was added in r351222 and aims to check only a particular
Mac configuration. However it relied on the default compiler target
by default, therefore unintentionally failing on PS4.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_80/   (props changed)
    cfe/branches/release_80/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp

Propchange: cfe/branches/release_80/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 16 05:42:45 2019
@@ -1,3 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
+/cfe/trunk:351334
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_80/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_80/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp?rev=351343&r1=351342&r2=351343&view=diff
==============================================================================
--- cfe/branches/release_80/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp (original)
+++ cfe/branches/release_80/test/Tooling/clang-check-mac-libcxx-fixed-compilation-db.cpp Wed Jan 16 05:42:45 2019
@@ -10,7 +10,7 @@
 //
 // RUN: cp $(which clang-check) %t/mock-libcxx/bin/
 // RUN: cp "%s" "%t/test.cpp"
-// RUN: %t/mock-libcxx/bin/clang-check -p "%t" "%t/test.cpp" -- -stdlib=libc++
+// RUN: %t/mock-libcxx/bin/clang-check -p "%t" "%t/test.cpp" -- -stdlib=libc++ -target x86_64-apple-darwin
 
 #include <mock_vector>
 vector v;