luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4953 from eatkins/scripted-fixes 

Scripted fixes
This commit is contained in:
Ethan Atkins 2019-08-15 19:04:06 -07:00 committed by GitHub
parent 3b0171a50a 4c6df99b6a
commit dbd4fb115b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
View File

@ -19,12 +19,14 @@ import scala.collection.parallel.ForkJoinTaskSupport
import scala.util.control.NonFatal import scala.util.control.NonFatal
import sbt.internal.scripted._ import sbt.internal.scripted._
import sbt.internal.io.Resources import sbt.internal.io.Resources
import sbt.internal.util.{ BufferedLogger, FullLogger, ConsoleOut } import sbt.internal.util.{ BufferedLogger, ConsoleOut, FullLogger, Util }
import sbt.io.syntax._ import sbt.io.syntax._
import sbt.io.{ DirectoryFilter, HiddenFileFilter, IO } import sbt.io.{ DirectoryFilter, HiddenFileFilter, IO }
import sbt.io.FileFilter._ import sbt.io.FileFilter._
import sbt.util.{ AbstractLogger, Level, Logger } import sbt.util.{ AbstractLogger, Level, Logger }
import scala.util.Try
final class ScriptedTests( final class ScriptedTests(
resourceBaseDirectory: File, resourceBaseDirectory: File,
bufferLog: Boolean, bufferLog: Boolean,
@ -236,6 +238,8 @@ final class ScriptedTests(
case "source-dependencies/linearization" => LauncherBased // sbt/Package$ case "source-dependencies/linearization" => LauncherBased // sbt/Package$
case "source-dependencies/named" => LauncherBased // sbt/Package$ case "source-dependencies/named" => LauncherBased // sbt/Package$
case "source-dependencies/specialized" => LauncherBased // sbt/Package$ case "source-dependencies/specialized" => LauncherBased // sbt/Package$
case gn if gn.startsWith("watch/") && Util.isWindows =>
LauncherBased // there is an issue with jansi and coursier
case "watch/commands" => case "watch/commands" =>
LauncherBased // java.lang.ClassNotFoundException: javax.tools.DiagnosticListener when run with java 11 and an old sbt launcher LauncherBased // java.lang.ClassNotFoundException: javax.tools.DiagnosticListener when run with java 11 and an old sbt launcher
case "watch/managed" => LauncherBased // sbt/Package$ case "watch/managed" => LauncherBased // sbt/Package$
@ -325,7 +329,8 @@ final class ScriptedTests(
val runTest = () => { val runTest = () => {
// Reload and initialize (to reload contents of .sbtrc files) // Reload and initialize (to reload contents of .sbtrc files)
val pluginImplementation = createAutoPlugin(name) val pluginImplementation = createAutoPlugin(name)
IO.write(tempTestDir / "project" / "InstrumentScripted.scala", pluginImplementation) val pluginFile = tempTestDir / "project" / "InstrumentScripted.scala"
IO.write(pluginFile, pluginImplementation)
def sbtHandlerError = sys error "Missing sbt handler. Scripted is misconfigured." def sbtHandlerError = sys error "Missing sbt handler. Scripted is misconfigured."
val sbtHandler = handlers.getOrElse('>', sbtHandlerError) val sbtHandler = handlers.getOrElse('>', sbtHandlerError)
val commandsToRun = ";reload;setUpScripted" val commandsToRun = ";reload;setUpScripted"
@ -334,6 +339,9 @@ final class ScriptedTests(
// Run reload inside the hook to reuse error handling for pending tests // Run reload inside the hook to reuse error handling for pending tests
val wrapHook = (file: File) => { val wrapHook = (file: File) => {
preHook(file) preHook(file)
while (!Try(IO.read(pluginFile)).toOption.contains(pluginImplementation)) {
IO.write(pluginFile, pluginImplementation)
}
try runner.processStatement(sbtHandler, statement, states) try runner.processStatement(sbtHandler, statement, states)
catch { catch {
case t: Throwable => case t: Throwable =>