diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-05-07 15:20:13 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2014-05-07 15:20:13 +0200 |
| commit | 9ad96d07ee9d1ef1a9a072873711ff911caafc71 (patch) | |
| tree | 606e456d8e379b79d80725ea8059019a9b7c488f | |
| parent | 251616a107f4255203e318c9f6342f774d25e66d (diff) | |
| parent | 10d77e905bf631ab7a7ade9e7a6b6d5abf2596f4 (diff) | |
| download | scala-9ad96d07ee9d1ef1a9a072873711ff911caafc71.tar.gz scala-9ad96d07ee9d1ef1a9a072873711ff911caafc71.tar.bz2 scala-9ad96d07ee9d1ef1a9a072873711ff911caafc71.zip | |
Merge pull request #3718 from lrytz/partestArgs
Respect -Dpartest.scalac_opts when running the test suite through ANT
| -rw-r--r-- | build-ant-macros.xml | 2 | ||||
| -rw-r--r-- | src/partest-extras/scala/tools/partest/BytecodeTest.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/dotless-targs.flags | 1 | ||||
| -rw-r--r-- | test/files/run/applydynamic_sip.flags | 1 | ||||
| -rw-r--r-- | test/files/run/interop_typetags_are_manifests.flags | 1 | ||||
| -rw-r--r-- | test/files/run/macro-openmacros.flags | 3 | ||||
| -rw-r--r-- | test/files/run/macro-parse-position.flags | 1 | ||||
| -rw-r--r-- | test/files/run/macroPlugins-macroExpand.flags | 1 | ||||
| -rw-r--r-- | test/files/run/macroPlugins-typedMacroBody.flags | 1 | ||||
| -rw-r--r-- | test/files/run/t6327.flags | 1 | ||||
| -rw-r--r-- | test/files/run/t6663.flags | 1 | ||||
| -rw-r--r-- | test/files/run/t6731.flags | 1 | ||||
| -rw-r--r-- | test/files/run/virtpatmat_staging.flags | 1 |
13 files changed, 14 insertions, 3 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> diff --git a/src/partest-extras/scala/tools/partest/BytecodeTest.scala b/src/partest-extras/scala/tools/partest/BytecodeTest.scala index 7650a892fd..1e4362fcde 100644 --- a/src/partest-extras/scala/tools/partest/BytecodeTest.scala +++ b/src/partest-extras/scala/tools/partest/BytecodeTest.scala @@ -34,7 +34,7 @@ abstract class BytecodeTest extends ASMConverters { /** produce the output to be compared against a checkfile */ protected def show(): Unit - def main(args: Array[String]): Unit = show + def main(args: Array[String]): Unit = show() // asserts def sameBytecode(methA: MethodNode, methB: MethodNode) = { diff --git a/test/files/pos/dotless-targs.flags b/test/files/pos/dotless-targs.flags new file mode 100644 index 0000000000..ea7fc37e1a --- /dev/null +++ b/test/files/pos/dotless-targs.flags @@ -0,0 +1 @@ +-Yrangepos:false diff --git a/test/files/run/applydynamic_sip.flags b/test/files/run/applydynamic_sip.flags index 1141f97507..ba6d37305e 100644 --- a/test/files/run/applydynamic_sip.flags +++ b/test/files/run/applydynamic_sip.flags @@ -1 +1,2 @@ +-Yrangepos:false -language:dynamics diff --git a/test/files/run/interop_typetags_are_manifests.flags b/test/files/run/interop_typetags_are_manifests.flags new file mode 100644 index 0000000000..ea7fc37e1a --- /dev/null +++ b/test/files/run/interop_typetags_are_manifests.flags @@ -0,0 +1 @@ +-Yrangepos:false diff --git a/test/files/run/macro-openmacros.flags b/test/files/run/macro-openmacros.flags index cd66464f2f..2433c055a4 100644 --- a/test/files/run/macro-openmacros.flags +++ b/test/files/run/macro-openmacros.flags @@ -1 +1,2 @@ --language:experimental.macros
\ No newline at end of file +-Yrangepos:false +-language:experimental.macros diff --git a/test/files/run/macro-parse-position.flags b/test/files/run/macro-parse-position.flags new file mode 100644 index 0000000000..ea7fc37e1a --- /dev/null +++ b/test/files/run/macro-parse-position.flags @@ -0,0 +1 @@ +-Yrangepos:false diff --git a/test/files/run/macroPlugins-macroExpand.flags b/test/files/run/macroPlugins-macroExpand.flags new file mode 100644 index 0000000000..ea7fc37e1a --- /dev/null +++ b/test/files/run/macroPlugins-macroExpand.flags @@ -0,0 +1 @@ +-Yrangepos:false diff --git a/test/files/run/macroPlugins-typedMacroBody.flags b/test/files/run/macroPlugins-typedMacroBody.flags new file mode 100644 index 0000000000..ea7fc37e1a --- /dev/null +++ b/test/files/run/macroPlugins-typedMacroBody.flags @@ -0,0 +1 @@ +-Yrangepos:false diff --git a/test/files/run/t6327.flags b/test/files/run/t6327.flags new file mode 100644 index 0000000000..ea7fc37e1a --- /dev/null +++ b/test/files/run/t6327.flags @@ -0,0 +1 @@ +-Yrangepos:false diff --git a/test/files/run/t6663.flags b/test/files/run/t6663.flags new file mode 100644 index 0000000000..ea7fc37e1a --- /dev/null +++ b/test/files/run/t6663.flags @@ -0,0 +1 @@ +-Yrangepos:false diff --git a/test/files/run/t6731.flags b/test/files/run/t6731.flags new file mode 100644 index 0000000000..ea7fc37e1a --- /dev/null +++ b/test/files/run/t6731.flags @@ -0,0 +1 @@ +-Yrangepos:false diff --git a/test/files/run/virtpatmat_staging.flags b/test/files/run/virtpatmat_staging.flags index 48fd867160..0a22f7c729 100644 --- a/test/files/run/virtpatmat_staging.flags +++ b/test/files/run/virtpatmat_staging.flags @@ -1 +1,2 @@ +-Yrangepos:false -Xexperimental |