Skip to content

Commit 392b0f1

Browse files
committed
Merge pull request #853 from dotty-staging/partest-run
Run CI-partest with bootstrapped compiler
2 parents 3c6f28b + c326d15 commit 392b0f1

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

project/Build.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ object DottyBuild extends Build {
8181
val args = Def.spaceDelimited("<arg>").parsed
8282
val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++
8383
getJarPaths(partestDeps.value, ivyPaths.value.ivyHome)
84-
val dottyJars = "-dottyJars " + jars.length + " " + jars.mkString(" ")
84+
val dottyJars = "-dottyJars " + (jars.length + 1) + " dotty.jar" + " " + jars.mkString(" ")
8585
// Provide the jars required on the classpath of run tests
8686
runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" "))
8787
},
@@ -118,8 +118,8 @@ object DottyBuild extends Build {
118118

119119
("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath
120120
}
121-
) ++ addCommandAlias("partest", ";test:package;package;lockPartestFile;test:test;runPartestRunner") ++
122-
addCommandAlias("partest-only", ";test:package;package;lockPartestFile;test:test-only dotc.tests;runPartestRunner")
121+
) ++ addCommandAlias("partest", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test;runPartestRunner") ++
122+
addCommandAlias("partest-only", ";test:package;package;test:runMain dotc.build;lockPartestFile;test:test-only dotc.tests;runPartestRunner")
123123

124124
lazy val dotty = Project(id = "dotty", base = file("."), settings = defaults)
125125

scripts/jobs/validate/partest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ baseDir=${WORKSPACE-`pwd`}
44
scriptsDir="$baseDir/scripts"
55
. $scriptsDir/common
66

7-
sbt $sbtArgs update compile "partest-only run --show-diff --verbose"
7+
sbt $sbtArgs update compile "partest-only --show-diff --verbose"
88

src/dotty/tools/dotc/core/Denotations.scala

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,11 @@ object Denotations {
193193
*/
194194
def requiredSymbol(p: Symbol => Boolean, source: AbstractFile = null, generateStubs: Boolean = true)(implicit ctx: Context): Symbol =
195195
disambiguate(p) match {
196-
case MissingRef(ownerd, name) =>
197-
if (generateStubs)
196+
case m @ MissingRef(ownerd, name) =>
197+
if (generateStubs) {
198+
m.ex.printStackTrace()
198199
ctx.newStubSymbol(ownerd.symbol, name, source)
200+
}
199201
else NoSymbol
200202
case NoDenotation | _: NoQualifyingRef =>
201203
throw new TypeError(s"None of the alternatives of $this satisfies required predicate")
@@ -858,7 +860,9 @@ object Denotations {
858860
/** An error denotation that provides more info about the missing reference.
859861
* Produced by staticRef, consumed by requiredSymbol.
860862
*/
861-
case class MissingRef(val owner: SingleDenotation, name: Name)(implicit ctx: Context) extends ErrorDenotation
863+
case class MissingRef(val owner: SingleDenotation, name: Name)(implicit ctx: Context) extends ErrorDenotation {
864+
val ex: Exception = new Exception
865+
}
862866

863867
/** An error denotation that provides more info about alternatives
864868
* that were found but that do not qualify.

src/dotty/tools/dotc/core/unpickleScala2/Scala2Unpickler.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,7 @@ class Scala2Unpickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClas
405405
// println(owner.info.decls.toList.map(_.debugString).mkString("\n ")) // !!! DEBUG
406406
// }
407407
// (5) Create a stub symbol to defer hard failure a little longer.
408+
new Exception().printStackTrace()
408409
ctx.newStubSymbol(owner, name, source)
409410
}
410411
}

0 commit comments

Comments
 (0)