Swift binding fixes (swiftlang#25)

* [swift-bindings] Add to test target dependency only if swiftc is found

* [swift-bindings] don't assume build dir in swift-binding test

Author: aciidgh

tests/CMakeLists.txt

@@ -33,7 +33,11 @@ if(PYTHONINTERP_FOUND)
     --param build_mode=${build_mode})
 
   set(test_target_dependencies
-    llbuild libllbuild swift-bindings swift-build-tool UnitTests)
+    llbuild libllbuild swift-build-tool UnitTests)
+
+  if (SWIFTC_FOUND)
+    list(APPEND test_target_dependencies swift-bindings)
+  endif()
 
   add_custom_target(test-llbuild
     COMMAND ${lit_command} ${CMAKE_CURRENT_BINARY_DIR}

tests/Examples/swift-bindings/core/basic.txt

@@ -1,7 +1,7 @@
 # Check basic 'core' functionality of the swift bindings
 #
 # REQUIRES: has-swift=TRUE
-# RUN: env LD_LIBRARY_PATH=%{llbuild-lib-dir} %{swiftc} %{swiftc-platform-flags} %{srcroot}/examples/swift-bindings/core/basic.swift -I %{srcroot}/build/products/swift-bindings -I %{srcroot}/products/libllbuild/public-api -Xlinker %{llbuild-lib-dir}/swift-bindings.dylib -o %t.exe
+# RUN: env LD_LIBRARY_PATH=%{llbuild-lib-dir} %{swiftc} %{swiftc-platform-flags} %{srcroot}/examples/swift-bindings/core/basic.swift -I %{build-dir}/products/swift-bindings -I %{srcroot}/products/libllbuild/public-api -Xlinker %{llbuild-lib-dir}/swift-bindings.dylib -o %t.exe
 # RUN: env LD_LIBRARY_PATH=%{llbuild-lib-dir} %t.exe %s > %t.out
 # RUN: cat %t.out
 # RUN: %{FileCheck} %s --input-file %t.out

tests/lit.cfg

@@ -79,6 +79,7 @@ config.substitutions.append( ('%{swiftc}', config.swiftc_path) )
 config.substitutions.append( ('%{llbuild-lib-dir}', llbuild_lib_dir) )
 config.substitutions.append( ('%{srcroot}', llbuild_src_root) )
 config.substitutions.append( ('%{swiftc-platform-flags}', "" if not config.osx_sysroot else "-sdk " + config.osx_sysroot) )
+config.substitutions.append( ('%{build-dir}', llbuild_obj_root) ) 
 
 ###