[llvm-branch-commits] [cfe-branch] r338687 - Merging r338552:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Thu Aug  2 01:51:08 2018
New Revision: 338687

URL: http://llvm.org/viewvc/llvm-project?rev=338687&view=rev
Log:
Merging r338552:
------------------------------------------------------------------------
r338552 | filcab | 2018-08-01 15:41:11 +0200 (Wed, 01 Aug 2018) | 1 line

Add REQUIRES: native to a test that assumes it
------------------------------------------------------------------------

Modified:
    cfe/branches/release_70/   (props changed)
    cfe/branches/release_70/test/Driver/darwin-infer-simulator-sdkroot.c

Propchange: cfe/branches/release_70/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug  2 01:51:08 2018
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:338602
+/cfe/trunk:338552,338602
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_70/test/Driver/darwin-infer-simulator-sdkroot.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_70/test/Driver/darwin-infer-simulator-sdkroot.c?rev=338687&r1=338686&r2=338687&view=diff
==============================================================================
--- cfe/branches/release_70/test/Driver/darwin-infer-simulator-sdkroot.c (original)
+++ cfe/branches/release_70/test/Driver/darwin-infer-simulator-sdkroot.c Thu Aug  2 01:51:08 2018
@@ -1,6 +1,6 @@
 // Check that SDKROOT does not infer simulator on when it points to a regular
 // SDK.
-// REQUIRES: system-darwin
+// REQUIRES: system-darwin && native
 //
 // RUN: rm -rf %t/SDKs/iPhoneOS8.0.0.sdk
 // RUN: mkdir -p %t/SDKs/iPhoneOS8.0.0.sdk