Skip to content

Commit 950735d

Browse files
committed
Fix/Disable newly added tests
TODO: implement these functionalities for scripted tests: - checkRecompilations - checkClasses - checkDependencies - checkProducts
1 parent 97c5d92 commit 950735d

File tree

27 files changed

+46
-29
lines changed

27 files changed

+46
-29
lines changed

compiler/src/dotty/tools/dotc/sbt/ExtractAPI.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ private class ExtractAPICollector(implicit val ctx: Context) extends ThunkHolder
428428
// that some API changed when it didn't, leading to overcompilation
429429
// (recompiling more things than what is needed for incremental
430430
// compilation to be correct).
431-
val prefix = if (sym.owner.is(Package))
431+
val prefix = if (sym.maybeOwner.is(Package)) // { type T } here T does not have an owner
432432
sym.owner.thisType
433433
else
434434
tp.prefix

sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/test renamed to sbt-dotty/sbt-test/source-dependencies/anon-java-scala-class/disabled

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# TODO: Implement checkRecompilations
2+
13
# Verifies if dependencies introduced by Java inheritance by local classes are handled correctly.
24
# See sbt-test 'local-class-inheritance' for a similar test in Scala.
35

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
# TODO: Implement checkClasses
2+
13
> compile
24
> checkClasses A.scala: A
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# TODO: implement checkDependencies
2+
13
> compile
24

35
> checkDependencies A: B C
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
# TODO: implement check-products
2+
13
> compile
24
> checkProducts A.scala: A.class A$.class

sbt-dotty/sbt-test/source-dependencies/check-recompilations/test renamed to sbt-dotty/sbt-test/source-dependencies/check-recompilations/disabled

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# TODO: Implement checkRecompilations
2+
13
> compile
24

35
$ copy-file changes/A.scala A.scala

sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/test renamed to sbt-dotty/sbt-test/source-dependencies/class-based-inheritance/disabled

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# TODO: implement checkRecompilations
2+
13
# Test for class-based invalidation of dependencies
24
# by inheritance. The source file A.scala defines
35
# A and A2 classes. The B.scala inherits from A2 but

sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/test renamed to sbt-dotty/sbt-test/source-dependencies/class-based-memberRef/disabled

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# TODO: Implement checkRecompilations
2+
13
# Test for class-based invalidation of dependencies by member reference
24
# This test checks if name hashes are tracked at the class level so
35
# only classes that depend on an API of a modified class are invalidated
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import complete.DefaultParsers._
2+
3+
val checkIterations = inputKey[Unit]("Verifies the accumlated number of iterations of incremental compilation.")
4+
5+
checkIterations := {
6+
val analysis = (compile in Compile).value.asInstanceOf[sbt.internal.inc.Analysis]
7+
8+
val expected: Int = (Space ~> NatBasic).parsed
9+
val actual: Int = analysis.compilations.allCompilations.size
10+
assert(expected == actual, s"Expected $expected compilations, got $actual")
11+
}
12+

sbt-dotty/sbt-test/source-dependencies/java-inner/test renamed to sbt-dotty/sbt-test/source-dependencies/java-inner/disabled

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# TODO: Implement checkProducts, checkDependencies
2+
13
> compile
24
> checkProducts A.java: A.class A$B.class
35
> checkProducts C.java: C.class

0 commit comments

Comments
 (0)