diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-05-09 21:16:42 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-05-09 21:16:42 +0200 |
commit | d079e769b9372daae8d7770c4156f85ea1af6621 (patch) | |
tree | 07f672cc54501b0eee17b5ab812738679c1009eb /test | |
parent | 7289a263475a3c789df35e999931902acf08c0d5 (diff) | |
parent | f0846e74dbce99ae1d8e2f1d7e5faeadc2a5c375 (diff) | |
download | scala-d079e769b9372daae8d7770c4156f85ea1af6621.tar.gz scala-d079e769b9372daae8d7770c4156f85ea1af6621.tar.bz2 scala-d079e769b9372daae8d7770c4156f85ea1af6621.zip |
Merge pull request #3730 from lrytz/checkinit
Fix checkinit build
Diffstat (limited to 'test')
-rw-r--r-- | test/files/run/t3569.scala | 3 | ||||
-rw-r--r-- | test/files/run/t5256h.scala | 3 | ||||
-rw-r--r-- | test/files/run/t7974.flags | 1 | ||||
-rw-r--r-- | test/files/run/t7974/Test.scala | 2 | ||||
-rw-r--r-- | test/files/run/t8570.flags | 1 | ||||
-rw-r--r-- | test/files/run/t8570.scala | 10 | ||||
-rw-r--r-- | test/files/run/t8570a.check | 1 | ||||
-rw-r--r-- | test/files/run/t8570a.flags | 1 | ||||
-rw-r--r-- | test/files/run/t8570a.scala | 14 |
9 files changed, 33 insertions, 3 deletions
diff --git a/test/files/run/t3569.scala b/test/files/run/t3569.scala index 91d437e0e3..eb3b424439 100644 --- a/test/files/run/t3569.scala +++ b/test/files/run/t3569.scala @@ -26,7 +26,8 @@ object Test { s.x += 1 println(s.x) - (classOf[X].getDeclaredFields map ("" + _)).sorted foreach println + // under -Xcheckinit there's an additional $init$ field + (classOf[X].getDeclaredFields map ("" + _)).sorted.filter(_ != "private volatile byte Test$X.bitmap$init$0") foreach println (classOf[Y].getDeclaredFields map ("" + _)).sorted foreach println } } diff --git a/test/files/run/t5256h.scala b/test/files/run/t5256h.scala index f58aa6dbe7..435124a469 100644 --- a/test/files/run/t5256h.scala +++ b/test/files/run/t5256h.scala @@ -6,5 +6,6 @@ object Test extends App { val c = cm.classSymbol(mutant.getClass) println(c) println(c.fullName) - println(c.info) + // under -Xcheckinit there's an additional $init$ field + c.info.toString.lines.filter(_ != " private var bitmap$init$0: Boolean") foreach println } diff --git a/test/files/run/t7974.flags b/test/files/run/t7974.flags new file mode 100644 index 0000000000..5fc2a03894 --- /dev/null +++ b/test/files/run/t7974.flags @@ -0,0 +1 @@ +-Xcheckinit:false diff --git a/test/files/run/t7974/Test.scala b/test/files/run/t7974/Test.scala index 9403ea332b..433d9061a7 100644 --- a/test/files/run/t7974/Test.scala +++ b/test/files/run/t7974/Test.scala @@ -9,7 +9,7 @@ object Test extends BytecodeTest { val classNode = loadClassNode("Symbols", skipDebugInfo = false) val textifier = new Textifier classNode.accept(new TraceClassVisitor(null, textifier, null)) - + val classString = stringFromWriter(w => textifier.print(w)) val result = classString.split('\n') diff --git a/test/files/run/t8570.flags b/test/files/run/t8570.flags new file mode 100644 index 0000000000..3d1ee4760a --- /dev/null +++ b/test/files/run/t8570.flags @@ -0,0 +1 @@ +-Xcheckinit diff --git a/test/files/run/t8570.scala b/test/files/run/t8570.scala new file mode 100644 index 0000000000..bbe83e9080 --- /dev/null +++ b/test/files/run/t8570.scala @@ -0,0 +1,10 @@ +trait Trait40_1 { + val value37_2 = () + def run = { value37_2 } +} + +object Test { + def main(args: Array[String]) { + (new Trait40_1 {}).run + } +} diff --git a/test/files/run/t8570a.check b/test/files/run/t8570a.check new file mode 100644 index 0000000000..6a452c185a --- /dev/null +++ b/test/files/run/t8570a.check @@ -0,0 +1 @@ +() diff --git a/test/files/run/t8570a.flags b/test/files/run/t8570a.flags new file mode 100644 index 0000000000..3d1ee4760a --- /dev/null +++ b/test/files/run/t8570a.flags @@ -0,0 +1 @@ +-Xcheckinit diff --git a/test/files/run/t8570a.scala b/test/files/run/t8570a.scala new file mode 100644 index 0000000000..ef116e2a8a --- /dev/null +++ b/test/files/run/t8570a.scala @@ -0,0 +1,14 @@ +trait Trait40_1 { + val value37_2 = () + def run = { value37_2 } +} + +trait T1 extends Trait40_1 { + override val value37_2 = () +} + +object Test { + def main(args: Array[String]) { + println((new T1 {}).run) + } +} |