---

yaml
---
r: 347033
b: refs/heads/master
c: 8e87833
h: refs/heads/master
i:
  347031: 03da816

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3f80d06c91520a675f63010f153a4e48b54b16f7
+refs/heads/master: 8e87833956f9015f2ad9b4af521bbd994c1a4e58
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/lit.cfg

@@ -1339,6 +1339,10 @@ else:
 config.substitutions.insert(0, ('%platform-module-dir', platform_module_dir))
 config.substitutions.insert(0, ('%platform-sdk-overlay-dir', platform_sdk_overlay_dir))
 
+if run_vendor != 'apple':
+    extra_frameworks_dir = ''
+config.substitutions.append(('%xcode-extra-frameworks-dir', extra_frameworks_dir))
+
 config.substitutions.append(('%target-swiftmodule-name', run_cpu + '.swiftmodule'))
 config.substitutions.append(('%target-swiftdoc-name', run_cpu + '.swiftdoc'))
 

trunk/validation-test/SIL/verify_all_overlays.py

@@ -1,11 +1,12 @@
 #!/usr/bin/python
 # RUN: ${python} %s %target-swiftmodule-name %platform-sdk-overlay-dir \
-# RUN:              %target-sil-opt -sdk %sdk -enable-sil-verify-all
+# RUN:              %target-sil-opt -sdk %sdk -enable-sil-verify-all \
+# RUN:                              -F "%xcode-extra-frameworks-dir"
 
 # REQUIRES: long_test
 # REQUIRES: nonexecutable_test
 
-# XFAIL: OS=macosx || OS=ios || OS=tvos
+# XFAIL: OS=macosx
 # https://bugs.swift.org/browse/SR-9847
 
 from __future__ import print_function
@@ -22,6 +23,7 @@
     module_name, ext = os.path.splitext(module_file)
     if ext != ".swiftmodule":
         continue
+    # Skip the standard library because it's tested elsewhere.
     if module_name == "Swift":
         continue
     print("# " + module_name)