From 5ad5591c8ee07e48f527c350742dbc29c8d1a8f4 Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Thu, 7 Apr 2016 12:47:36 +0200 Subject: [PATCH 1/2] Add target/ to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..9f970225a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target/ \ No newline at end of file From 89e88ff584dfc57d1382106b8607049ee86e1a86 Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Thu, 7 Apr 2016 12:48:45 +0200 Subject: [PATCH 2/2] Run scripted tests in the alphabetical order Makes the order deterministic and makes it easier to see the progress on running tests. --- .../main/scala/sbt/internal/scripted/ScriptedTests.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala index 665d97f0f..18c2f2e9e 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala @@ -147,13 +147,13 @@ final class ListTests(baseDirectory: File, accept: ScriptedTest => Boolean, log: listTests(group).map(ScriptedTest(groupName, _)) } } - private[this] def listTests(group: File): Set[String] = + private[this] def listTests(group: File): Seq[String] = { val groupName = group.getName - val allTests = list(group, filter) + val allTests = list(group, filter).sortBy(_.getName) if (allTests.isEmpty) { log.warn("No tests in test group " + groupName) - Set.empty + Seq.empty } else { val (included, skipped) = allTests.toList.partition(test => accept(ScriptedTest(groupName, test.getName))) if (included.isEmpty) @@ -162,7 +162,7 @@ final class ListTests(baseDirectory: File, accept: ScriptedTest => Boolean, log: log.warn("Tests skipped in group " + group.getName + ":") skipped.foreach(testName => log.warn(" " + testName.getName)) } - Set(included.map(_.getName): _*) + Seq(included.map(_.getName): _*) } } }