Skip to content

Commit 60a8927

Browse files
smartersmarter
committed
Fix scripted empty-package test
This test started failing after we started emitting .tasty files by default in 1293e2f, because sbt will not by default delete these .tasty files when the corresponding .class file is deleted, which means that the directories containing these files are not deleted either. This is problematic because dotty creates package symbols based on the name of directories on the classpath, even if the directories contain no classfile. Thankfully, I already fixed this issue in sbt-dotty yesterday in 452bc5e, so all we need to do is make the scripted tests use the sbt-dotty plugin. This commit does this, and also move these tests to the sbt-dotty project since they depend on it now.
1 parent 5fbf6b4 commit 60a8927

File tree

667 files changed

+1039
-1167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

667 files changed

+1039
-1167
lines changed

‎.drone.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pipeline:
2121
pull: true
2222
commands:
2323
- ./project/scripts/sbt ";clean ;publishLocal" "${CI_PUBLISH}"
24-
- ./project/scripts/sbt "dotty-sbt-scripted-tests/scripted source-dependencies/*" "${CI_PUBLISH}"
24+
- ./project/scripts/sbt "sbt-dotty/scripted source-dependencies/*" "${CI_PUBLISH}"
2525
- ./project/scripts/sbtPublish ${CI_PUBLISH} $SONATYPE_USER $SONATYPE_PW $PGP_PW
2626
volumes:
2727
- /home/drone/keys:/keys
@@ -50,7 +50,7 @@ matrix:
5050
CI_PUBLISH: true
5151
- CI_TEST: legacyTests
5252
CI_PUBLISH: false
53-
- CI_TEST: ;test;sbt-dotty/scripted
53+
- CI_TEST: ;test;sbt-dotty/scripted compilerReporter/*;sbt-dotty/scripted discovery/*;sbt-dotty/scripted sbt-dotty/*
5454
CI_PUBLISH: false
5555
- CI_TEST: dotty-bootstrapped/test
5656
CI_PUBLISH: false

‎.drone.yml.sig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL3NidCAiJHtDSV9URVNUfSIKICAgIHdoZW46CiAgICAgIGJyYW5jaDoKICAgICAgICBleGNsdWRlOiBnaC1wYWdlcwoKICBwdWJsaXNoX25pZ2h0bHk6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MjQtMDQtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICI7Y2xlYW4gO3B1Ymxpc2hMb2NhbCIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICJkb3R0eS1zYnQtc2NyaXB0ZWQtdGVzdHMvc2NyaXB0ZWQgc291cmNlLWRlcGVuZGVuY2llcy8qIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnRQdWJsaXNoICR7Q0lfUFVCTElTSH0gJFNPTkFUWVBFX1VTRVIgJFNPTkFUWVBFX1BXICRQR1BfUFcKICAgIHZvbHVtZXM6CiAgICAgIC0gL2hvbWUvZHJvbmUva2V5czova2V5cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IGRlcGxveW1lbnQKICAgICAgZW52aXJvbm1lbnQ6IG5pZ2h0bHkKCiAgZG9jdW1lbnRhdGlvbjoKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eToyNC0wNC0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9nZW5Eb2NzICIke0NJX1BVQkxJU0h9IiAkQk9UX1BBU1MKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCgogIHNsYWNrOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIGNoYW5uZWw6IGRvdHR5CiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBzdGF0dXM6IGNoYW5nZWQKCm1hdHJpeDoKICBpbmNsdWRlOgogICAgLSBDSV9URVNUOiBkb3R0eS1iaW4tdGVzdHMvdGVzdAogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGxlZ2FjeVRlc3RzCiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IDt0ZXN0O3NidC1kb3R0eS9zY3JpcHRlZAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQogICAgLSBDSV9URVNUOiBkb3R0eS1ib290c3RyYXBwZWQvdGVzdAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQo.A83lmQCwzpdgziEdBb3hlfSI1jnUd1hg6Peea01kqUU
1+
eyJhbGciOiJIUzI1NiJ9.IyBBZnRlciB1cGRhdGluZyB0aGlzIGZpbGUsIHlvdSBuZWVkIHRvIHJlLXNpZ24gaXQ6CiMKIyAtIEluc3RhbGwgW2Ryb25lLWNsaV0oaHR0cDovL3JlYWRtZS5kcm9uZS5pby91c2FnZS9nZXR0aW5nLXN0YXJ0ZWQtY2xpLykKIyAtIENvcHkgeW91ciB0b2tlbiBmcm9tICBodHRwOi8vZG90dHktY2kuZXBmbC5jaC9hY2NvdW50IChDbGljayBTSE9XIFRPS0VOKQojIC0gKGV4cG9ydCBEUk9ORV9UT0tFTj15b3VyLXRva2VuOyBleHBvcnQgRFJPTkVfU0VSVkVSPWh0dHA6Ly9kb3R0eS1jaS5lcGZsLmNoOyBkcm9uZSBzaWduIGxhbXBlcGZsL2RvdHR5KQojCiMgUGxlYXNlIG5vdGUgdGhhdCB0aGUgc2lnbmluZyBjYW4gb25seSBiZSBkb25lIGJ5IGNvbGxhYm9yYXRvcnMuCgpwaXBlbGluZToKICB0ZXN0OgogICAgaW1hZ2U6IGxhbXBlcGZsL2RvdHR5OjI0LTA0LTIwMTcKICAgIHB1bGw6IHRydWUKICAgIGNvbW1hbmRzOgogICAgICAtIC4vcHJvamVjdC9zY3JpcHRzL3NidCAiJHtDSV9URVNUfSIKICAgIHdoZW46CiAgICAgIGJyYW5jaDoKICAgICAgICBleGNsdWRlOiBnaC1wYWdlcwoKICBwdWJsaXNoX25pZ2h0bHk6CiAgICBpbWFnZTogbGFtcGVwZmwvZG90dHk6MjQtMDQtMjAxNwogICAgcHVsbDogdHJ1ZQogICAgY29tbWFuZHM6CiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICI7Y2xlYW4gO3B1Ymxpc2hMb2NhbCIgIiR7Q0lfUFVCTElTSH0iCiAgICAgIC0gLi9wcm9qZWN0L3NjcmlwdHMvc2J0ICJzYnQtZG90dHkvc2NyaXB0ZWQgc291cmNlLWRlcGVuZGVuY2llcy8qIiAiJHtDSV9QVUJMSVNIfSIKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9zYnRQdWJsaXNoICR7Q0lfUFVCTElTSH0gJFNPTkFUWVBFX1VTRVIgJFNPTkFUWVBFX1BXICRQR1BfUFcKICAgIHZvbHVtZXM6CiAgICAgIC0gL2hvbWUvZHJvbmUva2V5czova2V5cwogICAgd2hlbjoKICAgICAgZXZlbnQ6IGRlcGxveW1lbnQKICAgICAgZW52aXJvbm1lbnQ6IG5pZ2h0bHkKCiAgZG9jdW1lbnRhdGlvbjoKICAgIGltYWdlOiBsYW1wZXBmbC9kb3R0eToyNC0wNC0yMDE3CiAgICBwdWxsOiB0cnVlCiAgICBjb21tYW5kczoKICAgICAgLSAuL3Byb2plY3Qvc2NyaXB0cy9nZW5Eb2NzICIke0NJX1BVQkxJU0h9IiAkQk9UX1BBU1MKICAgIHdoZW46CiAgICAgIGJyYW5jaDogbWFzdGVyCgogIHNsYWNrOgogICAgaW1hZ2U6IHBsdWdpbnMvc2xhY2sKICAgIGNoYW5uZWw6IGRvdHR5CiAgICB3aGVuOgogICAgICBicmFuY2g6IG1hc3RlcgogICAgICBzdGF0dXM6IGNoYW5nZWQKCm1hdHJpeDoKICBpbmNsdWRlOgogICAgLSBDSV9URVNUOiBkb3R0eS1iaW4tdGVzdHMvdGVzdAogICAgICBDSV9QVUJMSVNIOiB0cnVlCiAgICAtIENJX1RFU1Q6IGxlZ2FjeVRlc3RzCiAgICAgIENJX1BVQkxJU0g6IGZhbHNlCiAgICAtIENJX1RFU1Q6IDt0ZXN0O3NidC1kb3R0eS9zY3JpcHRlZCBjb21waWxlclJlcG9ydGVyLyo7c2J0LWRvdHR5L3NjcmlwdGVkIGRpc2NvdmVyeS8qO3NidC1kb3R0eS9zY3JpcHRlZCBzYnQtZG90dHkvKgogICAgICBDSV9QVUJMSVNIOiBmYWxzZQogICAgLSBDSV9URVNUOiBkb3R0eS1ib290c3RyYXBwZWQvdGVzdAogICAgICBDSV9QVUJMSVNIOiBmYWxzZQo.jkK92hXwTlQ5DGTdeZfSCcyYC-cQT_5bYb6Qa0O-M5o

‎build.sbt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ val `dotty-library` = Build.`dotty-library`
1111
val `dotty-library-bootstrapped` = Build.`dotty-library-bootstrapped`
1212
val `dotty-sbt-bridge` = Build.`dotty-sbt-bridge`
1313
val `dotty-sbt-bridge-bootstrapped` = Build.`dotty-sbt-bridge-bootstrapped`
14-
val `dotty-sbt-scripted-tests` = Build.`dotty-sbt-scripted-tests`
1514
val `dotty-language-server` = Build.`dotty-language-server`
1615
val sjsSandbox = Build.sjsSandbox
1716
val `dotty-bench` = Build.`dotty-bench`

‎project/Build.scala‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -730,49 +730,6 @@ object Build {
730730
sources in Test := Seq()
731731
)
732732

733-
lazy val `dotty-sbt-scripted-tests` = project.in(file("sbt-scripted-tests")).
734-
settings(
735-
publishArtifact := false,
736-
resolvers += Resolver.typesafeIvyRepo("releases") // For org.scala-sbt:scripted
737-
).
738-
settings(ScriptedPlugin.scriptedSettings: _*).
739-
settings(
740-
ScriptedPlugin.sbtTestDirectory := baseDirectory.value / "sbt-test",
741-
ScriptedPlugin.scriptedLaunchOpts := Seq("-Xmx1024m"),
742-
ScriptedPlugin.scriptedBufferLog := false,
743-
ScriptedPlugin.scripted := ScriptedPlugin.scripted.dependsOn(Def.task {
744-
val x0 = (publishLocal in `dotty-sbt-bridge-bootstrapped`).value
745-
val x1 = (publishLocal in `dotty-interfaces`).value
746-
val x2 = (publishLocal in `dotty-compiler-bootstrapped`).value
747-
val x3 = (publishLocal in `dotty-library-bootstrapped`).value
748-
val x4 = (publishLocal in `scala-library`).value
749-
val x5 = (publishLocal in `scala-reflect`).value
750-
val x6 = (publishLocal in `dotty-bootstrapped`).value // Needed because sbt currently hardcodes the dotty artifact
751-
}).evaluated
752-
// TODO: Use this instead of manually copying DottyInjectedPlugin.scala
753-
// everywhere once https://github.com/sbt/sbt/issues/2601 gets fixed.
754-
/*,
755-
ScriptedPlugin.scriptedPrescripted := { f =>
756-
IO.write(inj, """
757-
import sbt._
758-
import Keys._
759-
760-
object DottyInjectedPlugin extends AutoPlugin {
761-
override def requires = plugins.JvmPlugin
762-
override def trigger = allRequirements
763-
764-
override val projectSettings = Seq(
765-
scalaVersion := "0.1.1-bin-SNAPSHOT",
766-
scalaOrganization := "ch.epfl.lamp",
767-
scalacOptions += "-language:Scala2",
768-
scalaBinaryVersion := "0.1"
769-
)
770-
}
771-
""")
772-
}
773-
*/
774-
)
775-
776733
lazy val `dotty-language-server` = project.in(file("language-server")).
777734
dependsOn(`dotty-compiler-bootstrapped`).
778735
settings(commonBootstrappedSettings).

sbt-scripted-tests/sbt-test/compilerReporter/simple/Source.scala renamed to sbt-dotty/sbt-test/compilerReporter/simple/Source.scala

File renamed without changes.

sbt-scripted-tests/sbt-test/compilerReporter/simple/build.sbt renamed to sbt-dotty/sbt-test/compilerReporter/simple/build.sbt

File renamed without changes.

sbt-scripted-tests/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala renamed to sbt-dotty/sbt-test/compilerReporter/simple/project/DottyInjectedPlugin.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ object DottyInjectedPlugin extends AutoPlugin {
77

88
override val projectSettings = Seq(
99
scalaVersion := "0.1.1-bin-SNAPSHOT",
10-
scalaOrganization := "ch.epfl.lamp",
11-
scalacOptions += "-language:Scala2",
12-
scalaBinaryVersion := "0.1"
10+
scalacOptions += "-language:Scala2"
1311
)
1412
}

sbt-scripted-tests/sbt-test/compilerReporter/simple/project/Reporter.scala renamed to sbt-dotty/sbt-test/compilerReporter/simple/project/Reporter.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,13 @@ object Reporter {
3636
check <<= (compile in Compile).mapFailure( _ => {
3737
val problems = reporter.get.problems
3838
println(problems.toList)
39-
assert(problems.size == 2)
39+
assert(problems.size == 1)
4040

4141
// Assert disabled because we don't currently pass positions to sbt
4242
// See https://github.com/lampepfl/dotty/pull/2107
4343
// assert(problems.forall(_.position.offset.isDefined))
4444

4545
assert(problems.count(_.severity == Severity.Error) == 1) // not found: er1,
46-
assert(problems.count(_.severity == Severity.Warn) == 1) // `with' as a type operator has been deprecated; use `&' instead,
4746
})
4847
)
4948
}

‎sbt-dotty/sbt-test/compilerReporter/simple/project/plugins.sbt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % sys.props("plugin.version"))

sbt-scripted-tests/sbt-test/compilerReporter/simple/test renamed to sbt-dotty/sbt-test/compilerReporter/simple/test

File renamed without changes.

0 commit comments

Comments
 (0)