diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-02-08 14:57:43 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-02-08 14:57:43 +0100 |
| commit | 21a765feb0efeeecd671ede637a12f5088ac8257 (patch) | |
| tree | 5e3bf3a75c0dc8a505ba7033470fe50ed2250039 /test | |
| parent | 896e7cc42e703f735c8fefbb51c6e700a6651814 (diff) | |
| parent | dc3fccb59d9ac848550b3264608ce9b7bdbfe624 (diff) | |
| download | scala-21a765feb0efeeecd671ede637a12f5088ac8257.tar.gz scala-21a765feb0efeeecd671ede637a12f5088ac8257.tar.bz2 scala-21a765feb0efeeecd671ede637a12f5088ac8257.zip | |
Merge pull request #3391 from xeno-by/ticket/8131
SI-8131 fixes residual race condition in runtime reflection
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/run/reflection-sync-potpourri.scala (renamed from test/pending/run/reflection-sync-potpourri.scala) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/pending/run/reflection-sync-potpourri.scala b/test/files/run/reflection-sync-potpourri.scala index 0ad5f2ab66..0c96974df7 100644 --- a/test/pending/run/reflection-sync-potpourri.scala +++ b/test/files/run/reflection-sync-potpourri.scala @@ -24,7 +24,7 @@ object Test extends App { override def run(): Unit = { val s1 = foo("42") val s2 = perms(diceRolls(i - 1)).map(x => force(x)).sorted.mkString(", ") - assert(s1 == "java.lang.String") + assert(s1 == "String" || s1 == "java.lang.String") assert(s2 == "java.lang.annotation.Annotation, java.lang.reflect.Method, scala.io.BufferedSource, scala.io.Codec") } }) |