Merge pull request #287 from compnerd/foundation-layout

test: adjust for new Foundation layout

Author: compnerd

Tests/Functional/lit.cfg

@@ -74,9 +74,13 @@ else:
     if platform.system() == 'Windows':
         swift_exec.extend(['-Xlinker', '-nodefaultlib:libcmt'])
     else:
-        swift_exec.extend(['-Xlinker', '-rpath', '-Xlinker', foundation_dir,])
+        swift_exec.extend([
+          '-Xlinker', '-rpath', '-Xlinker', foundation_dir,
+          '-Xlinker', '-rpath', '-Xlinker', os.path.join(foundation_dir, 'Foundation')
+        ])
     swift_exec.extend([
         '-L', foundation_dir,
+        '-L', os.path.join(foundation_dir, 'Foundation'),
         '-I', foundation_dir,
         '-I', os.path.join(foundation_dir, 'swift'),
         '-Xcc', '-F', '-Xcc', foundation_dir,
@@ -99,7 +103,7 @@ else:
                 '-L', os.path.join(libdispatch_build_dir, 'src'),
             ])
 
-    config.environment['LD_LIBRARY_PATH'] = "{}:{}/src:{}".format(libdispatch_build_dir, libdispatch_build_dir, foundation_dir)
+    config.environment['LD_LIBRARY_PATH'] = "{}:{}/src:{}:{}".format(libdispatch_build_dir, libdispatch_build_dir, foundation_dir, os.path.join(foundation_dir, 'Foundation'))
 
 # Having prepared the swiftc command, we set the substitution.
 config.substitutions.append(('%{swiftc}', ' '.join(swift_exec)))