From 5f562aa7a81b6d49428d7aea0bdad3fd90ea0232 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 22 Nov 2018 15:48:51 +0000 Subject: [PATCH] Ignore files in scripted group dirs Scripted tests, in src/sbt-test// blow up if is a plain file. Filter them out. --- .../src/main/scala/sbt/scriptedtest/ScriptedTests.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala b/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala index 85cf73764..5435364e8 100644 --- a/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala +++ b/scripted-sbt-redux/src/main/scala/sbt/scriptedtest/ScriptedTests.scala @@ -53,7 +53,11 @@ final class ScriptedTests( ): Seq[TestRunner] = { // 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 n = nme.getName val label = s"$g / $n" @@ -110,7 +114,7 @@ final class ScriptedTests( type TestInfo = ((String, String), File) - val labelsAndDirs = groupAndNameDirs.map { + val labelsAndDirs = groupAndNameDirs.filterNot(_._2.isFile).map { case (groupDir, nameDir) => val groupName = groupDir.getName val testName = nameDir.getName