---

yaml
---
r: 338927
b: refs/heads/rxwei-patch-1
c: ab8387d
h: refs/heads/master
i:
  338925: 96b5fd6
  338923: 2de85c7
  338919: d7008f1
  338911: 9afab6d

Author: dan-zheng

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: e09fe6ddb62974e6ed2e4b942776d1fd33de1330
+refs/heads/rxwei-patch-1: ab8387d4cc9e48a308aa56e9396919be6ab17d85
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/cmake/modules/AddSwift.cmake

@@ -2206,16 +2206,12 @@ function(_add_swift_executable_single name)
   # SWIFT_ENABLE_TENSORFLOW
   set(swift_relative_library_path "../lib/swift/${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}")
   is_darwin_based_sdk("${SWIFTEXE_SINGLE_SDK}" IS_DARWIN)
-  # NOTE: Adding "${SWIFTLIB_DIR}/linux" to the rpath is a hack solely for
-  # working around tests like Driver/linker.swift which copy/hard link Swift
-  # executables to different directories without also copying the "libs"
-  # directory. A more robust solution should be found.
   # NOTE: Adding "${SWIFTLIB_DIR}/.." to the rpath was necessary to fix linker
   # errors for Syntax/Parser tests on Linux.
   if("${SWIFTEXE_SINGLE_SDK}" STREQUAL "LINUX" AND NOT "${SWIFTEXE_SINGLE_SDK}" STREQUAL "ANDROID")
-    set(local_rpath "$ORIGIN:$ORIGIN/${swift_relative_library_path}:${SWIFTLIB_DIR}/linux:${SWIFTLIB_DIR}/..:/usr/lib/swift/linux")
+    set(local_rpath "$ORIGIN:$ORIGIN/${swift_relative_library_path}:${SWIFTLIB_DIR}/..:/usr/lib/swift/linux")
   elseif("${SWIFTEXE_SINGLE_SDK}" STREQUAL "CYGWIN")
-    set(local_rpath "$ORIGIN:$ORIGIN/${swift_relative_library_path}:${SWIFTLIB_DIR}/cygwin:${SWIFTLIB_DIR}/..:/usr/lib/swift/cygwin")
+    set(local_rpath "$ORIGIN:$ORIGIN/${swift_relative_library_path}:${SWIFTLIB_DIR}/..:/usr/lib/swift/cygwin")
   endif()
   # END SWIFT_ENABLE_TENSORFLOW
 

branches/rxwei-patch-1/test/Driver/driver-compile.swift

@@ -1,6 +1,3 @@
-// SWIFT_ENABLE_TENSORFLOW: This test is unsupported because moving Swift executables without the TensorFlow libraries causes dynamic linking to fail.
-// UNSUPPORTED: tensorflow
-
 // RUN: %empty-directory(%t)
 
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s 2>&1 > %t.simple.txt

branches/rxwei-patch-1/test/Driver/linker-clang_rt.swift

@@ -1,6 +1,3 @@
-// SWIFT_ENABLE_TENSORFLOW: This test is unsupported because moving Swift executables without the TensorFlow libraries causes dynamic linking to fail.
-// UNSUPPORTED: tensorflow
-
 // Make sure that the platform-appropriate clang_rt library (found relative to
 // the compiler) is included when using Swift as a linker (with Apple targets).
 

branches/rxwei-patch-1/test/Driver/linker.swift

@@ -1,8 +1,5 @@
 // Must be able to run xcrun-return-self.sh
 // REQUIRES: shell
-// SWIFT_ENABLE_TENSORFLOW: This test is unsupported because moving Swift executables without the TensorFlow libraries causes dynamic linking to fail.
-// UNSUPPORTED: tensorflow
-
 // RUN: %swiftc_driver -driver-print-jobs -target x86_64-apple-macosx10.9 %s 2>&1 > %t.simple.txt
 // RUN: %FileCheck %s < %t.simple.txt
 // RUN: %FileCheck -check-prefix SIMPLE %s < %t.simple.txt

branches/rxwei-patch-1/test/Driver/options-repl-darwin.swift

@@ -1,6 +1,3 @@
-// SWIFT_ENABLE_TENSORFLOW: This test is unsupported because moving Swift executables without the TensorFlow libraries causes dynamic linking to fail.
-// UNSUPPORTED: tensorflow
-
 // REQUIRES: OS=macosx
 
 // Test LLDB detection, first in a clean environment, then in one that looks

branches/rxwei-patch-1/test/Driver/options-repl.swift

@@ -1,6 +1,3 @@
-// SWIFT_ENABLE_TENSORFLOW: This test is unsupported because moving Swift executables without the TensorFlow libraries causes dynamic linking to fail.
-// UNSUPPORTED: tensorflow
-
 // RUN: not %swift -repl %s 2>&1 | %FileCheck -check-prefix=REPL_NO_FILES %s
 // RUN: not %swift_driver -sdk "" -repl %s 2>&1 | %FileCheck -check-prefix=REPL_NO_FILES %s
 // RUN: not %swift_driver -sdk "" -lldb-repl %s 2>&1 | %FileCheck -check-prefix=REPL_NO_FILES %s

branches/rxwei-patch-1/test/Driver/static-stdlib.swift

@@ -1,6 +1,4 @@
 // Statically link a "hello world" program
-// SWIFT_ENABLE_TENSORFLOW: This test is unsupported because TensorFlow currently doesn't work with static-stdlib.
-// UNSUPPORTED: tensorflow
 // XFAIL: linux, win32
 // REQUIRES: static_stdlib
 // REQUIRES: executable_test

branches/rxwei-patch-1/test/Driver/subcommands.swift

@@ -1,7 +1,4 @@
 // REQUIRES: shell
-// SWIFT_ENABLE_TENSORFLOW: This test is unsupported because moving Swift executables without the TensorFlow libraries causes dynamic linking to fail.
-// UNSUPPORTED: tensorflow
-
 // Check that 'swift' and 'swift repl' invoke the REPL.
 
 // RUN: rm -rf %t.dir