Skip to content

Commit

Permalink
Update sbt-plugin tests to use new linking tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
gzm0 committed Oct 2, 2020
1 parent fa36493 commit 0c74efa
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
20 changes: 10 additions & 10 deletions sbt-plugin/src/sbt-test/incremental/change-config-and-source/test
@@ -1,16 +1,16 @@
$ copy-file Main.scala.first Main.scala
> fastOptJS
$ copy-file target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-1.js
> fastLinkJS
$ copy-file target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-1.js

# When the linker config and source both change, re-running fastOptJS should re-link:
# When the linker config and source both change, re-running fastLinkJS should re-link:
> set scalaJSLinkerConfig ~= (_.withOptimizer(false))
$ copy-file Main.scala.second Main.scala
> fastOptJS
-$ must-mirror target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-1.js
$ newer target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-1.js
$ copy-file target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-2.js
> fastLinkJS
-$ must-mirror target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-1.js
$ newer target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-1.js
$ copy-file target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-2.js

# However, this re-linking should not happen more than once:
> fastOptJS
$ must-mirror target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-2.js
-$ newer target/scala-2.12/change-config-and-source-fastopt.js target/scala-2.12/output-2.js
> fastLinkJS
$ must-mirror target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-2.js
-$ newer target/scala-2.12/change-config-and-source-dev/main.js target/scala-2.12/output-2.js
20 changes: 10 additions & 10 deletions sbt-plugin/src/sbt-test/incremental/change-config/test
@@ -1,14 +1,14 @@
> fastOptJS
$ copy-file target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-1.js
> fastLinkJS
$ copy-file target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-1.js

# When the linker config changes, re-running fastOptJS should re-link:
# When the linker config changes, re-running fastLinkJS should re-link:
> set scalaJSLinkerConfig ~= (_.withOptimizer(false))
> fastOptJS
-$ must-mirror target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-1.js
$ newer target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-1.js
$ copy-file target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-2.js
> fastLinkJS
-$ must-mirror target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-1.js
$ newer target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-1.js
$ copy-file target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-2.js

# However, this re-linking should not happen more than once:
> fastOptJS
$ must-mirror target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-2.js
-$ newer target/scala-2.12/change-config-fastopt.js target/scala-2.12/output-2.js
> fastLinkJS
$ must-mirror target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-2.js
-$ newer target/scala-2.12/change-config-dev/main.js target/scala-2.12/output-2.js
6 changes: 3 additions & 3 deletions sbt-plugin/src/sbt-test/incremental/fix-compile-error/test
@@ -1,6 +1,6 @@
$ copy-file Data.scala.good Data.scala
> fastOptJS
> fastLinkJS
$ copy-file Data.scala.broken Data.scala
-> fastOptJS
-> fastLinkJS
$ copy-file Data.scala.fixed Data.scala
> fastOptJS
> fastLinkJS
@@ -1 +1 @@
> my-project/compile:fastOptJS
> my-project/compile:fastLinkJS
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/linker/non-existent-classpath/test
@@ -1 +1 @@
> fastOptJS
> fastLinkJS

0 comments on commit 0c74efa

Please sign in to comment.