From f8ef4497891cb8b7defd10fb6fadee457e3390af Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 6 May 2016 01:30:35 -0400
Subject: [PATCH] Fix test quick

---
 main/src/main/scala/sbt/Defaults.scala      | 20 +++++++++++++++-----
 sbt/src/sbt-test/tests/test-quick/build.sbt |  7 +++++--
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 2e721a798..56287d41f 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -512,16 +512,26 @@ object Defaults extends BuildCommon {
         val stamps = collection.mutable.Map.empty[String, Long]
         def stamp(dep: String): Long = {
           val stamps = for (a <- ans) yield intlStamp(dep, a, Set.empty)
-          if (stamps.isEmpty) Long.MinValue else stamps.max
+          if (stamps.isEmpty) Long.MinValue
+          else stamps.max
         }
         def intlStamp(c: String, analysis: Analysis, s: Set[String]): Long = {
-          if (s contains c) Long.MinValue else
-            stamps.getOrElseUpdate(c, {
+          if (s contains c) Long.MinValue
+          else {
+            val x = {
               import analysis.{ relations => rel, apis }
               rel.internalClassDeps(c).map(intlStamp(_, analysis, s + c)) ++
                 rel.externalDeps(c).map(stamp) +
-                apis.internal(c).compilation.startTime
-            }.max)
+                (apis.internal.get(c) match {
+                  case Some(x) => x.compilation.startTime
+                  case _       => Long.MinValue
+                })
+            }.max
+            if (x != Long.MinValue) {
+              stamps(c) = x
+            }
+            x
+          }
         }
         def noSuccessYet(test: String) = succeeded.get(test) match {
           case None     => true
diff --git a/sbt/src/sbt-test/tests/test-quick/build.sbt b/sbt/src/sbt-test/tests/test-quick/build.sbt
index 3d05c8130..8efb08911 100755
--- a/sbt/src/sbt-test/tests/test-quick/build.sbt
+++ b/sbt/src/sbt-test/tests/test-quick/build.sbt
@@ -1,6 +1,9 @@
 lazy val root = (project in file(".")).
   settings(
-    scalaVersion := "2.10.6",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "1.9.1" % Test,
+    scalaVersion := "2.11.8",
+    libraryDependencies ++= List(
+      "org.scala-lang.modules" %% "scala-xml" % "1.0.1",
+      "org.scalatest" %% "scalatest" % "2.2.6"
+    ),
     parallelExecution in test := false
   )