summaryrefslogtreecommitdiff
path: root/build-ant-macros.xml
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2014-05-02 15:31:07 +0200
committerLukas Rytz <lukas.rytz@gmail.com>2014-05-07 12:22:06 +0200
commit10d77e905bf631ab7a7ade9e7a6b6d5abf2596f4 (patch)
tree606e456d8e379b79d80725ea8059019a9b7c488f /build-ant-macros.xml
parent251616a107f4255203e318c9f6342f774d25e66d (diff)
downloadscala-10d77e905bf631ab7a7ade9e7a6b6d5abf2596f4.tar.gz
scala-10d77e905bf631ab7a7ade9e7a6b6d5abf2596f4.tar.bz2
scala-10d77e905bf631ab7a7ade9e7a6b6d5abf2596f4.zip
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
Diffstat (limited to 'build-ant-macros.xml')
-rw-r--r--build-ant-macros.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/build-ant-macros.xml b/build-ant-macros.xml
index ea5652770e..bd0e723b9b 100644
--- a/build-ant-macros.xml
+++ b/build-ant-macros.xml
@@ -745,7 +745,7 @@
<attribute name="dir" default="${partest.dir}"/>
<attribute name="srcdir" default="files"/> <!-- TODO: make targets for `pending` and other subdirs -->
<attribute name="colors" default="${partest.colors}"/>
- <attribute name="scalacOpts" default="${scalac.args.optimise}"/>
+ <attribute name="scalacOpts" default="${partest.scalac_opts} ${scalac.args.optimise}"/>
<attribute name="pcp" default="${toString:partest.compilation.path}"/>
<attribute name="kinds"/>
<sequential>