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

Commit bcdbb90

Browse files
committed
Merge pull request #17 from som-snytt/issue/missing-debug
SI-8382 Restore partest.debug
2 parents 8a5fbb0 + 4754bc1 commit bcdbb90

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/main/scala/scala/tools/partest/PartestTask.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
package scala.tools
1010
package partest
1111

12-
import scala.util.Properties.setProp
12+
import scala.tools.nsc.Properties.propOrFalse
1313
import scala.tools.ant.sabbus.CompilationPathProperty
1414
import java.lang.reflect.Method
1515
import org.apache.tools.ant.Task
@@ -112,7 +112,7 @@ class PartestTask extends Task with CompilationPathProperty with ScalaTask {
112112
}
113113

114114
override def execute() {
115-
if (debug || sys.props.contains("partest.debug")) {
115+
if (debug || propOrFalse("partest.debug")) {
116116
NestUI.setDebug()
117117
}
118118

src/main/scala/scala/tools/partest/nest/ConsoleRunner.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package partest
88
package nest
99

1010
import utils.Properties._
11-
import scala.tools.nsc.Properties.{ versionMsg, setProp }
11+
import scala.tools.nsc.Properties.{ versionMsg, propOrFalse, setProp }
1212
import scala.collection.{ mutable, immutable }
1313
import TestKinds._
1414
import scala.reflect.internal.util.Collections.distinctBy
@@ -93,9 +93,9 @@ class ConsoleRunner(argstr: String) extends {
9393
}
9494

9595
def run(): Unit = {
96-
if (optDebug) NestUI.setDebug()
97-
if (optVerbose) NestUI.setVerbose()
98-
if (optTerse) NestUI.setTerse()
96+
if (optDebug || propOrFalse("partest.debug")) NestUI.setDebug()
97+
if (optVerbose) NestUI.setVerbose()
98+
if (optTerse) NestUI.setTerse()
9999
if (optShowDiff) NestUI.setDiffOnFail()
100100

101101
// Early return on no args, version, or invalid args

0 commit comments

Comments
 (0)