Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

SI-8382 Restore partest.debug #17

Merged
merged 1 commit into from
Mar 10, 2014
Merged

SI-8382 Restore partest.debug #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/scala/scala/tools/partest/PartestTask.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
package scala.tools
package partest

import scala.util.Properties.setProp
import scala.tools.nsc.Properties.propOrFalse
import scala.tools.ant.sabbus.CompilationPathProperty
import java.lang.reflect.Method
import org.apache.tools.ant.Task
Expand Down Expand Up @@ -112,7 +112,7 @@ class PartestTask extends Task with CompilationPathProperty with ScalaTask {
}

override def execute() {
if (debug || sys.props.contains("partest.debug")) {
if (debug || propOrFalse("partest.debug")) {
NestUI.setDebug()
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/scala/scala/tools/partest/nest/ConsoleRunner.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package partest
package nest

import utils.Properties._
import scala.tools.nsc.Properties.{ versionMsg, setProp }
import scala.tools.nsc.Properties.{ versionMsg, propOrFalse, setProp }
import scala.collection.{ mutable, immutable }
import TestKinds._
import scala.reflect.internal.util.Collections.distinctBy
Expand Down Expand Up @@ -93,9 +93,9 @@ class ConsoleRunner(argstr: String) extends {
}

def run(): Unit = {
if (optDebug) NestUI.setDebug()
if (optVerbose) NestUI.setVerbose()
if (optTerse) NestUI.setTerse()
if (optDebug || propOrFalse("partest.debug")) NestUI.setDebug()
if (optVerbose) NestUI.setVerbose()
if (optTerse) NestUI.setTerse()
if (optShowDiff) NestUI.setDiffOnFail()

// Early return on no args, version, or invalid args
Expand Down