Always show logs and diffs in partest when running only individual tests

Author: szeiger

src/partest/scala/tools/partest/nest/AbstractRunner.scala

@@ -28,8 +28,6 @@ abstract class AbstractRunner {
     verbose = config.optVerbose,
     debug = config.optDebug || propOrFalse("partest.debug"),
     terse = config.optTerse,
-    diffOnFail = config.optShowDiff,
-    logOnFail = config.optShowLog,
     colorEnabled = colorEnabled
   )
 
@@ -50,6 +48,8 @@ abstract class AbstractRunner {
   private[this] var summarizing      = false
   private[this] var elapsedMillis    = 0L
   private[this] var expectedFailures = 0
+  private[this] var onlyIndividualTests = false
+
 
   import nestUI._
   import nestUI.color._
@@ -170,6 +170,7 @@ abstract class AbstractRunner {
       val allTests: Array[Path] = distinctBy(miscTests ++ kindsTests)(_.toCanonical) sortBy (_.toString) toArray
       val grouped = (allTests groupBy kindOf).toArray sortBy (x => standardKinds indexOf x._1)
 
+      onlyIndividualTests = individualTests.nonEmpty && rerunTests.isEmpty && kindsTests.isEmpty && greppedTests.isEmpty
       totalTests = allTests.size
       expectedFailures = propOrNone("partest.errors") match {
         case Some(num)  => num.toInt
@@ -243,7 +244,7 @@ abstract class AbstractRunner {
           case t: Throwable => throw new RuntimeException(s"Error running $testFile", t)
         }
       stopwatchDuration = Some(durationMs)
-      nestUI.reportTest(state, runner, durationMs)
+      nestUI.reportTest(state, runner, durationMs, diffOnFail = config.optShowDiff || onlyIndividualTests , logOnFail = config.optShowLog || onlyIndividualTests)
       runner.cleanup()
       state
     }

src/partest/scala/tools/partest/nest/NestUI.scala

@@ -24,7 +24,6 @@ class Colors(enabled: Boolean) {
 }
 
 class NestUI(val verbose: Boolean = false, val debug: Boolean = false, val terse: Boolean = false,
-             val diffOnFail: Boolean = false, val logOnFail: Boolean = false,
              val colorEnabled: Boolean = sys.props contains "partest.colors") {
   private[this] val testNum = new java.util.concurrent.atomic.AtomicInteger(1)
   @volatile private[this] var testNumberFmt = "%3d"
@@ -67,7 +66,7 @@ class NestUI(val verbose: Boolean = false, val debug: Boolean = false, val terse
     f"$word $testNumber - $testIdent%-40s$reasonString$durationString"
   }
 
-  def reportTest(state: TestState, info: TestInfo, durationMs: Long): Unit = {
+  def reportTest(state: TestState, info: TestInfo, durationMs: Long, diffOnFail: Boolean, logOnFail: Boolean): Unit = {
     if (terse && state.isOk) {
       if (dotCount >= DotWidth) {
         outline("\n.")