Merge branch 'work'

Conflicts:
	src/library/scala/concurrent/SyncVar.scala

6 files changed, 61 insertions, 4 deletions

diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala
index 8c4df8fc37..6a4e37bda9 100644
--- a/test/files/jvm/serialization.scala
+++ b/test/files/jvm/serialization.scala
@@ -604,9 +604,9 @@ object Test9_parallel {
     println()
 
     // UnrolledBuffer
-    val ub = new UnrolledBuffer[String]
+    val ub = new collection.mutable.UnrolledBuffer[String]
     ub ++= List("one", "two")
-    val _ub: UnrolledBuffer[String] = read(write(ub))
+    val _ub: collection.mutable.UnrolledBuffer[String] = read(write(ub))
     check(ub, _ub)
 
     // mutable.ParArray
diff --git a/test/files/run/UnrolledBuffer.scala b/test/files/run/UnrolledBuffer.scala
index 7e113c3e04..62a1f7d083 100644
--- a/test/files/run/UnrolledBuffer.scala
+++ b/test/files/run/UnrolledBuffer.scala
@@ -2,7 +2,7 @@
 
 
 
-import collection.parallel.UnrolledBuffer
+import collection.mutable.UnrolledBuffer
 
 
 
diff --git a/test/files/pos/scan.scala b/test/files/run/scan.scala
index 47e0a7d976..47e0a7d976 100644
--- a/test/files/pos/scan.scala
+++ b/test/files/run/scan.scala
diff --git a/test/files/run/testblock.scala b/test/files/run/testblock.scala
new file mode 100644
index 0000000000..a334b668fd
--- /dev/null
+++ b/test/files/run/testblock.scala
@@ -0,0 +1,33 @@
+
+
+
+
+import scala.parallel._
+
+
+
+
+object Test {
+
+  def main(args: Array[String]) {
+    if (util.Properties.isJavaAtLeast("1.6")) {
+      val vendor = util.Properties.javaVmVendor
+      if ((vendor contains "Sun") || (vendor contains "Apple")) blockcomp(10)
+    }
+  }
+
+  val lock = new java.util.concurrent.locks.ReentrantLock
+
+  def blockcomp(n: Int): Unit = if (n > 0) {
+    val (x, y) = par(blockcomp(n - 1), blockcomp(n - 1))
+    if (n == 8) blocking { // without this blocking block, deadlock occurs
+      lock.lock()
+    }
+    x()
+    y()
+    if (n == 8) {
+      lock.unlock()
+    }
+  }
+
+}
diff --git a/test/files/run/testpar.scala b/test/files/run/testpar.scala
new file mode 100644
index 0000000000..c4c813ee00
--- /dev/null
+++ b/test/files/run/testpar.scala
@@ -0,0 +1,24 @@
+
+
+
+import scala.parallel._
+
+
+
+
+
+object Test {
+
+  def main(args: Array[String]) {
+    if (util.Properties.isJavaAtLeast("1.6")) {
+      val vendor = util.Properties.javaVmVendor
+      if ((vendor contains "Sun") || (vendor contains "Apple")) assert(fib(40) == 102334155)
+    }
+  }
+
+  def fib(n: Int): Int = if (n < 3) 1 else if (n < 35) fib(n - 1) + fib(n - 2) else {
+    val (p, pp) = par(fib(n - 1), fib(n - 2))
+    p() + pp()
+  }
+
+}
diff --git a/test/files/scalacheck/Unrolled.scala b/test/files/scalacheck/Unrolled.scala
index d69e62dd01..34604b8667 100644
--- a/test/files/scalacheck/Unrolled.scala
+++ b/test/files/scalacheck/Unrolled.scala
@@ -2,7 +2,7 @@ import org.scalacheck._
 import Prop._
 import Gen._
 
-import collection.parallel.UnrolledBuffer
+import collection.mutable.UnrolledBuffer
 
 object Test extends Properties("UnrolledBuffer") {