Skip to content

Commit 10d77e9

Browse files
committed
Respect -Dpartest.scalac_opts when running the test suite through ANT
Used to enable `-Xcheckinit` (now also `-Ybackend:GenBCode`) when compiling tests in the respective jenkins builds. This is currently broken, as you can see in [recent build logs] [1], `-Xcheckinit` is missing: [partest] Scalac options are: -optimise Adds `.flags` files for macro tests (correct range positions not enforced) and for tests failing due to SI-8560 or SI-8562. [1]: https://scala-webapps.epfl.ch/jenkins/view/nightlies/job/scala-nightly-checkinit/2058/consoleFull
1 parent 251616a commit 10d77e9

13 files changed

+14
-3
lines changed

build-ant-macros.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@
745745
<attribute name="dir" default="${partest.dir}"/>
746746
<attribute name="srcdir" default="files"/> <!-- TODO: make targets for `pending` and other subdirs -->
747747
<attribute name="colors" default="${partest.colors}"/>
748-
<attribute name="scalacOpts" default="${scalac.args.optimise}"/>
748+
<attribute name="scalacOpts" default="${partest.scalac_opts} ${scalac.args.optimise}"/>
749749
<attribute name="pcp" default="${toString:partest.compilation.path}"/>
750750
<attribute name="kinds"/>
751751
<sequential>

src/partest-extras/scala/tools/partest/BytecodeTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ abstract class BytecodeTest extends ASMConverters {
3434
/** produce the output to be compared against a checkfile */
3535
protected def show(): Unit
3636

37-
def main(args: Array[String]): Unit = show
37+
def main(args: Array[String]): Unit = show()
3838

3939
// asserts
4040
def sameBytecode(methA: MethodNode, methB: MethodNode) = {

test/files/pos/dotless-targs.flags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Yrangepos:false
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
-Yrangepos:false
12
-language:dynamics
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Yrangepos:false
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
-language:experimental.macros
1+
-Yrangepos:false
2+
-language:experimental.macros
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Yrangepos:false
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Yrangepos:false
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Yrangepos:false

test/files/run/t6327.flags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-Yrangepos:false

0 commit comments

Comments
 (0)