<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 3 April 2018 at 14:30, Chandler Carruth <span dir="ltr"><<a href="mailto:chandlerc@gmail.com" target="_blank">chandlerc@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div class="gmail_quote"><span class="gmail-"><div dir="ltr">On Tue, Apr 3, 2018 at 1:52 PM Alex Lorenz via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">Author: arphaman<br>
Date: Tue Apr  3 13:50:05 2018<br>
New Revision: 329110<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=329110&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=329110&view=rev</a><br>
Log:<br>
[driver][darwin] Do not infer -simulator environment for non-simulator SDKs<br></blockquote><div><br></div></span><div>I know you added a REQUIRES line to these tests, but I think there is a much better way:</div><span class="gmail-"><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">
--- cfe/trunk/test/Driver/darwin-<wbr>sdkroot.c (original)<br>
+++ cfe/trunk/test/Driver/darwin-<wbr>sdkroot.c Tue Apr  3 13:50:05 2018<br>
@@ -51,12 +51,21 @@<br>
 // CHECK-IPHONE: "-triple" "arm64-apple-ios8.0.0"<br>
 // CHECK-IPHONE: ld<br>
 // CHECK-IPHONE: "-iphoneos_version_min" "8.0.0"<br>
+// RUN: env SDKROOT=%t/SDKs/iPhoneOS8.0.0.<wbr>sdk %clang %s -### 2>&1 \<br></blockquote><div><br></div></span><div>Instead of just running %clang, actually pass the `-target` you want to it like we do in the below invocation and the other invocations in this file.</div><div><br></div><div>We shouldn't lose driver testing on other systems as long as you can specify the desired target.</div></div></div></blockquote><div><br></div><div><br></div><div>Hi Chandler!<div><br></div><div>Thanks for pointing this out! We actually can't use -target here because when -target is specified, Darwin's driver won't infer the triple's environment from the SDKROOT. So this test covers the path in the driver that won't be taken when -target is specified.</div></div><div><br></div><div>You've made a good point about losing testing though. I can split out this test into the original file (with -target use) and the new tests which can't use -target and are Darwin specific to ensure we won't loose the existing coverage. I will commit a follow-up commit that does this.</div><div><br></div><div>Cheers,</div><div>Alex</div><div><br></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div class="gmail_quote"><div><div class="gmail-h5"><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">
+// RUN:   | FileCheck --check-prefix=CHECK-IPHONE-<wbr>X86 %s<br>
+// CHECK-IPHONE-X86: clang<br>
+// CHECK-IPHONE-X86: "-cc1"<br>
+// CHECK-IPHONE-X86: -apple-ios8.0.0"<br>
+// CHECK-IPHONE-X86: ld<br>
+// CHECK-IPHONE-X86: "-iphoneos_version_min" "8.0.0"<br>
 //<br>
 //<br>
 // RUN: rm -rf %t/SDKs/iPhoneSimulator8.0.sdk<br>
 // RUN: mkdir -p %t/SDKs/iPhoneSimulator8.0.sdk<br>
 // RUN: env SDKROOT=%t/SDKs/<wbr>iPhoneSimulator8.0.sdk %clang -target x86_64-apple-darwin %s -### 2>&1 \<br>
 // RUN:   | FileCheck --check-prefix=CHECK-SIMULATOR %s<br>
+// RUN: env SDKROOT=%t/SDKs/<wbr>iPhoneSimulator8.0.sdk %clang -arch x86_64 %s -### 2>&1 \<br>
+// RUN:   | FileCheck --check-prefix=CHECK-SIMULATOR %s<br>
 //<br>
 // CHECK-SIMULATOR: clang<br>
 // CHECK-SIMULATOR: "-cc1"<br>
@@ -74,3 +83,49 @@<br>
 // CHECK-MACOSX: "-triple" "x86_64-apple-macosx10.10.0"<br>
 // CHECK-MACOSX: ld<br>
 // CHECK-MACOSX: "-macosx_version_min" "10.10.0"<br>
+<br>
+// RUN: rm -rf %t/SDKs/WatchOS3.0.sdk<br>
+// RUN: mkdir -p %t/SDKs/WatchOS3.0.sdk<br>
+// RUN: env SDKROOT=%t/SDKs/WatchOS3.0.sdk %clang %s -### 2>&1 \<br>
+// RUN:   | FileCheck --check-prefix=CHECK-WATCH %s<br>
+//<br>
+// CHECK-WATCH: clang<br>
+// CHECK-WATCH: "-cc1"<br>
+// CHECK-WATCH: -apple-watchos3.0.0"<br>
+// CHECK-WATCH: ld<br>
+// CHECK-WATCH: "-watchos_version_min" "3.0.0"<br>
+//<br>
+//<br>
+// RUN: rm -rf %t/SDKs/WatchSimulator3.0.sdk<br>
+// RUN: mkdir -p %t/SDKs/WatchSimulator3.0.sdk<br>
+// RUN: env SDKROOT=%t/SDKs/<wbr>WatchSimulator3.0.sdk %clang %s -### 2>&1 \<br>
+// RUN:   | FileCheck --check-prefix=CHECK-WATCH-<wbr>SIMULATOR %s<br>
+//<br>
+// CHECK-WATCH-SIMULATOR: clang<br>
+// CHECK-WATCH-SIMULATOR: "-cc1"<br>
+// CHECK-WATCH-SIMULATOR: -apple-watchos3.0.0-simulator"<br>
+// CHECK-WATCH-SIMULATOR: ld<br>
+// CHECK-WATCH-SIMULATOR: "-watchos_simulator_version_<wbr>min" "3.0.0"<br>
+<br>
+// RUN: rm -rf %t/SDKs/AppleTVOS10.0.sdk<br>
+// RUN: mkdir -p %t/SDKs/AppleTVOS10.0.sdk<br>
+// RUN: env SDKROOT=%t/SDKs/AppleTVOS10.0.<wbr>sdk %clang %s -### 2>&1 \<br>
+// RUN:   | FileCheck --check-prefix=CHECK-TV %s<br>
+//<br>
+// CHECK-TV: clang<br>
+// CHECK-TV: "-cc1"<br>
+// CHECK-TV: -apple-tvos10.0.0"<br>
+// CHECK-TV: ld<br>
+// CHECK-TV: "-tvos_version_min" "10.0.0"<br>
+//<br>
+//<br>
+// RUN: rm -rf %t/SDKs/AppleTVSimulator10.0.<wbr>sdk<br>
+// RUN: mkdir -p %t/SDKs/AppleTVSimulator10.0.<wbr>sdk<br>
+// RUN: env SDKROOT=%t/SDKs/<wbr>AppleTVSimulator10.0.sdk %clang %s -### 2>&1 \<br>
+// RUN:   | FileCheck --check-prefix=CHECK-TV-<wbr>SIMULATOR %s<br>
+//<br>
+// CHECK-TV-SIMULATOR: clang<br>
+// CHECK-TV-SIMULATOR: "-cc1"<br>
+// CHECK-TV-SIMULATOR: -apple-tvos10.0.0-simulator"<br>
+// CHECK-TV-SIMULATOR: ld<br>
+// CHECK-TV-SIMULATOR: "-tvos_simulator_version_min" "10.0.0"<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div></div></div></div>
</blockquote></div><br></div></div>