From 2c7d615c1d766918be51f7bea91d6cdf5b21c7e6 Mon Sep 17 00:00:00 2001 From: rochala Date: Tue, 12 Jul 2022 12:12:23 +0200 Subject: [PATCH 1/2] fix-bash-script-exit-code test-paths --- compiler/test/dotty/tools/scripting/BashExitCodeTests.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala index 86d947cbc3bc..704a5bded301 100644 --- a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala +++ b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala @@ -28,7 +28,7 @@ object BashExitCodeTests: )(using temporaryDir: File): Unit = assertTestExists(testName) { testFile => val testFilePath = testFile.absPath - val commandline = (Seq(scalacPath, "-d", temporaryDir, testFilePath)).mkString(" ") + val commandline = (Seq(scalacPath, "-d", temporaryDir.absPath, testFilePath)).mkString(" ") val (validTest, exitCode, _, _) = bashCommand(commandline) if verifyValid(validTest) then assertEquals(expectedExitCode, exitCode) @@ -46,7 +46,7 @@ object BashExitCodeTests: )(using temporaryDir: File): Unit = val testClassFile = temporaryDir.files.find(_.getName == s"$className.class") assert(testClassFile.isDefined) - val commandline = (Seq(scalaPath, "-classpath", temporaryDir.getAbsolutePath, className)).mkString(" ") + val commandline = (Seq(scalaPath, "-classpath", temporaryDir.absPath, className)).mkString(" ") val (validTest, exitCode, o, e) = bashCommand(commandline) if verifyValid(validTest) then assertEquals(expectedExitCode, exitCode) From 3c3777c75fa8fefef13324ba2d9092859a97fe32 Mon Sep 17 00:00:00 2001 From: rochala Date: Tue, 12 Jul 2022 13:56:08 +0200 Subject: [PATCH 2/2] fix path for tasty file --- .../test/dotty/tools/scripting/BashExitCodeTests.scala | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala index 704a5bded301..ebe0c007f7ec 100644 --- a/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala +++ b/compiler/test/dotty/tools/scripting/BashExitCodeTests.scala @@ -47,7 +47,7 @@ object BashExitCodeTests: val testClassFile = temporaryDir.files.find(_.getName == s"$className.class") assert(testClassFile.isDefined) val commandline = (Seq(scalaPath, "-classpath", temporaryDir.absPath, className)).mkString(" ") - val (validTest, exitCode, o, e) = bashCommand(commandline) + val (validTest, exitCode, _, _) = bashCommand(commandline) if verifyValid(validTest) then assertEquals(expectedExitCode, exitCode) @@ -74,7 +74,7 @@ object BashExitCodeTests: */ private def testCommandExitCode(args: Seq[String], expectedExitCode: Int): Unit = val commandline = args.mkString(" ") - val (validTest, exitCode, output, erroutput) = bashCommand(commandline) + val (validTest, exitCode, _, _) = bashCommand(commandline) if verifyValid(validTest) then assertEquals(expectedExitCode, exitCode) @@ -118,7 +118,9 @@ object BashExitCodeTests: * Returns path to the generated tasty file for given directory and classname */ private def getGeneratedTastyPath(className: String)(using temporaryDir: File): String = - temporaryDir.toPath.resolve(s"$className.tasty").toString + val file = temporaryDir.files.find(_.getName == s"$className.tasty") + assert(file.isDefined) + file.get.absPath @Category(Array(classOf[BootstrappedOnlyTests])) class BashExitCodeTests: