diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-08-29 11:32:23 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-08-29 11:32:23 -0700 |
| commit | a0da5a697a2a0841972907b66fa733ab3e0ca665 (patch) | |
| tree | 0a5bfbb93fba1846272d1cb6018029880249eece /test/pending | |
| parent | 7817efe2468480317965fc5baece52be392f0f7a (diff) | |
| parent | ba86ac61f489573d10590c5fc601e73673f204f1 (diff) | |
| download | scala-a0da5a697a2a0841972907b66fa733ab3e0ca665.tar.gz scala-a0da5a697a2a0841972907b66fa733ab3e0ca665.tar.bz2 scala-a0da5a697a2a0841972907b66fa733ab3e0ca665.zip | |
Merge remote-tracking branch 'scala/2.10.x'
After the merge, the test/run/t7733 started to fail on Jenkins.
I tried to reproduce it locally but I couldn't so I think it's
system dependent failure. Per @retronym's suggestion I moved it to pending
to not block the whole merge.
Conflicts:
bincompat-backward.whitelist.conf
bincompat-forward.whitelist.conf
src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
src/compiler/scala/tools/nsc/typechecker/ContextErrors.scala
src/compiler/scala/tools/nsc/typechecker/Macros.scala
src/compiler/scala/tools/nsc/typechecker/Namers.scala
src/compiler/scala/tools/nsc/typechecker/NamesDefaults.scala
src/compiler/scala/tools/nsc/typechecker/RefChecks.scala
src/compiler/scala/tools/nsc/util/MsilClassPath.scala
src/compiler/scala/tools/reflect/ToolBoxFactory.scala
src/reflect/scala/reflect/internal/ClassfileConstants.scala
src/reflect/scala/reflect/internal/Importers.scala
src/reflect/scala/reflect/internal/Trees.scala
src/reflect/scala/reflect/runtime/JavaMirrors.scala
test/files/run/macro-duplicate/Impls_Macros_1.scala
test/files/run/t6392b.check
test/files/run/t7331c.check
Diffstat (limited to 'test/pending')
| -rw-r--r-- | test/pending/pos/t7486.scala | 8 | ||||
| -rw-r--r-- | test/pending/pos/t7778/Foo_1.java | 6 | ||||
| -rw-r--r-- | test/pending/pos/t7778/Test_2.scala | 3 | ||||
| -rw-r--r-- | test/pending/run/t7733.check | 1 | ||||
| -rw-r--r-- | test/pending/run/t7733/Separate_1.scala | 5 | ||||
| -rw-r--r-- | test/pending/run/t7733/Test_2.scala | 9 |
6 files changed, 24 insertions, 8 deletions
diff --git a/test/pending/pos/t7486.scala b/test/pending/pos/t7486.scala deleted file mode 100644 index 6dd7f4c4ac..0000000000 --- a/test/pending/pos/t7486.scala +++ /dev/null @@ -1,8 +0,0 @@ -object Test{ - var locker = 0 - // remove implicit, or change to `locker = locker + 1` to make it compile. - implicit val davyJones0 = { - locker += 0 - 0 - } -} diff --git a/test/pending/pos/t7778/Foo_1.java b/test/pending/pos/t7778/Foo_1.java new file mode 100644 index 0000000000..65431ffd46 --- /dev/null +++ b/test/pending/pos/t7778/Foo_1.java @@ -0,0 +1,6 @@ +import java.util.concurrent.Callable; + +public abstract class Foo_1<T> implements Callable<Foo_1<Object>.Inner> { + public abstract class Inner { + } +} diff --git a/test/pending/pos/t7778/Test_2.scala b/test/pending/pos/t7778/Test_2.scala new file mode 100644 index 0000000000..306303a99e --- /dev/null +++ b/test/pending/pos/t7778/Test_2.scala @@ -0,0 +1,3 @@ +class Test { + null: Foo_1[_] +} diff --git a/test/pending/run/t7733.check b/test/pending/run/t7733.check new file mode 100644 index 0000000000..19765bd501 --- /dev/null +++ b/test/pending/run/t7733.check @@ -0,0 +1 @@ +null diff --git a/test/pending/run/t7733/Separate_1.scala b/test/pending/run/t7733/Separate_1.scala new file mode 100644 index 0000000000..a326ecd53e --- /dev/null +++ b/test/pending/run/t7733/Separate_1.scala @@ -0,0 +1,5 @@ +package test + +class Separate { + for (i <- 1 to 10) println(i) +}
\ No newline at end of file diff --git a/test/pending/run/t7733/Test_2.scala b/test/pending/run/t7733/Test_2.scala new file mode 100644 index 0000000000..28358574ec --- /dev/null +++ b/test/pending/run/t7733/Test_2.scala @@ -0,0 +1,9 @@ +import scala.reflect.runtime.universe._ +import scala.reflect.runtime.{currentMirror => cm} +import scala.tools.reflect.ToolBox + +object Test extends App { + val tb = cm.mkToolBox() + val code = tb.parse("{ val x: test.Separate$$anonfun$1 = null; x }") + println(tb.eval(code)) +}
\ No newline at end of file |