Merge pull request #298 from compnerd/testing

test: update paths for new Foundation layout

Author: compnerd

Tests/Functional/lit.cfg

@@ -76,11 +76,17 @@ else:
     else:
         swift_exec.extend([
           '-Xlinker', '-rpath', '-Xlinker', foundation_dir,
-          '-Xlinker', '-rpath', '-Xlinker', os.path.join(foundation_dir, 'Foundation')
+          '-Xlinker', '-rpath', '-Xlinker', os.path.join(foundation_dir, 'Foundation'),
+          '-Xlinker', '-rpath', '-Xlinker', os.path.join(foundation_dir, 'Sources', 'Foundation'),
+          '-Xlinker', '-rpath', '-Xlinker', os.path.join(foundation_dir, 'Sources', 'FoundationNetworking'),
+          '-Xlinker', '-rpath', '-Xlinker', os.path.join(foundation_dir, 'Sources', 'FoundationXML'),
         ])
     swift_exec.extend([
         '-L', foundation_dir,
         '-L', os.path.join(foundation_dir, 'Foundation'),
+        '-L', os.path.join(foundation_dir, 'Sources', 'Foundation'),
+        '-L', os.path.join(foundation_dir, 'Sources', 'FoundationNetworking'),
+        '-L', os.path.join(foundation_dir, 'Sources', 'FoundationXML'),
         '-I', foundation_dir,
         '-I', os.path.join(foundation_dir, 'swift'),
         '-Xcc', '-F', '-Xcc', foundation_dir,
@@ -103,7 +109,15 @@ else:
                 '-L', os.path.join(libdispatch_build_dir, 'src'),
             ])
 
-    config.environment['LD_LIBRARY_PATH'] = "{}:{}/src:{}:{}".format(libdispatch_build_dir, libdispatch_build_dir, foundation_dir, os.path.join(foundation_dir, 'Foundation'))
+    config.environment['LD_LIBRARY_PATH'] = ":".join([
+      libdispatch_build_dir,
+      os.path.join(libdispatch_build_dir, 'src'),
+      foundation_dir,
+      os.path.join(foundation_dir, 'Foundation'),
+      os.path.join(foundation_dir, 'Sources', 'Foundation'),
+      os.path.join(foundation_dir, 'Sources', 'FoundationNetworking'),
+      os.path.join(foundation_dir, 'Sources', 'FoundationXML'),
+    ])
 
 # Having prepared the swiftc command, we set the substitution.
 config.substitutions.append(('%{swiftc}', ' '.join(swift_exec)))