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

Commit 2c50eed

Browse files
committed
Merge pull request #6 from retronym/topic/source-path
Fix --srcpath command line option
2 parents 7e5d762 + 2d4c5df commit 2c50eed

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class ConsoleRunner(argstr: String) extends {
1919
} with ConsoleRunnerSpec with Instance {
2020

2121
val suiteRunner = new SuiteRunner (
22-
testSourcePath = optSourcePath.map(_.getAbsolutePath) getOrElse PartestDefaults.sourcePath,
22+
testSourcePath = optSourcePath getOrElse PartestDefaults.sourcePath,
2323
fileManager = new FileManager(ClassPath split PathResolver.Environment.javaUserClassPath map (Path(_))), // the script sets up our classpath for us via ant
2424
updateCheck = optUpdateCheck,
2525
failed = optFailed)
@@ -112,7 +112,8 @@ class ConsoleRunner(argstr: String) extends {
112112

113113
optTimeout foreach (x => setProp("partest.timeout", x))
114114

115-
NestUI echo banner
115+
if (!isPartestTerse)
116+
NestUI echo banner
116117

117118
val partestTests = (
118119
if (optSelfTest) TestKinds.testsForPartest

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ object Properties extends scala.util.PropertiesTrait {
720720

721721
/** Extended by Ant- and ConsoleRunner for running a set of tests. */
722722
class SuiteRunner(
723-
val testSourcePath: String,
723+
val testSourcePath: String, // relative path, like "files", or "pending"
724724
val fileManager: FileManager,
725725
val updateCheck: Boolean,
726726
val failed: Boolean,

0 commit comments

Comments
 (0)