Fix path separator

scala · Mar 8, 2024 · 77ad190 · 77ad190
1 parent 316a096
commit 77ad190
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 29 deletions.
diff --git a/tests/run-with-compiler/scala2-library-from-tasty-jar.scala b/tests/run-with-compiler/scala2-library-from-tasty-jar.scala
@@ -21,16 +21,16 @@ def dottyVersion =
   }.get
 
 def scalaLibJarPath =
-  s"out/bootstrap/scala2-library-tasty/scala-$dottyVersion-nonbootstrapped/scala2-library-tasty-experimental_3-$dottyVersion.jar"
+  s"out${separator}bootstrap${separator}scala2-library-tasty${separator}scala-$dottyVersion-nonbootstrapped${separator}scala2-library-tasty-experimental_3-$dottyVersion.jar"
 
 def scalaLibClassesPath =
   java.nio.file.Paths.get(
-    s"out/bootstrap/scala2-library-bootstrapped/scala-$dottyVersion-nonbootstrapped/classes")
+    s"out${separator}bootstrap${separator}scala2-library-bootstrapped${separator}scala-$dottyVersion-nonbootstrapped${separator}classes")
 
 lazy val scalaLibTastyPaths =
   new Directory(scalaLibClassesPath).deepFiles
     .filter(_.`extension` == "tasty")
-    .map(_.normalize.path.stripPrefix(scalaLibClassesPath.toString + "/"))
+    .map(_.normalize.path.stripPrefix(scalaLibClassesPath.toString + separator))
     .toList
 
 def compileFromTastyInJar(blacklisted: Set[String]): Unit = {
@@ -40,7 +40,7 @@ def compileFromTastyInJar(blacklisted: Set[String]): Unit = {
   val args = Array(
     "-classpath", ClasspathFromClassloader(getClass.getClassLoader),
     "-from-tasty",
-    "-d", "out/scala2-library-from-tasty-jar-test-output.jar",
+    "-d", s"out${separator}scala2-library-from-tasty-jar-test-output.jar",
     "-nowarn",
     yFromTastyBlacklist,
     scalaLibJarPath,
@@ -58,14 +58,14 @@ def compileBlacklisted = Set[String](
   //   at dotty.tools.backend.jvm.BCodeHelpers$BCInnerClassGen.getClassBTypeAndRegisterInnerClass$(BCodeHelpers.scala:210)
   //   at dotty.tools.backend.jvm.BCodeSkelBuilder$PlainSkelBuilder.getClassBTypeAndRegisterInnerClass(BCodeSkelBuilder.scala:62)
   //   at dotty.tools.backend.jvm.BCodeHelpers$BCInnerClassGen.internalName(BCodeHelpers.scala:237)
-  "scala/Array.tasty",
-  "scala/Boolean.tasty",
-  "scala/Byte.tasty",
-  "scala/Char.tasty",
-  "scala/Double.tasty",
-  "scala/Float.tasty",
-  "scala/Int.tasty",
-  "scala/Long.tasty",
-  "scala/Short.tasty",
-  "scala/Unit.tasty",
-).map(_.replace("/", separator))
+  s"scala${separator}Array.tasty",
+  s"scala${separator}Boolean.tasty",
+  s"scala${separator}Byte.tasty",
+  s"scala${separator}Char.tasty",
+  s"scala${separator}Double.tasty",
+  s"scala${separator}Float.tasty",
+  s"scala${separator}Int.tasty",
+  s"scala${separator}Long.tasty",
+  s"scala${separator}Short.tasty",
+  s"scala${separator}Unit.tasty",
+)
diff --git a/tests/run-with-compiler/scala2-library-from-tasty.scala b/tests/run-with-compiler/scala2-library-from-tasty.scala
@@ -22,12 +22,12 @@ def dottyVersion =
 
 def scalaLibClassesPath =
   java.nio.file.Paths.get(
-    s"out/bootstrap/scala2-library-bootstrapped/scala-$dottyVersion-nonbootstrapped/classes")
+    s"out${separator}bootstrap${separator}scala2-library-bootstrapped${separator}scala-$dottyVersion-nonbootstrapped${separator}classes")
 
 lazy val scalaLibTastyPaths =
   new Directory(scalaLibClassesPath).deepFiles
     .filter(_.`extension` == "tasty")
-    .map(_.normalize.path.stripPrefix(scalaLibClassesPath.toString + "/"))
+    .map(_.normalize.path.stripPrefix(scalaLibClassesPath.toString + separator))
     .toList
 
 def compileFromTasty(blacklisted: Set[String]): Unit = {
@@ -36,7 +36,7 @@ def compileFromTasty(blacklisted: Set[String]): Unit = {
   val args = Array(
     "-classpath", ClasspathFromClassloader(getClass.getClassLoader),
     "-from-tasty",
-    "-d", "out/scala2-library-from-tasty-test-output.jar",
+    "-d", s"out${separator}scala2-library-from-tasty-test-output.jar",
     "-nowarn",
   ) ++ tastyFiles.map(x => scalaLibClassesPath.resolve(x).toString)
   val reporter = driver.process(args)
@@ -52,14 +52,14 @@ def compileBlacklisted = Set[String](
   //   at dotty.tools.backend.jvm.BCodeHelpers$BCInnerClassGen.getClassBTypeAndRegisterInnerClass$(BCodeHelpers.scala:210)
   //   at dotty.tools.backend.jvm.BCodeSkelBuilder$PlainSkelBuilder.getClassBTypeAndRegisterInnerClass(BCodeSkelBuilder.scala:62)
   //   at dotty.tools.backend.jvm.BCodeHelpers$BCInnerClassGen.internalName(BCodeHelpers.scala:237)
-  "scala/Array.tasty",
-  "scala/Boolean.tasty",
-  "scala/Byte.tasty",
-  "scala/Char.tasty",
-  "scala/Double.tasty",
-  "scala/Float.tasty",
-  "scala/Int.tasty",
-  "scala/Long.tasty",
-  "scala/Short.tasty",
-  "scala/Unit.tasty",
-).map(_.replace("/", separator))
+  s"scala${separator}Array.tasty",
+  s"scala${separator}Boolean.tasty",
+  s"scala${separator}Byte.tasty",
+  s"scala${separator}Char.tasty",
+  s"scala${separator}Double.tasty",
+  s"scala${separator}Float.tasty",
+  s"scala${separator}Int.tasty",
+  s"scala${separator}Long.tasty",
+  s"scala${separator}Short.tasty",
+  s"scala${separator}Unit.tasty",
+)