@@ -100,7 +100,7 @@ class ConsoleRunner(argstr: String) extends {
100
100
101
101
// Early return on no args, version, or invalid args
102
102
if (optVersion) return echo(versionMsg)
103
- if ((argstr == " " ) || optHelp) return NestUI .usage()
103
+ if (optHelp) return NestUI .usage()
104
104
105
105
val (individualTests, invalid) = parsed.residualArgs map (p => Path (p)) partition denotesTestPath
106
106
if (invalid.nonEmpty) {
@@ -122,6 +122,7 @@ class ConsoleRunner(argstr: String) extends {
122
122
val grepExpr = optGrep getOrElse " "
123
123
124
124
// If --grep is given we suck in every file it matches.
125
+ // TODO: intersect results of grep with specified kinds, if any
125
126
val greppedTests = if (grepExpr == " " ) Nil else {
126
127
val paths = grepFor(grepExpr)
127
128
if (paths.isEmpty)
@@ -136,9 +137,8 @@ class ConsoleRunner(argstr: String) extends {
136
137
137
138
val givenKinds = standardKinds.filter(kind => parsed.isSet(" --" + kind))
138
139
val kinds = (
139
- if (optAll) standardKinds
140
- else if (givenKinds.nonEmpty) givenKinds
141
- else if (invalid.isEmpty && miscTests.isEmpty && ! isRerun) standardKinds // If no kinds, --grep, or individual tests were given, assume --all
140
+ if (givenKinds.nonEmpty) givenKinds
141
+ else if (miscTests.isEmpty) standardKinds // If no kinds, --grep, or individual tests were given, assume --all
142
142
else Nil
143
143
)
144
144
val kindsTests = kinds flatMap testsFor
0 commit comments