Merge pull request #422 from seabaylea/dispatch-tests

Enable libdispatch usage in TestFoundation

Author: modocache

build.py

@@ -77,7 +77,8 @@
 #	swift_cflags += ([
 #		'-DDEPLOYMENT_ENABLE_LIBDISPATCH',
 #		'-I'+Configuration.current.variables["LIBDISPATCH_SOURCE_DIR"],
-#		'-I'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src'
+#		'-I'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src',
+#		'-Xcc -fblocks'
 #	])
 #	foundation.LDFLAGS += '-ldispatch -L'+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+'/src/.libs -rpath \$$ORIGIN '
 
@@ -429,6 +430,12 @@
 
 script.add_product(foundation)
 
+LIBS_DIRS = "LD_LIBRARY_PATH=${BUILD_DIR}/Foundation/"
+if "XCTEST_BUILD_DIR" in Configuration.current.variables:
+    LIBS_DIRS += ":${XCTEST_BUILD_DIR}" 
+if "LIBDISPATCH_BUILD_DIR" in Configuration.current.variables:
+    LIBS_DIRS += ":"+Configuration.current.variables["LIBDISPATCH_BUILD_DIR"]+"/src/.libs"
+
 extra_script = """
 rule InstallFoundation
     command = mkdir -p "${DSTROOT}/${PREFIX}/lib/swift/${OS}"; $
@@ -444,21 +451,9 @@
 build install: phony | ${BUILD_DIR}/.install
 
 """
-if "XCTEST_BUILD_DIR" in Configuration.current.variables:
-	extra_script += """
-rule RunTestFoundation
-    command = echo "**** RUNNING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/:${XCTEST_BUILD_DIR} ${BUILD_DIR}/TestFoundation/TestFoundation\\n**** DEBUGGING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/:${XCTEST_BUILD_DIR} lldb ${BUILD_DIR}/TestFoundation/TestFoundation\\n"
-    description = Building Tests
-
-build ${BUILD_DIR}/.test: RunTestFoundation | TestFoundation
-
-build test: phony | ${BUILD_DIR}/.test
-
-"""
-else:
-	extra_script += """
+extra_script += """
 rule RunTestFoundation
-    command = echo "**** RUNNING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/ ${BUILD_DIR}/TestFoundation/TestFoundation\\n**** DEBUGGING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${BUILD_DIR}/Foundation/ lldb ${BUILD_DIR}/TestFoundation/TestFoundation\\n"
+    command = echo "**** RUNNING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${LIBS_DIRS} ${BUILD_DIR}/TestFoundation/TestFoundation\\n**** DEBUGGING TESTS ****\\nexecute:\\nLD_LIBRARY_PATH=${LIBS_DIRS} lldb ${BUILD_DIR}/TestFoundation/TestFoundation\\n"
     description = Building Tests
 
 build ${BUILD_DIR}/.test: RunTestFoundation | TestFoundation