luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4465 from eed3si9n/fport/ignore-files-in-scripted-group-dirs 

[fport] Ignore files in scripted group dirs
This commit is contained in:
eugene yokota 2018-11-27 20:50:20 -05:00 committed by GitHub
parent 0313cc5758 248b8b93d1
commit 935afadeac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala
View File

@ -53,7 +53,11 @@ final class ScriptedTests(
): Seq[TestRunner] = { ): Seq[TestRunner] = {
// Test group and names may be file filters (like '*') // Test group and names may be file filters (like '*')
for (groupDir <- (resourceBaseDirectory * group).get; nme <- (groupDir * name).get) yield { for {
groupDir <- (resourceBaseDirectory * group).get
nme <- (groupDir * name).get
if !(nme.isFile)
} yield {
val g = groupDir.getName val g = groupDir.getName
val n = nme.getName val n = nme.getName
val label = s"$g / $n" val label = s"$g / $n"
@ -110,7 +114,7 @@ final class ScriptedTests(
type TestInfo = ((String, String), File) type TestInfo = ((String, String), File)
val labelsAndDirs = groupAndNameDirs.map { val labelsAndDirs = groupAndNameDirs.filterNot(_._2.isFile).map {
case (groupDir, nameDir) => case (groupDir, nameDir) =>
val groupName = groupDir.getName val groupName = groupDir.getName
val testName = nameDir.getName val testName = nameDir.getName