Merge pull request #2006 from compnerd/unit-test-shims

Author: swift-ci

stdlib/private/SwiftPrivateLibcExtras/CMakeLists.txt

@@ -13,6 +13,7 @@ add_swift_library(swiftSwiftPrivateLibcExtras SHARED IS_STDLIB
   # This file should be listed the first.  Module name is inferred from the
   # filename.
   SwiftPrivateLibcExtras.swift
+  Subprocess.c
   Subprocess.swift
 
   SWIFT_MODULE_DEPENDS ${swift_private_darwin_extras_module_depends}

stdlib/private/SwiftPrivateLibcExtras/Subprocess.c

@@ -0,0 +1,57 @@
+//===--- Subprocess.cpp - Subprocess Stubs --------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+// NOTE: preprocess away the availability information to allow use of
+// unsupported APIs on certain targets (i.e. tvOS)
+#define availability(...)
+#include <spawn.h>
+#include <sys/types.h>
+#if defined(__APPLE__)
+// NOTE: forward declare this rather than including crt_externs.h as not all
+// SDKs provide it
+extern char ***_NSGetEnviron(void);
+#endif
+
+int swift_posix_spawn_file_actions_init(
+    posix_spawn_file_actions_t *file_actions) {
+  return posix_spawn_file_actions_init(file_actions);
+}
+
+int swift_posix_spawn_file_actions_destroy(
+    posix_spawn_file_actions_t *file_actions) {
+  return posix_spawn_file_actions_destroy(file_actions);
+}
+
+int swift_posix_spawn_file_actions_addclose(
+    posix_spawn_file_actions_t *file_actions, int filedes) {
+  return posix_spawn_file_actions_addclose(file_actions, filedes);
+}
+
+int swift_posix_spawn_file_actions_adddup2(
+    posix_spawn_file_actions_t *file_actions, int filedes, int newfiledes) {
+  return posix_spawn_file_actions_adddup2(file_actions, filedes, newfiledes);
+}
+
+int swift_posix_spawn(pid_t *__restrict pid, const char * __restrict path,
+                      const posix_spawn_file_actions_t *file_actions,
+                      const posix_spawnattr_t *__restrict attrp,
+                      char *const argv[__restrict],
+                      char *const envp[__restrict]) {
+  return posix_spawn(pid, path, file_actions, attrp, argv, envp);
+}
+
+#if defined(__APPLE__)
+char ***swift_SwiftPrivateLibcExtras_NSGetEnviron(void) {
+  return _NSGetEnviron();
+}
+#endif
+

stdlib/private/SwiftPrivateLibcExtras/Subprocess.swift

@@ -31,28 +31,28 @@ typealias swift_posix_spawn_file_actions_t = posix_spawn_file_actions_t
 typealias swift_posix_spawn_file_actions_t = posix_spawn_file_actions_t?
 #endif
 
-@_silgen_name("posix_spawn_file_actions_init")
+@_silgen_name("swift_posix_spawn_file_actions_init")
 func swift_posix_spawn_file_actions_init(
   _ file_actions: UnsafeMutablePointer<swift_posix_spawn_file_actions_t>
 ) -> CInt
 
-@_silgen_name("posix_spawn_file_actions_destroy")
+@_silgen_name("swift_posix_spawn_file_actions_destroy")
 func swift_posix_spawn_file_actions_destroy(
   _ file_actions: UnsafeMutablePointer<swift_posix_spawn_file_actions_t>
 ) -> CInt
 
-@_silgen_name("posix_spawn_file_actions_addclose")
+@_silgen_name("swift_posix_spawn_file_actions_addclose")
 func swift_posix_spawn_file_actions_addclose(
   _ file_actions: UnsafeMutablePointer<swift_posix_spawn_file_actions_t>,
   _ filedes: CInt) -> CInt
 
-@_silgen_name("posix_spawn_file_actions_adddup2")
+@_silgen_name("swift_posix_spawn_file_actions_adddup2")
 func swift_posix_spawn_file_actions_adddup2(
   _ file_actions: UnsafeMutablePointer<swift_posix_spawn_file_actions_t>,
   _ filedes: CInt,
   _ newfiledes: CInt) -> CInt
 
-@_silgen_name("posix_spawn")
+@_silgen_name("swift_posix_spawn")
 func swift_posix_spawn(
   _ pid: UnsafeMutablePointer<pid_t>?,
   _ file: UnsafePointer<Int8>,
@@ -276,7 +276,7 @@ public func posixWaitpid(_ pid: pid_t) -> ProcessTerminationStatus {
 }
 
 #if os(OSX) || os(iOS) || os(watchOS) || os(tvOS)
-@_silgen_name("_NSGetEnviron")
+@_silgen_name("swift_SwiftPrivateLibcExtras_NSGetEnviron")
 func _NSGetEnviron() -> UnsafeMutablePointer<UnsafeMutablePointer<UnsafeMutablePointer<CChar>?>>
 #endif