Merge pull request #3718 from lrytz/partestArgs

lrytz · lrytz · commit 9ad96d07ee9d · 2014-05-07T15:20:13.000+02:00
Respect -Dpartest.scalac_opts when running the test suite through ANT
diff --git 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
@@ -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
@@ -0,0 +1 @@
+-Yrangepos:false
diff --git 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
@@ -0,0 +1 @@
+-Yrangepos:false
diff --git a/test/files/run/macro-openmacros.flags b/test/files/run/macro-openmacros.flags
@@ -1 +1,2 @@
--language:experimental.macros
+-Yrangepos:false
+-language:experimental.macros
diff --git a/test/files/run/macro-parse-position.flags 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
@@ -0,0 +1 @@
+-Yrangepos:false
diff --git a/test/files/run/macroPlugins-typedMacroBody.flags 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
@@ -0,0 +1 @@
+-Yrangepos:false
diff --git a/test/files/run/t6663.flags 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
@@ -0,0 +1 @@
+-Yrangepos:false
diff --git a/test/files/run/virtpatmat_staging.flags b/test/files/run/virtpatmat_staging.flags
@@ -1 +1,2 @@
+-Yrangepos:false
 -Xexperimental

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
	`1`	`+-Yrangepos:false`
`1`	`2`	`-language:dynamics`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`--language:experimental.macros`
	`1`	`+-Yrangepos:false`
	`2`	`+-language:experimental.macros`