Merge pull request #1289 from dotty-staging/fix/partest-separate

partest: Enable separate compilation

10 files changed, 7 insertions, 5 deletions

diff --git a/tests/pos/java-interop/t1263/Test.java b/tests/pending/pos/java-interop/t1263/Test.java
index 1718a9909..1718a9909 100644
--- a/tests/pos/java-interop/t1263/Test.java
+++ b/tests/pending/pos/java-interop/t1263/Test.java
diff --git a/tests/pos/java-interop/t1263/test.scala b/tests/pending/pos/java-interop/t1263/test.scala
index 92d8c1cdf..92d8c1cdf 100644
--- a/tests/pos/java-interop/t1263/test.scala
+++ b/tests/pending/pos/java-interop/t1263/test.scala
diff --git a/tests/pos/java-interop/t1745/J.java b/tests/pending/pos/java-interop/t1745/J.java
index 8444eabb2..8444eabb2 100644
--- a/tests/pos/java-interop/t1745/J.java
+++ b/tests/pending/pos/java-interop/t1745/J.java
diff --git a/tests/pos/java-interop/t1745/S.scala b/tests/pending/pos/java-interop/t1745/S.scala
index 84c437133..84c437133 100644
--- a/tests/pos/java-interop/t1745/S.scala
+++ b/tests/pending/pos/java-interop/t1745/S.scala
diff --git a/tests/pos/annot.scala b/tests/pos/annot.scala
index e6e4f8051..dec6af945 100644
--- a/tests/pos/annot.scala
+++ b/tests/pos/annot.scala
@@ -9,7 +9,7 @@ class Test {
 
   @SuppressWarnings(Array("hi", "foo")) def foo2() = ??? //can be deferred as there is a non-generic method
 
-  @SuppressWarnings("hi") def foo3() = ??? // can be written in java and is serialized this way in bytecode. doesn't typecheck
+  @SuppressWarnings(Array("hi")) def foo3() = ??? // can be written in java and is serialized this way in bytecode. doesn't typecheck
 
   @Transient(false) def bar = ???
 
diff --git a/tests/pos/java-interop/volatile/volatile.java b/tests/pos/java-interop/volatile/Foo.java
index c6a607b4d..c6a607b4d 100644
--- a/tests/pos/java-interop/volatile/volatile.java
+++ b/tests/pos/java-interop/volatile/Foo.java
diff --git a/tests/run/colltest4/CollectionStrawMan4_1.scala b/tests/run/colltest4/CollectionStrawMan4_1.scala
index 874f67a2d..8f0bdc841 100644
--- a/tests/run/colltest4/CollectionStrawMan4_1.scala
+++ b/tests/run/colltest4/CollectionStrawMan4_1.scala
@@ -1,3 +1,4 @@
+package colltest4
 package strawman.collections
 
 import Predef.{augmentString => _, wrapString => _, _}
@@ -216,7 +217,7 @@ object CollectionStrawMan4 {
     def fromIterable[B](coll: Iterable[B]): ListBuffer[B] = coll match {
       case pd @ View.Partitioned(partition: View.Partition[B]) =>
         partition.distribute(new ListBuffer[B]())
-        pd.forced.get.asInstanceOf[ListBuffer[B]]
+        new ListBuffer[B] ++= pd.forced.get
       case _ =>
         new ListBuffer[B] ++= coll
     }
diff --git a/tests/run/colltest4/CollectionTests_2.scala b/tests/run/colltest4/CollectionTests_2.scala
index 0961180ed..45da9d8a5 100644
--- a/tests/run/colltest4/CollectionTests_2.scala
+++ b/tests/run/colltest4/CollectionTests_2.scala
@@ -2,8 +2,8 @@ import Predef.{augmentString => _, wrapString => _, _}
 import scala.reflect.ClassTag
 
 object Test {
-  import strawman.collections._
-  import CollectionStrawMan5._
+  import colltest4.strawman.collections._
+  import CollectionStrawMan4._
 
   def seqOps(xs: Seq[Int]) = {
     val x1 = xs.foldLeft("")(_ + _)
diff --git a/tests/run/colltest5/CollectionStrawMan5_1.scala b/tests/run/colltest5/CollectionStrawMan5_1.scala
index 1a89d9659..bb6ed4426 100644
--- a/tests/run/colltest5/CollectionStrawMan5_1.scala
+++ b/tests/run/colltest5/CollectionStrawMan5_1.scala
@@ -1,3 +1,4 @@
+package colltest5
 package strawman.collections
 
 import Predef.{augmentString => _, wrapString => _, _}
diff --git a/tests/run/colltest5/CollectionTests_2.scala b/tests/run/colltest5/CollectionTests_2.scala
index 0961180ed..1a0bf37ac 100644
--- a/tests/run/colltest5/CollectionTests_2.scala
+++ b/tests/run/colltest5/CollectionTests_2.scala
@@ -2,7 +2,7 @@ import Predef.{augmentString => _, wrapString => _, _}
 import scala.reflect.ClassTag
 
 object Test {
-  import strawman.collections._
+  import colltest5.strawman.collections._
   import CollectionStrawMan5._
 
   def seqOps(xs: Seq[Int]) = {