From c6ce61796f66770ca1b4d63fc0a569f064436433 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Fri, 22 Mar 2013 14:39:19 -0700 Subject: SI-6289 Partest in technicolor and showing javac errors Paulptest includes color and simplified test scarfing. Scalap tests are moved to the conventional name and location. Testicolor missed out on Josh Suereth's tweak to sort the files in a compilation round. Restore sortiness to test sources. Testicolor is due to one of Paul's branches on a timeline that apparently did not include the destruction of planet Earth and its colonies by the Xindi. Thanks also to Szabolcs Berecz for his merge effort. Merging is thankless work, but not as thankless as merging in a timeline that actually does terminate in the destruction of your home world and Enterprise. Archer had a supremely difficult choice: rescue humanity or live out his retirement with T'Pol waiting on him hand and foot? I'm sure I don't know how I'd choose. --- test/build-partest.xml | 24 ++++++++++++++++++++++ test/files/neg/choices.check | 2 +- test/files/neg/choices.flags | 2 +- test/files/run/reify_this.scala | 6 +++--- test/files/scalap/abstractClass.check | 4 ++++ test/files/scalap/abstractClass.scala | 5 +++++ test/files/scalap/abstractClass/A.scala | 5 ----- test/files/scalap/abstractClass/result.test | 4 ---- test/files/scalap/abstractMethod.check | 5 +++++ test/files/scalap/abstractMethod.scala | 4 ++++ test/files/scalap/abstractMethod/A.scala | 4 ---- test/files/scalap/abstractMethod/result.test | 5 ----- test/files/scalap/caseClass.check | 20 ++++++++++++++++++ test/files/scalap/caseClass.scala | 3 +++ test/files/scalap/caseClass/A.scala | 3 --- test/files/scalap/caseClass/result.test | 20 ------------------ test/files/scalap/caseObject.check | 10 +++++++++ test/files/scalap/caseObject.scala | 3 +++ test/files/scalap/caseObject/A.scala | 3 --- test/files/scalap/caseObject/result.test | 10 --------- test/files/scalap/cbnParam.check | 3 +++ test/files/scalap/cbnParam.scala | 1 + test/files/scalap/cbnParam/A.scala | 1 - test/files/scalap/cbnParam/result.test | 3 --- test/files/scalap/classPrivate.check | 10 +++++++++ test/files/scalap/classPrivate.scala | 9 ++++++++ test/files/scalap/classPrivate/A.scala | 9 -------- test/files/scalap/classPrivate/result.test | 10 --------- test/files/scalap/classWithExistential.check | 4 ++++ test/files/scalap/classWithExistential.scala | 3 +++ test/files/scalap/classWithExistential/A.scala | 3 --- test/files/scalap/classWithExistential/result.test | 4 ---- test/files/scalap/classWithSelfAnnotation.check | 5 +++++ test/files/scalap/classWithSelfAnnotation.scala | 4 ++++ test/files/scalap/classWithSelfAnnotation/A.scala | 4 ---- .../scalap/classWithSelfAnnotation/result.test | 5 ----- test/files/scalap/covariantParam.check | 4 ++++ test/files/scalap/covariantParam.scala | 3 +++ test/files/scalap/covariantParam/A.scala | 3 --- test/files/scalap/covariantParam/result.test | 4 ---- test/files/scalap/defaultParameter.check | 3 +++ test/files/scalap/defaultParameter.scala | 3 +++ test/files/scalap/defaultParameter/A.scala | 3 --- test/files/scalap/defaultParameter/result.test | 3 --- test/files/scalap/implicitParam.check | 4 ++++ test/files/scalap/implicitParam.scala | 3 +++ test/files/scalap/implicitParam/A.scala | 3 --- test/files/scalap/implicitParam/result.test | 4 ---- test/files/scalap/packageObject.check | 5 +++++ test/files/scalap/packageObject.scala | 4 ++++ test/files/scalap/packageObject/A.scala | 4 ---- test/files/scalap/packageObject/result.test | 5 ----- test/files/scalap/paramClauses.check | 4 ++++ test/files/scalap/paramClauses.scala | 3 +++ test/files/scalap/paramClauses/A.scala | 3 --- test/files/scalap/paramClauses/result.test | 4 ---- test/files/scalap/paramNames.check | 4 ++++ test/files/scalap/paramNames.scala | 3 +++ test/files/scalap/paramNames/A.scala | 3 --- test/files/scalap/paramNames/result.test | 4 ---- test/files/scalap/sequenceParam.check | 3 +++ test/files/scalap/sequenceParam.scala | 1 + test/files/scalap/sequenceParam/A.scala | 1 - test/files/scalap/sequenceParam/result.test | 3 --- test/files/scalap/simpleClass.check | 4 ++++ test/files/scalap/simpleClass.scala | 3 +++ test/files/scalap/simpleClass/A.scala | 3 --- test/files/scalap/simpleClass/result.test | 4 ---- test/files/scalap/traitObject.check | 8 ++++++++ test/files/scalap/traitObject.scala | 7 +++++++ test/files/scalap/traitObject/A.scala | 7 ------- test/files/scalap/traitObject/result.test | 8 -------- test/files/scalap/typeAnnotations.check | 8 ++++++++ test/files/scalap/typeAnnotations.scala | 9 ++++++++ test/files/scalap/typeAnnotations/A.scala | 9 -------- test/files/scalap/typeAnnotations/result.test | 8 -------- test/files/scalap/valAndVar.check | 5 +++++ test/files/scalap/valAndVar.scala | 4 ++++ test/files/scalap/valAndVar/A.scala | 4 ---- test/files/scalap/valAndVar/result.test | 5 ----- test/files/scalap/wildcardType.check | 3 +++ test/files/scalap/wildcardType.scala | 1 + test/files/scalap/wildcardType/A.scala | 1 - test/files/scalap/wildcardType/result.test | 3 --- test/partest | 16 +++++++++++++-- 85 files changed, 235 insertions(+), 199 deletions(-) create mode 100755 test/build-partest.xml create mode 100644 test/files/scalap/abstractClass.check create mode 100644 test/files/scalap/abstractClass.scala delete mode 100644 test/files/scalap/abstractClass/A.scala delete mode 100644 test/files/scalap/abstractClass/result.test create mode 100644 test/files/scalap/abstractMethod.check create mode 100644 test/files/scalap/abstractMethod.scala delete mode 100644 test/files/scalap/abstractMethod/A.scala delete mode 100644 test/files/scalap/abstractMethod/result.test create mode 100644 test/files/scalap/caseClass.check create mode 100644 test/files/scalap/caseClass.scala delete mode 100644 test/files/scalap/caseClass/A.scala delete mode 100644 test/files/scalap/caseClass/result.test create mode 100644 test/files/scalap/caseObject.check create mode 100644 test/files/scalap/caseObject.scala delete mode 100644 test/files/scalap/caseObject/A.scala delete mode 100644 test/files/scalap/caseObject/result.test create mode 100644 test/files/scalap/cbnParam.check create mode 100644 test/files/scalap/cbnParam.scala delete mode 100644 test/files/scalap/cbnParam/A.scala delete mode 100644 test/files/scalap/cbnParam/result.test create mode 100644 test/files/scalap/classPrivate.check create mode 100644 test/files/scalap/classPrivate.scala delete mode 100644 test/files/scalap/classPrivate/A.scala delete mode 100644 test/files/scalap/classPrivate/result.test create mode 100644 test/files/scalap/classWithExistential.check create mode 100644 test/files/scalap/classWithExistential.scala delete mode 100644 test/files/scalap/classWithExistential/A.scala delete mode 100644 test/files/scalap/classWithExistential/result.test create mode 100644 test/files/scalap/classWithSelfAnnotation.check create mode 100644 test/files/scalap/classWithSelfAnnotation.scala delete mode 100644 test/files/scalap/classWithSelfAnnotation/A.scala delete mode 100644 test/files/scalap/classWithSelfAnnotation/result.test create mode 100644 test/files/scalap/covariantParam.check create mode 100644 test/files/scalap/covariantParam.scala delete mode 100644 test/files/scalap/covariantParam/A.scala delete mode 100644 test/files/scalap/covariantParam/result.test create mode 100644 test/files/scalap/defaultParameter.check create mode 100644 test/files/scalap/defaultParameter.scala delete mode 100644 test/files/scalap/defaultParameter/A.scala delete mode 100644 test/files/scalap/defaultParameter/result.test create mode 100644 test/files/scalap/implicitParam.check create mode 100644 test/files/scalap/implicitParam.scala delete mode 100644 test/files/scalap/implicitParam/A.scala delete mode 100644 test/files/scalap/implicitParam/result.test create mode 100644 test/files/scalap/packageObject.check create mode 100644 test/files/scalap/packageObject.scala delete mode 100644 test/files/scalap/packageObject/A.scala delete mode 100644 test/files/scalap/packageObject/result.test create mode 100644 test/files/scalap/paramClauses.check create mode 100644 test/files/scalap/paramClauses.scala delete mode 100644 test/files/scalap/paramClauses/A.scala delete mode 100644 test/files/scalap/paramClauses/result.test create mode 100644 test/files/scalap/paramNames.check create mode 100644 test/files/scalap/paramNames.scala delete mode 100644 test/files/scalap/paramNames/A.scala delete mode 100644 test/files/scalap/paramNames/result.test create mode 100644 test/files/scalap/sequenceParam.check create mode 100644 test/files/scalap/sequenceParam.scala delete mode 100644 test/files/scalap/sequenceParam/A.scala delete mode 100644 test/files/scalap/sequenceParam/result.test create mode 100644 test/files/scalap/simpleClass.check create mode 100644 test/files/scalap/simpleClass.scala delete mode 100644 test/files/scalap/simpleClass/A.scala delete mode 100644 test/files/scalap/simpleClass/result.test create mode 100644 test/files/scalap/traitObject.check create mode 100644 test/files/scalap/traitObject.scala delete mode 100644 test/files/scalap/traitObject/A.scala delete mode 100644 test/files/scalap/traitObject/result.test create mode 100644 test/files/scalap/typeAnnotations.check create mode 100644 test/files/scalap/typeAnnotations.scala delete mode 100644 test/files/scalap/typeAnnotations/A.scala delete mode 100644 test/files/scalap/typeAnnotations/result.test create mode 100644 test/files/scalap/valAndVar.check create mode 100644 test/files/scalap/valAndVar.scala delete mode 100644 test/files/scalap/valAndVar/A.scala delete mode 100644 test/files/scalap/valAndVar/result.test create mode 100644 test/files/scalap/wildcardType.check create mode 100644 test/files/scalap/wildcardType.scala delete mode 100644 test/files/scalap/wildcardType/A.scala delete mode 100644 test/files/scalap/wildcardType/result.test (limited to 'test') diff --git a/test/build-partest.xml b/test/build-partest.xml new file mode 100755 index 0000000000..44502ffa61 --- /dev/null +++ b/test/build-partest.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/test/files/neg/choices.check b/test/files/neg/choices.check index 3e63f9999d..b114394e96 100644 --- a/test/files/neg/choices.check +++ b/test/files/neg/choices.check @@ -1,2 +1,2 @@ -partest error: bad flags: -Ylinearizer +error: bad options: -Yresolve-term-conflict one error found diff --git a/test/files/neg/choices.flags b/test/files/neg/choices.flags index 5464a18c5d..9718467d4c 100644 --- a/test/files/neg/choices.flags +++ b/test/files/neg/choices.flags @@ -1 +1 @@ --Ylinearizer \ No newline at end of file +-Yresolve-term-conflict diff --git a/test/files/run/reify_this.scala b/test/files/run/reify_this.scala index ecbf394bba..c385da6360 100644 --- a/test/files/run/reify_this.scala +++ b/test/files/run/reify_this.scala @@ -1,11 +1,11 @@ import scala.reflect.runtime.universe._ import scala.tools.reflect.Eval -trait Eval { +trait Transvaal { def eval(tree: Expr[_]) = tree.eval } -object Test extends App with Eval { +object Test extends App with Transvaal { // select a value from package eval(reify{println("foo")}) eval(reify{println((new Object).toString == (new Object).toString)}) @@ -17,4 +17,4 @@ object Test extends App with Eval { // select a value from module val x = 2 eval(reify{println(x)}) -} \ No newline at end of file +} diff --git a/test/files/scalap/abstractClass.check b/test/files/scalap/abstractClass.check new file mode 100644 index 0000000000..ef1daac23d --- /dev/null +++ b/test/files/scalap/abstractClass.check @@ -0,0 +1,4 @@ +abstract class AbstractClass extends scala.AnyRef { + def this() = { /* compiled code */ } + def foo : scala.Predef.String +} diff --git a/test/files/scalap/abstractClass.scala b/test/files/scalap/abstractClass.scala new file mode 100644 index 0000000000..19a528d5a1 --- /dev/null +++ b/test/files/scalap/abstractClass.scala @@ -0,0 +1,5 @@ +abstract class AbstractClass { + + def foo: String + +} diff --git a/test/files/scalap/abstractClass/A.scala b/test/files/scalap/abstractClass/A.scala deleted file mode 100644 index 19a528d5a1..0000000000 --- a/test/files/scalap/abstractClass/A.scala +++ /dev/null @@ -1,5 +0,0 @@ -abstract class AbstractClass { - - def foo: String - -} diff --git a/test/files/scalap/abstractClass/result.test b/test/files/scalap/abstractClass/result.test deleted file mode 100644 index ef1daac23d..0000000000 --- a/test/files/scalap/abstractClass/result.test +++ /dev/null @@ -1,4 +0,0 @@ -abstract class AbstractClass extends scala.AnyRef { - def this() = { /* compiled code */ } - def foo : scala.Predef.String -} diff --git a/test/files/scalap/abstractMethod.check b/test/files/scalap/abstractMethod.check new file mode 100644 index 0000000000..40fa02d408 --- /dev/null +++ b/test/files/scalap/abstractMethod.check @@ -0,0 +1,5 @@ +trait AbstractMethod extends scala.AnyRef { + def $init$() : scala.Unit = { /* compiled code */ } + def arity : scala.Int + def isCool : scala.Boolean = { /* compiled code */ } +} diff --git a/test/files/scalap/abstractMethod.scala b/test/files/scalap/abstractMethod.scala new file mode 100644 index 0000000000..4bedb377b3 --- /dev/null +++ b/test/files/scalap/abstractMethod.scala @@ -0,0 +1,4 @@ +trait AbstractMethod { + def arity: Int + def isCool = true +} diff --git a/test/files/scalap/abstractMethod/A.scala b/test/files/scalap/abstractMethod/A.scala deleted file mode 100644 index 4bedb377b3..0000000000 --- a/test/files/scalap/abstractMethod/A.scala +++ /dev/null @@ -1,4 +0,0 @@ -trait AbstractMethod { - def arity: Int - def isCool = true -} diff --git a/test/files/scalap/abstractMethod/result.test b/test/files/scalap/abstractMethod/result.test deleted file mode 100644 index 40fa02d408..0000000000 --- a/test/files/scalap/abstractMethod/result.test +++ /dev/null @@ -1,5 +0,0 @@ -trait AbstractMethod extends scala.AnyRef { - def $init$() : scala.Unit = { /* compiled code */ } - def arity : scala.Int - def isCool : scala.Boolean = { /* compiled code */ } -} diff --git a/test/files/scalap/caseClass.check b/test/files/scalap/caseClass.check new file mode 100644 index 0000000000..7d7aa4fd8f --- /dev/null +++ b/test/files/scalap/caseClass.check @@ -0,0 +1,20 @@ +case class CaseClass[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) extends scala.AnyRef with scala.Product with scala.Serializable { + val i : A = { /* compiled code */ } + val s : scala.Predef.String = { /* compiled code */ } + def foo : scala.Int = { /* compiled code */ } + def copy[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) : CaseClass[A] = { /* compiled code */ } + override def productPrefix : java.lang.String = { /* compiled code */ } + def productArity : scala.Int = { /* compiled code */ } + def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ } + override def productIterator : scala.collection.Iterator[scala.Any] = { /* compiled code */ } + def canEqual(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } + override def hashCode() : scala.Int = { /* compiled code */ } + override def toString() : java.lang.String = { /* compiled code */ } + override def equals(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } +} +object CaseClass extends scala.AnyRef with scala.Serializable { + def this() = { /* compiled code */ } + final override def toString() : java.lang.String = { /* compiled code */ } + def apply[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) : CaseClass[A] = { /* compiled code */ } + def unapply[A <: scala.Seq[scala.Int]](x$0 : CaseClass[A]) : scala.Option[scala.Tuple2[A, scala.Predef.String]] = { /* compiled code */ } +} diff --git a/test/files/scalap/caseClass.scala b/test/files/scalap/caseClass.scala new file mode 100644 index 0000000000..95f9984519 --- /dev/null +++ b/test/files/scalap/caseClass.scala @@ -0,0 +1,3 @@ +case class CaseClass[A <: Seq[Int]](i: A, s: String) { + def foo = 239 +} diff --git a/test/files/scalap/caseClass/A.scala b/test/files/scalap/caseClass/A.scala deleted file mode 100644 index 95f9984519..0000000000 --- a/test/files/scalap/caseClass/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -case class CaseClass[A <: Seq[Int]](i: A, s: String) { - def foo = 239 -} diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test deleted file mode 100644 index 7d7aa4fd8f..0000000000 --- a/test/files/scalap/caseClass/result.test +++ /dev/null @@ -1,20 +0,0 @@ -case class CaseClass[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) extends scala.AnyRef with scala.Product with scala.Serializable { - val i : A = { /* compiled code */ } - val s : scala.Predef.String = { /* compiled code */ } - def foo : scala.Int = { /* compiled code */ } - def copy[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) : CaseClass[A] = { /* compiled code */ } - override def productPrefix : java.lang.String = { /* compiled code */ } - def productArity : scala.Int = { /* compiled code */ } - def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ } - override def productIterator : scala.collection.Iterator[scala.Any] = { /* compiled code */ } - def canEqual(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } - override def hashCode() : scala.Int = { /* compiled code */ } - override def toString() : java.lang.String = { /* compiled code */ } - override def equals(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } -} -object CaseClass extends scala.AnyRef with scala.Serializable { - def this() = { /* compiled code */ } - final override def toString() : java.lang.String = { /* compiled code */ } - def apply[A <: scala.Seq[scala.Int]](i : A, s : scala.Predef.String) : CaseClass[A] = { /* compiled code */ } - def unapply[A <: scala.Seq[scala.Int]](x$0 : CaseClass[A]) : scala.Option[scala.Tuple2[A, scala.Predef.String]] = { /* compiled code */ } -} diff --git a/test/files/scalap/caseObject.check b/test/files/scalap/caseObject.check new file mode 100644 index 0000000000..867a4b2162 --- /dev/null +++ b/test/files/scalap/caseObject.check @@ -0,0 +1,10 @@ +case object CaseObject extends scala.AnyRef with scala.Product with scala.Serializable { + def bar : scala.Int = { /* compiled code */ } + override def productPrefix : java.lang.String = { /* compiled code */ } + def productArity : scala.Int = { /* compiled code */ } + def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ } + override def productIterator : scala.collection.Iterator[scala.Any] = { /* compiled code */ } + def canEqual(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } + override def hashCode() : scala.Int = { /* compiled code */ } + override def toString() : java.lang.String = { /* compiled code */ } +} diff --git a/test/files/scalap/caseObject.scala b/test/files/scalap/caseObject.scala new file mode 100644 index 0000000000..6a3ff10d75 --- /dev/null +++ b/test/files/scalap/caseObject.scala @@ -0,0 +1,3 @@ +case object CaseObject { + def bar = 239 +} diff --git a/test/files/scalap/caseObject/A.scala b/test/files/scalap/caseObject/A.scala deleted file mode 100644 index 6a3ff10d75..0000000000 --- a/test/files/scalap/caseObject/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -case object CaseObject { - def bar = 239 -} diff --git a/test/files/scalap/caseObject/result.test b/test/files/scalap/caseObject/result.test deleted file mode 100644 index 867a4b2162..0000000000 --- a/test/files/scalap/caseObject/result.test +++ /dev/null @@ -1,10 +0,0 @@ -case object CaseObject extends scala.AnyRef with scala.Product with scala.Serializable { - def bar : scala.Int = { /* compiled code */ } - override def productPrefix : java.lang.String = { /* compiled code */ } - def productArity : scala.Int = { /* compiled code */ } - def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ } - override def productIterator : scala.collection.Iterator[scala.Any] = { /* compiled code */ } - def canEqual(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ } - override def hashCode() : scala.Int = { /* compiled code */ } - override def toString() : java.lang.String = { /* compiled code */ } -} diff --git a/test/files/scalap/cbnParam.check b/test/files/scalap/cbnParam.check new file mode 100644 index 0000000000..52ecb6ae66 --- /dev/null +++ b/test/files/scalap/cbnParam.check @@ -0,0 +1,3 @@ +class CbnParam extends scala.AnyRef { + def this(s : => scala.Predef.String) = { /* compiled code */ } +} diff --git a/test/files/scalap/cbnParam.scala b/test/files/scalap/cbnParam.scala new file mode 100644 index 0000000000..2f366df64a --- /dev/null +++ b/test/files/scalap/cbnParam.scala @@ -0,0 +1 @@ +class CbnParam(s: => String) diff --git a/test/files/scalap/cbnParam/A.scala b/test/files/scalap/cbnParam/A.scala deleted file mode 100644 index 2f366df64a..0000000000 --- a/test/files/scalap/cbnParam/A.scala +++ /dev/null @@ -1 +0,0 @@ -class CbnParam(s: => String) diff --git a/test/files/scalap/cbnParam/result.test b/test/files/scalap/cbnParam/result.test deleted file mode 100644 index 52ecb6ae66..0000000000 --- a/test/files/scalap/cbnParam/result.test +++ /dev/null @@ -1,3 +0,0 @@ -class CbnParam extends scala.AnyRef { - def this(s : => scala.Predef.String) = { /* compiled code */ } -} diff --git a/test/files/scalap/classPrivate.check b/test/files/scalap/classPrivate.check new file mode 100644 index 0000000000..ab2d40cdaf --- /dev/null +++ b/test/files/scalap/classPrivate.check @@ -0,0 +1,10 @@ +class ClassPrivate extends scala.AnyRef { + def this() = { /* compiled code */ } + def baz : scala.Int = { /* compiled code */ } + class Outer extends scala.AnyRef { + def this() = { /* compiled code */ } + private[ClassPrivate] def qux : scala.Int = { /* compiled code */ } + } + protected def quux : scala.Int = { /* compiled code */ } + private[ClassPrivate] def bar : scala.Int = { /* compiled code */ } +} diff --git a/test/files/scalap/classPrivate.scala b/test/files/scalap/classPrivate.scala new file mode 100644 index 0000000000..9f1bd34a6a --- /dev/null +++ b/test/files/scalap/classPrivate.scala @@ -0,0 +1,9 @@ +class ClassPrivate { + private def foo = 1 + private[ClassPrivate] def bar = 2 + def baz = 3 + class Outer { + private[ClassPrivate] def qux = 4 + } + protected def quux = 5 +} \ No newline at end of file diff --git a/test/files/scalap/classPrivate/A.scala b/test/files/scalap/classPrivate/A.scala deleted file mode 100644 index 9f1bd34a6a..0000000000 --- a/test/files/scalap/classPrivate/A.scala +++ /dev/null @@ -1,9 +0,0 @@ -class ClassPrivate { - private def foo = 1 - private[ClassPrivate] def bar = 2 - def baz = 3 - class Outer { - private[ClassPrivate] def qux = 4 - } - protected def quux = 5 -} \ No newline at end of file diff --git a/test/files/scalap/classPrivate/result.test b/test/files/scalap/classPrivate/result.test deleted file mode 100644 index ab2d40cdaf..0000000000 --- a/test/files/scalap/classPrivate/result.test +++ /dev/null @@ -1,10 +0,0 @@ -class ClassPrivate extends scala.AnyRef { - def this() = { /* compiled code */ } - def baz : scala.Int = { /* compiled code */ } - class Outer extends scala.AnyRef { - def this() = { /* compiled code */ } - private[ClassPrivate] def qux : scala.Int = { /* compiled code */ } - } - protected def quux : scala.Int = { /* compiled code */ } - private[ClassPrivate] def bar : scala.Int = { /* compiled code */ } -} diff --git a/test/files/scalap/classWithExistential.check b/test/files/scalap/classWithExistential.check new file mode 100644 index 0000000000..caee3fd6de --- /dev/null +++ b/test/files/scalap/classWithExistential.check @@ -0,0 +1,4 @@ +class ClassWithExistential extends scala.AnyRef { + def this() = { /* compiled code */ } + def foo[A, B] : scala.Function1[A, B forSome {type A <: scala.Seq[scala.Int]; type B >: scala.Predef.String}] = { /* compiled code */ } +} diff --git a/test/files/scalap/classWithExistential.scala b/test/files/scalap/classWithExistential.scala new file mode 100644 index 0000000000..4a5213f963 --- /dev/null +++ b/test/files/scalap/classWithExistential.scala @@ -0,0 +1,3 @@ +class ClassWithExistential { + def foo[A, B] : A=> B forSome {type A <: Seq[Int]; type B >: String} = null +} diff --git a/test/files/scalap/classWithExistential/A.scala b/test/files/scalap/classWithExistential/A.scala deleted file mode 100644 index 4a5213f963..0000000000 --- a/test/files/scalap/classWithExistential/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -class ClassWithExistential { - def foo[A, B] : A=> B forSome {type A <: Seq[Int]; type B >: String} = null -} diff --git a/test/files/scalap/classWithExistential/result.test b/test/files/scalap/classWithExistential/result.test deleted file mode 100644 index caee3fd6de..0000000000 --- a/test/files/scalap/classWithExistential/result.test +++ /dev/null @@ -1,4 +0,0 @@ -class ClassWithExistential extends scala.AnyRef { - def this() = { /* compiled code */ } - def foo[A, B] : scala.Function1[A, B forSome {type A <: scala.Seq[scala.Int]; type B >: scala.Predef.String}] = { /* compiled code */ } -} diff --git a/test/files/scalap/classWithSelfAnnotation.check b/test/files/scalap/classWithSelfAnnotation.check new file mode 100644 index 0000000000..82bbd9e8df --- /dev/null +++ b/test/files/scalap/classWithSelfAnnotation.check @@ -0,0 +1,5 @@ +class ClassWithSelfAnnotation extends scala.AnyRef { + this : ClassWithSelfAnnotation with java.lang.CharSequence => + def this() = { /* compiled code */ } + def foo : scala.Int = { /* compiled code */ } +} diff --git a/test/files/scalap/classWithSelfAnnotation.scala b/test/files/scalap/classWithSelfAnnotation.scala new file mode 100644 index 0000000000..9e0398622a --- /dev/null +++ b/test/files/scalap/classWithSelfAnnotation.scala @@ -0,0 +1,4 @@ +class ClassWithSelfAnnotation { + this: CharSequence => + def foo = 239 +} diff --git a/test/files/scalap/classWithSelfAnnotation/A.scala b/test/files/scalap/classWithSelfAnnotation/A.scala deleted file mode 100644 index 9e0398622a..0000000000 --- a/test/files/scalap/classWithSelfAnnotation/A.scala +++ /dev/null @@ -1,4 +0,0 @@ -class ClassWithSelfAnnotation { - this: CharSequence => - def foo = 239 -} diff --git a/test/files/scalap/classWithSelfAnnotation/result.test b/test/files/scalap/classWithSelfAnnotation/result.test deleted file mode 100644 index 82bbd9e8df..0000000000 --- a/test/files/scalap/classWithSelfAnnotation/result.test +++ /dev/null @@ -1,5 +0,0 @@ -class ClassWithSelfAnnotation extends scala.AnyRef { - this : ClassWithSelfAnnotation with java.lang.CharSequence => - def this() = { /* compiled code */ } - def foo : scala.Int = { /* compiled code */ } -} diff --git a/test/files/scalap/covariantParam.check b/test/files/scalap/covariantParam.check new file mode 100644 index 0000000000..f7a3c98966 --- /dev/null +++ b/test/files/scalap/covariantParam.check @@ -0,0 +1,4 @@ +class CovariantParam[+A] extends scala.AnyRef { + def this() = { /* compiled code */ } + def foo[A](a : A) : scala.Int = { /* compiled code */ } +} diff --git a/test/files/scalap/covariantParam.scala b/test/files/scalap/covariantParam.scala new file mode 100644 index 0000000000..5b2c24d6fa --- /dev/null +++ b/test/files/scalap/covariantParam.scala @@ -0,0 +1,3 @@ +class CovariantParam[+A] { + def foo[A](a: A) = 42 +} diff --git a/test/files/scalap/covariantParam/A.scala b/test/files/scalap/covariantParam/A.scala deleted file mode 100644 index 5b2c24d6fa..0000000000 --- a/test/files/scalap/covariantParam/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -class CovariantParam[+A] { - def foo[A](a: A) = 42 -} diff --git a/test/files/scalap/covariantParam/result.test b/test/files/scalap/covariantParam/result.test deleted file mode 100644 index f7a3c98966..0000000000 --- a/test/files/scalap/covariantParam/result.test +++ /dev/null @@ -1,4 +0,0 @@ -class CovariantParam[+A] extends scala.AnyRef { - def this() = { /* compiled code */ } - def foo[A](a : A) : scala.Int = { /* compiled code */ } -} diff --git a/test/files/scalap/defaultParameter.check b/test/files/scalap/defaultParameter.check new file mode 100644 index 0000000000..0c775ea7b5 --- /dev/null +++ b/test/files/scalap/defaultParameter.check @@ -0,0 +1,3 @@ +trait DefaultParameter extends scala.AnyRef { + def foo(s : scala.Predef.String) : scala.Unit +} diff --git a/test/files/scalap/defaultParameter.scala b/test/files/scalap/defaultParameter.scala new file mode 100644 index 0000000000..d3514952f4 --- /dev/null +++ b/test/files/scalap/defaultParameter.scala @@ -0,0 +1,3 @@ +trait DefaultParameter { + def foo(s: String = "hello"): Unit +} \ No newline at end of file diff --git a/test/files/scalap/defaultParameter/A.scala b/test/files/scalap/defaultParameter/A.scala deleted file mode 100644 index d3514952f4..0000000000 --- a/test/files/scalap/defaultParameter/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -trait DefaultParameter { - def foo(s: String = "hello"): Unit -} \ No newline at end of file diff --git a/test/files/scalap/defaultParameter/result.test b/test/files/scalap/defaultParameter/result.test deleted file mode 100644 index 0c775ea7b5..0000000000 --- a/test/files/scalap/defaultParameter/result.test +++ /dev/null @@ -1,3 +0,0 @@ -trait DefaultParameter extends scala.AnyRef { - def foo(s : scala.Predef.String) : scala.Unit -} diff --git a/test/files/scalap/implicitParam.check b/test/files/scalap/implicitParam.check new file mode 100644 index 0000000000..a2cfd6092d --- /dev/null +++ b/test/files/scalap/implicitParam.check @@ -0,0 +1,4 @@ +class ImplicitParam extends scala.AnyRef { + def this() = { /* compiled code */ } + def foo(i : scala.Int)(implicit f : scala.Float, d : scala.Double) : scala.Int = { /* compiled code */ } +} diff --git a/test/files/scalap/implicitParam.scala b/test/files/scalap/implicitParam.scala new file mode 100644 index 0000000000..80657218d9 --- /dev/null +++ b/test/files/scalap/implicitParam.scala @@ -0,0 +1,3 @@ +class ImplicitParam { + def foo(i: Int)(implicit f: Float, d: Double) = 42 +} diff --git a/test/files/scalap/implicitParam/A.scala b/test/files/scalap/implicitParam/A.scala deleted file mode 100644 index 80657218d9..0000000000 --- a/test/files/scalap/implicitParam/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -class ImplicitParam { - def foo(i: Int)(implicit f: Float, d: Double) = 42 -} diff --git a/test/files/scalap/implicitParam/result.test b/test/files/scalap/implicitParam/result.test deleted file mode 100644 index a2cfd6092d..0000000000 --- a/test/files/scalap/implicitParam/result.test +++ /dev/null @@ -1,4 +0,0 @@ -class ImplicitParam extends scala.AnyRef { - def this() = { /* compiled code */ } - def foo(i : scala.Int)(implicit f : scala.Float, d : scala.Double) : scala.Int = { /* compiled code */ } -} diff --git a/test/files/scalap/packageObject.check b/test/files/scalap/packageObject.check new file mode 100644 index 0000000000..5732d92958 --- /dev/null +++ b/test/files/scalap/packageObject.check @@ -0,0 +1,5 @@ +package object PackageObject extends scala.AnyRef { + def this() = { /* compiled code */ } + type A = scala.Predef.String + def foo(i : scala.Int) : scala.Int = { /* compiled code */ } +} diff --git a/test/files/scalap/packageObject.scala b/test/files/scalap/packageObject.scala new file mode 100644 index 0000000000..7e429c9935 --- /dev/null +++ b/test/files/scalap/packageObject.scala @@ -0,0 +1,4 @@ +package object PackageObject { + type A = String + def foo(i: Int) = 239 +} diff --git a/test/files/scalap/packageObject/A.scala b/test/files/scalap/packageObject/A.scala deleted file mode 100644 index 7e429c9935..0000000000 --- a/test/files/scalap/packageObject/A.scala +++ /dev/null @@ -1,4 +0,0 @@ -package object PackageObject { - type A = String - def foo(i: Int) = 239 -} diff --git a/test/files/scalap/packageObject/result.test b/test/files/scalap/packageObject/result.test deleted file mode 100644 index 5732d92958..0000000000 --- a/test/files/scalap/packageObject/result.test +++ /dev/null @@ -1,5 +0,0 @@ -package object PackageObject extends scala.AnyRef { - def this() = { /* compiled code */ } - type A = scala.Predef.String - def foo(i : scala.Int) : scala.Int = { /* compiled code */ } -} diff --git a/test/files/scalap/paramClauses.check b/test/files/scalap/paramClauses.check new file mode 100644 index 0000000000..3a141e8faf --- /dev/null +++ b/test/files/scalap/paramClauses.check @@ -0,0 +1,4 @@ +class ParamClauses extends scala.AnyRef { + def this() = { /* compiled code */ } + def foo(i : scala.Int)(s : scala.Predef.String)(t : scala.Double) : scala.Int = { /* compiled code */ } +} diff --git a/test/files/scalap/paramClauses.scala b/test/files/scalap/paramClauses.scala new file mode 100644 index 0000000000..f9d1917402 --- /dev/null +++ b/test/files/scalap/paramClauses.scala @@ -0,0 +1,3 @@ +class ParamClauses { + def foo(i: Int)(s: String)(t: Double) = 239 +} diff --git a/test/files/scalap/paramClauses/A.scala b/test/files/scalap/paramClauses/A.scala deleted file mode 100644 index f9d1917402..0000000000 --- a/test/files/scalap/paramClauses/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -class ParamClauses { - def foo(i: Int)(s: String)(t: Double) = 239 -} diff --git a/test/files/scalap/paramClauses/result.test b/test/files/scalap/paramClauses/result.test deleted file mode 100644 index 3a141e8faf..0000000000 --- a/test/files/scalap/paramClauses/result.test +++ /dev/null @@ -1,4 +0,0 @@ -class ParamClauses extends scala.AnyRef { - def this() = { /* compiled code */ } - def foo(i : scala.Int)(s : scala.Predef.String)(t : scala.Double) : scala.Int = { /* compiled code */ } -} diff --git a/test/files/scalap/paramNames.check b/test/files/scalap/paramNames.check new file mode 100644 index 0000000000..85e37f858d --- /dev/null +++ b/test/files/scalap/paramNames.check @@ -0,0 +1,4 @@ +class ParamNames extends scala.AnyRef { + def this() = { /* compiled code */ } + def foo(s : => scala.Seq[scala.Int], s2 : => scala.Seq[scala.Any]) : scala.Unit = { /* compiled code */ } +} diff --git a/test/files/scalap/paramNames.scala b/test/files/scalap/paramNames.scala new file mode 100644 index 0000000000..7ba9ff0feb --- /dev/null +++ b/test/files/scalap/paramNames.scala @@ -0,0 +1,3 @@ +class ParamNames { + def foo (s: => Seq[Int], s2: => Seq[Any]) {} +} diff --git a/test/files/scalap/paramNames/A.scala b/test/files/scalap/paramNames/A.scala deleted file mode 100644 index 7ba9ff0feb..0000000000 --- a/test/files/scalap/paramNames/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -class ParamNames { - def foo (s: => Seq[Int], s2: => Seq[Any]) {} -} diff --git a/test/files/scalap/paramNames/result.test b/test/files/scalap/paramNames/result.test deleted file mode 100644 index 85e37f858d..0000000000 --- a/test/files/scalap/paramNames/result.test +++ /dev/null @@ -1,4 +0,0 @@ -class ParamNames extends scala.AnyRef { - def this() = { /* compiled code */ } - def foo(s : => scala.Seq[scala.Int], s2 : => scala.Seq[scala.Any]) : scala.Unit = { /* compiled code */ } -} diff --git a/test/files/scalap/sequenceParam.check b/test/files/scalap/sequenceParam.check new file mode 100644 index 0000000000..142d92fea3 --- /dev/null +++ b/test/files/scalap/sequenceParam.check @@ -0,0 +1,3 @@ +class SequenceParam extends scala.AnyRef { + def this(s : scala.Predef.String, i : scala.Int*) = { /* compiled code */ } +} diff --git a/test/files/scalap/sequenceParam.scala b/test/files/scalap/sequenceParam.scala new file mode 100644 index 0000000000..86e13340b9 --- /dev/null +++ b/test/files/scalap/sequenceParam.scala @@ -0,0 +1 @@ +class SequenceParam(s: String, i: Int*) diff --git a/test/files/scalap/sequenceParam/A.scala b/test/files/scalap/sequenceParam/A.scala deleted file mode 100644 index 86e13340b9..0000000000 --- a/test/files/scalap/sequenceParam/A.scala +++ /dev/null @@ -1 +0,0 @@ -class SequenceParam(s: String, i: Int*) diff --git a/test/files/scalap/sequenceParam/result.test b/test/files/scalap/sequenceParam/result.test deleted file mode 100644 index 142d92fea3..0000000000 --- a/test/files/scalap/sequenceParam/result.test +++ /dev/null @@ -1,3 +0,0 @@ -class SequenceParam extends scala.AnyRef { - def this(s : scala.Predef.String, i : scala.Int*) = { /* compiled code */ } -} diff --git a/test/files/scalap/simpleClass.check b/test/files/scalap/simpleClass.check new file mode 100644 index 0000000000..4fdf25d1cf --- /dev/null +++ b/test/files/scalap/simpleClass.check @@ -0,0 +1,4 @@ +class SimpleClass extends scala.AnyRef { + def this() = { /* compiled code */ } + def foo : scala.Int = { /* compiled code */ } +} diff --git a/test/files/scalap/simpleClass.scala b/test/files/scalap/simpleClass.scala new file mode 100644 index 0000000000..fa82e62680 --- /dev/null +++ b/test/files/scalap/simpleClass.scala @@ -0,0 +1,3 @@ +class SimpleClass { + def foo = 239 +} diff --git a/test/files/scalap/simpleClass/A.scala b/test/files/scalap/simpleClass/A.scala deleted file mode 100644 index fa82e62680..0000000000 --- a/test/files/scalap/simpleClass/A.scala +++ /dev/null @@ -1,3 +0,0 @@ -class SimpleClass { - def foo = 239 -} diff --git a/test/files/scalap/simpleClass/result.test b/test/files/scalap/simpleClass/result.test deleted file mode 100644 index 4fdf25d1cf..0000000000 --- a/test/files/scalap/simpleClass/result.test +++ /dev/null @@ -1,4 +0,0 @@ -class SimpleClass extends scala.AnyRef { - def this() = { /* compiled code */ } - def foo : scala.Int = { /* compiled code */ } -} diff --git a/test/files/scalap/traitObject.check b/test/files/scalap/traitObject.check new file mode 100644 index 0000000000..104ba14f1a --- /dev/null +++ b/test/files/scalap/traitObject.check @@ -0,0 +1,8 @@ +trait TraitObject extends scala.AnyRef { + def $init$() : scala.Unit = { /* compiled code */ } + def foo : scala.Int = { /* compiled code */ } +} +object TraitObject extends scala.AnyRef { + def this() = { /* compiled code */ } + def bar : scala.Int = { /* compiled code */ } +} diff --git a/test/files/scalap/traitObject.scala b/test/files/scalap/traitObject.scala new file mode 100644 index 0000000000..d5f43181c1 --- /dev/null +++ b/test/files/scalap/traitObject.scala @@ -0,0 +1,7 @@ +trait TraitObject { + def foo = 239 +} + +object TraitObject { + def bar = 42 +} diff --git a/test/files/scalap/traitObject/A.scala b/test/files/scalap/traitObject/A.scala deleted file mode 100644 index d5f43181c1..0000000000 --- a/test/files/scalap/traitObject/A.scala +++ /dev/null @@ -1,7 +0,0 @@ -trait TraitObject { - def foo = 239 -} - -object TraitObject { - def bar = 42 -} diff --git a/test/files/scalap/traitObject/result.test b/test/files/scalap/traitObject/result.test deleted file mode 100644 index 104ba14f1a..0000000000 --- a/test/files/scalap/traitObject/result.test +++ /dev/null @@ -1,8 +0,0 @@ -trait TraitObject extends scala.AnyRef { - def $init$() : scala.Unit = { /* compiled code */ } - def foo : scala.Int = { /* compiled code */ } -} -object TraitObject extends scala.AnyRef { - def this() = { /* compiled code */ } - def bar : scala.Int = { /* compiled code */ } -} diff --git a/test/files/scalap/typeAnnotations.check b/test/files/scalap/typeAnnotations.check new file mode 100644 index 0000000000..407b0235c6 --- /dev/null +++ b/test/files/scalap/typeAnnotations.check @@ -0,0 +1,8 @@ +abstract class TypeAnnotations[@scala.specialized R] extends scala.AnyRef { + def this() = { /* compiled code */ } + @scala.specialized + val x : scala.Int = { /* compiled code */ } + @scala.specialized + type T + def compose[@scala.specialized A](x : A, y : R) : A = { /* compiled code */ } +} diff --git a/test/files/scalap/typeAnnotations.scala b/test/files/scalap/typeAnnotations.scala new file mode 100644 index 0000000000..ff2445edc9 --- /dev/null +++ b/test/files/scalap/typeAnnotations.scala @@ -0,0 +1,9 @@ +abstract class TypeAnnotations[@specialized R] { + @specialized val x = 10 + @specialized type T + + def compose[@specialized A](x: A, y: R): A = { + val y: A = x + x + } +} \ No newline at end of file diff --git a/test/files/scalap/typeAnnotations/A.scala b/test/files/scalap/typeAnnotations/A.scala deleted file mode 100644 index ff2445edc9..0000000000 --- a/test/files/scalap/typeAnnotations/A.scala +++ /dev/null @@ -1,9 +0,0 @@ -abstract class TypeAnnotations[@specialized R] { - @specialized val x = 10 - @specialized type T - - def compose[@specialized A](x: A, y: R): A = { - val y: A = x - x - } -} \ No newline at end of file diff --git a/test/files/scalap/typeAnnotations/result.test b/test/files/scalap/typeAnnotations/result.test deleted file mode 100644 index 407b0235c6..0000000000 --- a/test/files/scalap/typeAnnotations/result.test +++ /dev/null @@ -1,8 +0,0 @@ -abstract class TypeAnnotations[@scala.specialized R] extends scala.AnyRef { - def this() = { /* compiled code */ } - @scala.specialized - val x : scala.Int = { /* compiled code */ } - @scala.specialized - type T - def compose[@scala.specialized A](x : A, y : R) : A = { /* compiled code */ } -} diff --git a/test/files/scalap/valAndVar.check b/test/files/scalap/valAndVar.check new file mode 100644 index 0000000000..e940da9801 --- /dev/null +++ b/test/files/scalap/valAndVar.check @@ -0,0 +1,5 @@ +class ValAndVar extends scala.AnyRef { + def this() = { /* compiled code */ } + val foo : java.lang.String = { /* compiled code */ } + var bar : scala.Int = { /* compiled code */ } +} diff --git a/test/files/scalap/valAndVar.scala b/test/files/scalap/valAndVar.scala new file mode 100644 index 0000000000..2d89348401 --- /dev/null +++ b/test/files/scalap/valAndVar.scala @@ -0,0 +1,4 @@ +class ValAndVar { + val foo = "" + var bar = 42 +} diff --git a/test/files/scalap/valAndVar/A.scala b/test/files/scalap/valAndVar/A.scala deleted file mode 100644 index 2d89348401..0000000000 --- a/test/files/scalap/valAndVar/A.scala +++ /dev/null @@ -1,4 +0,0 @@ -class ValAndVar { - val foo = "" - var bar = 42 -} diff --git a/test/files/scalap/valAndVar/result.test b/test/files/scalap/valAndVar/result.test deleted file mode 100644 index e940da9801..0000000000 --- a/test/files/scalap/valAndVar/result.test +++ /dev/null @@ -1,5 +0,0 @@ -class ValAndVar extends scala.AnyRef { - def this() = { /* compiled code */ } - val foo : java.lang.String = { /* compiled code */ } - var bar : scala.Int = { /* compiled code */ } -} diff --git a/test/files/scalap/wildcardType.check b/test/files/scalap/wildcardType.check new file mode 100644 index 0000000000..e43261db32 --- /dev/null +++ b/test/files/scalap/wildcardType.check @@ -0,0 +1,3 @@ +class WildcardType extends scala.AnyRef { + def this(f : scala.Function1[scala.Int, _]) = { /* compiled code */ } +} diff --git a/test/files/scalap/wildcardType.scala b/test/files/scalap/wildcardType.scala new file mode 100644 index 0000000000..4bb0d14de5 --- /dev/null +++ b/test/files/scalap/wildcardType.scala @@ -0,0 +1 @@ +class WildcardType(f: Int => _) diff --git a/test/files/scalap/wildcardType/A.scala b/test/files/scalap/wildcardType/A.scala deleted file mode 100644 index 4bb0d14de5..0000000000 --- a/test/files/scalap/wildcardType/A.scala +++ /dev/null @@ -1 +0,0 @@ -class WildcardType(f: Int => _) diff --git a/test/files/scalap/wildcardType/result.test b/test/files/scalap/wildcardType/result.test deleted file mode 100644 index e43261db32..0000000000 --- a/test/files/scalap/wildcardType/result.test +++ /dev/null @@ -1,3 +0,0 @@ -class WildcardType extends scala.AnyRef { - def this(f : scala.Function1[scala.Int, _]) = { /* compiled code */ } -} diff --git a/test/partest b/test/partest index ec66f5c048..8243316cca 100755 --- a/test/partest +++ b/test/partest @@ -1,7 +1,8 @@ -#!/bin/sh +#!/usr/bin/env bash +# ############################################################################## -# Scala test runner 2.8.0 +# Scala test runner 2.10.0 ############################################################################## # (c) 2002-2013 LAMP/EPFL # @@ -10,6 +11,16 @@ # PARTICULAR PURPOSE. ############################################################################## +# Use tput to detect color-capable terminal. +term_colors=$(tput colors 2>/dev/null) +if [[ $? == 0 ]] && [[ $term_colors -gt 2 ]]; then + git_diff_options="--color=always --word-diff" + color_opts="-Dpartest.colors=$term_colors" +else + unset color_opts + git_diff_options="--nocolor" +fi + cygwin=false; darwin=false; case "`uname`" in @@ -98,6 +109,7 @@ fi "${JAVACMD:=java}" \ $JAVA_OPTS -cp "$EXT_CLASSPATH" \ ${partestDebugStr} \ + "$color_opts" \ -Dscala.home="${SCALA_HOME}" \ -Dpartest.javacmd="${JAVACMD}" \ -Dpartest.java_opts="${JAVA_OPTS}" \ -- cgit v1.2.3