Skip to content

Commit

Permalink
Fix 1.5.0 regression in JLinkPLugin error handling (#1285)
Browse files Browse the repository at this point in the history
* Add a test for #1284

* Update tool-launcher
  • Loading branch information
nigredo-tori authored and muuki88 committed Nov 23, 2019
1 parent 1cafa21 commit 23d9732
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ libraryDependencies ++= Seq(
// for jdkpackager
"org.apache.ant" % "ant" % "1.10.5",
// workaround for the command line size limit
"com.github.eldis" % "tool-launcher" % "0.2.1",
"com.github.eldis" % "tool-launcher" % "0.2.2",
"org.scalatest" %% "scalatest" % "3.0.5" % Test
)

Expand Down
9 changes: 9 additions & 0 deletions src/sbt-test/jlink/test-jlink-misc/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import scala.sys.process.Process
import com.typesafe.sbt.packager.Compat._

val runChecks = taskKey[Unit]("Run checks for a specific issue")
val runFailingChecks = taskKey[Unit]("Run checks for a specific issue, expecting them to fail")

// Exclude Scala by default to simplify the test.
autoScalaLibrary in ThisBuild := false
Expand Down Expand Up @@ -80,3 +81,11 @@ val issue1266 = project

runChecks := jlinkBuildImage.value
)

// Should fail for invalid jlink inputs
val issue1284 = project
.enablePlugins(JlinkPlugin)
.settings(
jlinkModules := List("no-such-module"),
runFailingChecks := jlinkBuildImage.value
)
3 changes: 2 additions & 1 deletion src/sbt-test/jlink/test-jlink-misc/test
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
> issue1247BadAutoModuleName/runChecks
> issue1247ExternalModule/runChecks
> issue1247JakartaJavaModules/runChecks
> issue1266/runChecks
> issue1266/runChecks
-> issue1284/runFailingChecks

0 comments on commit 23d9732

Please sign in to comment.