Fix SwiftNativeLinkableTest on Windows

Reviewed By: bobyangyf fbshipit-source-id: 27f3875b25
classicvalues · May 8, 2019 · 1a6bbee · 1a6bbee
1 parent b8f2492
commit 1a6bbee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/test/com/facebook/buck/swift/BUCK b/test/com/facebook/buck/swift/BUCK
@@ -46,6 +46,7 @@ java_test(
         "//src/com/facebook/buck/event/listener:listener",
         "//src/com/facebook/buck/io:executable-finder",
         "//src/com/facebook/buck/io:io",
+        "//src/com/facebook/buck/io/file:file",
         "//src/com/facebook/buck/io/watchman:transport",
         "//src/com/facebook/buck/io/watchman:watchman",
         "//src/com/facebook/buck/json:json",

diff --git a/test/com/facebook/buck/swift/SwiftNativeLinkableTest.java b/test/com/facebook/buck/swift/SwiftNativeLinkableTest.java
@@ -25,6 +25,7 @@
 import com.facebook.buck.core.toolchain.tool.Tool;
 import com.facebook.buck.core.toolchain.tool.impl.VersionedTool;
 import com.facebook.buck.cxx.toolchain.linker.Linker;
+import com.facebook.buck.io.file.MorePaths;
 import com.facebook.buck.rules.args.Arg;
 import com.facebook.buck.swift.toolchain.SwiftPlatform;
 import com.facebook.buck.swift.toolchain.impl.SwiftPlatformFactory;
@@ -74,15 +75,15 @@ public void testStaticLinkerFlagsOnMobile() {
             "-Xlinker",
             "-rpath",
             "-Xlinker",
-            "/usr/lib/swift",
+            MorePaths.pathWithPlatformSeparators("/usr/lib/swift"),
             "-Xlinker",
             "-rpath",
             "-Xlinker",
-            "@executable_path/Frameworks",
+            MorePaths.pathWithPlatformSeparators("@executable_path/Frameworks"),
             "-Xlinker",
             "-rpath",
             "-Xlinker",
-            "@loader_path/Frameworks"));
+            MorePaths.pathWithPlatformSeparators("@loader_path/Frameworks")));
   }
 
   @Test
@@ -102,14 +103,14 @@ public void testStaticLinkerFlagsOnMac() {
             "-Xlinker",
             "-rpath",
             "-Xlinker",
-            "/usr/lib/swift",
+            MorePaths.pathWithPlatformSeparators("/usr/lib/swift"),
             "-Xlinker",
             "-rpath",
             "-Xlinker",
-            "@executable_path/../Frameworks",
+            MorePaths.pathWithPlatformSeparators("@executable_path/../Frameworks"),
             "-Xlinker",
             "-rpath",
             "-Xlinker",
-            "@loader_path/../Frameworks"));
+            MorePaths.pathWithPlatformSeparators("@loader_path/../Frameworks")));
   }
 }
diff --git a/windows_failures.txt b/windows_failures.txt
@@ -30,4 +30,3 @@
 !com.facebook.buck.core.build.engine.impl.CachingBuildEngineTest
 !com.facebook.buck.core.build.engine.impl.CachingBuildEngineTest.*
 !com.facebook.buck.core.model.graph.action.computation.ActionGraphCacheIntegrationTest
-!com.facebook.buck.swift.SwiftNativeLinkableTest