aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2017-04-03 17:04:46 +0200
committerFelix Mulder <felix.mulder@gmail.com>2017-04-12 11:21:56 +0200
commitd65e4eadaf5c9fbed379680de591bb3ef42c6b3d (patch)
tree32d8e235c3940b986ad3ed41909033ff8441cfde
parent741ee1645a13c94fbb7edfd064b4ec092a69b1bf (diff)
downloaddotty-d65e4eadaf5c9fbed379680de591bb3ef42c6b3d.tar.gz
dotty-d65e4eadaf5c9fbed379680de591bb3ef42c6b3d.tar.bz2
dotty-d65e4eadaf5c9fbed379680de591bb3ef42c6b3d.zip
Rename test suite to "vulpix"
-rw-r--r--.drone.yml8
-rw-r--r--compiler/foo0
-rw-r--r--compiler/test/dotc/comptest.scala2
-rw-r--r--compiler/test/dotty/tools/dotc/CompilationTests.scala8
-rw-r--r--compiler/test/dotty/tools/dotc/vulpix/ParallelTesting.scala (renamed from compiler/test/dotty/tools/dotc/ParallelTesting.scala)6
-rw-r--r--compiler/test/dotty/tools/dotc/vulpix/SummaryReport.java (renamed from compiler/test/dotty/tools/dotc/ParallelSummaryReport.java)8
-rw-r--r--compiler/test/dotty/tools/dotc/vulpix/VulpixTests.scala (renamed from compiler/test/dotty/tools/dotc/ParallelTestTests.scala)3
7 files changed, 20 insertions, 15 deletions
diff --git a/.drone.yml b/.drone.yml
index 98e34cc4e..ed772eb32 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -40,9 +40,9 @@ pipeline:
matrix:
TEST:
- - ;set testOptions in LocalProject("dotty-compiler") += Tests.Argument(TestFrameworks.JUnit, "--exclude-categories=dotty.tools.dotc.ParallelTesting") ;test ;dotty-bin-tests/test
- - ;set testOptions in LocalProject("dotty-compiler-bootstrapped") += Tests.Argument(TestFrameworks.JUnit, "--exclude-categories=dotty.tools.dotc.ParallelTesting") ;publishLocal ;dotty-bootstrapped/test
- - ;set testOptions in LocalProject("dotty-compiler") += Tests.Argument(TestFrameworks.JUnit, "--exclude-categories=dotty.tools.dotc.ParallelTesting") ;partest-only-no-bootstrap --show-diff --verbose
- - ;set testOptions in LocalProject("dotty-compiler-bootstrapped") += Tests.Argument(TestFrameworks.JUnit, "--exclude-categories=dotty.tools.dotc.ParallelTesting") ;partest-only --show-diff --verbose
+ - ;set testOptions in LocalProject("dotty-compiler") += Tests.Argument(TestFrameworks.JUnit, "--exclude-categories=dotty.tools.dotc.hydra.ParallelTesting") ;test ;dotty-bin-tests/test
+ - ;set testOptions in LocalProject("dotty-compiler-bootstrapped") += Tests.Argument(TestFrameworks.JUnit, "--exclude-categories=dotty.tools.dotc.hydra.ParallelTesting") ;publishLocal ;dotty-bootstrapped/test
+ - ;set testOptions in LocalProject("dotty-compiler") += Tests.Argument(TestFrameworks.JUnit, "--exclude-categories=dotty.tools.dotc.hydra.ParallelTesting") ;partest-only-no-bootstrap --show-diff --verbose
+ - ;set testOptions in LocalProject("dotty-compiler-bootstrapped") += Tests.Argument(TestFrameworks.JUnit, "--exclude-categories=dotty.tools.dotc.hydra.ParallelTesting") ;partest-only --show-diff --verbose
- ;dotty-compiler/testOnly dotty.tools.dotc.CompilationTests
- ;publishLocal ;dotty-bootstrapped/testOnly dotty.tools.dotc.CompilationTests
diff --git a/compiler/foo b/compiler/foo
deleted file mode 100644
index e69de29bb..000000000
--- a/compiler/foo
+++ /dev/null
diff --git a/compiler/test/dotc/comptest.scala b/compiler/test/dotc/comptest.scala
index dce002c81..d283f4ef0 100644
--- a/compiler/test/dotc/comptest.scala
+++ b/compiler/test/dotc/comptest.scala
@@ -1,6 +1,6 @@
package dotc
-import dotty.tools.dotc.ParallelTesting
+import dotty.tools.dotc.vulpix.ParallelTesting
object comptest extends ParallelTesting {
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index 742b93fae..a2d632b19 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -3,16 +3,16 @@ package tools
package dotc
import org.junit.Test
-import java.io.{ File => JFile }
import org.junit.experimental.categories.Category
import scala.util.matching.Regex
+import vulpix.{ ParallelTesting, SummaryReport }
@Category(Array(classOf[ParallelTesting]))
-class CompilationTests extends ParallelSummaryReport with ParallelTesting {
+class CompilationTests extends SummaryReport with ParallelTesting {
import CompilationTests._
- def isInteractive: Boolean = ParallelSummaryReport.isInteractive
+ def isInteractive: Boolean = SummaryReport.isInteractive
def testFilter: Option[Regex] = sys.props.get("dotty.partest.filter").map(r => new Regex(r))
@@ -270,7 +270,7 @@ object CompilationTests {
val classPath = {
val paths = Jars.dottyTestDeps map { p =>
- val file = new JFile(p)
+ val file = new java.io.File(p)
assert(
file.exists,
s"""|File "$p" couldn't be found. Run `packageAll` from build tool before
diff --git a/compiler/test/dotty/tools/dotc/ParallelTesting.scala b/compiler/test/dotty/tools/dotc/vulpix/ParallelTesting.scala
index 80c56808b..674f9e563 100644
--- a/compiler/test/dotty/tools/dotc/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/dotc/vulpix/ParallelTesting.scala
@@ -1,6 +1,7 @@
package dotty
package tools
package dotc
+package vulpix
import java.io.{ File => JFile }
import java.text.SimpleDateFormat
@@ -32,7 +33,7 @@ import dotc.util.DiffUtil
trait ParallelTesting { self =>
import ParallelTesting._
- import ParallelSummaryReport._
+ import SummaryReport._
/** If the running environment supports an interactive terminal, each `Test`
* will be run with a progress bar and real time feedback
@@ -411,7 +412,8 @@ trait ParallelTesting { self =>
registerCompilation(errorCount)
- if (errorCount > 0) failTestSource(testSource)
+ if (errorCount > 0)
+ failTestSource(testSource)
}
}
diff --git a/compiler/test/dotty/tools/dotc/ParallelSummaryReport.java b/compiler/test/dotty/tools/dotc/vulpix/SummaryReport.java
index 5608b3656..1d900e777 100644
--- a/compiler/test/dotty/tools/dotc/ParallelSummaryReport.java
+++ b/compiler/test/dotty/tools/dotc/vulpix/SummaryReport.java
@@ -1,16 +1,18 @@
-package dotty.tools.dotc;
+package dotty.tools.dotc.vulpix;
import org.junit.BeforeClass;
import org.junit.AfterClass;
import java.util.ArrayDeque;
+import java.util.function.Supplier;
+import scala.Function0;
+import scala.Unit;
import dotty.tools.dotc.reporting.TestReporter;
-import dotty.tools.dotc.reporting.TestReporter$;
/** Note that while `ParallelTesting` runs in parallel, JUnit tests cannot with
* this class
*/
-public class ParallelSummaryReport {
+public class SummaryReport {
public final static boolean isInteractive = !System.getenv().containsKey("DRONE");
private static TestReporter rep = TestReporter.reporter(System.out, -1);
diff --git a/compiler/test/dotty/tools/dotc/ParallelTestTests.scala b/compiler/test/dotty/tools/dotc/vulpix/VulpixTests.scala
index cfb108ea7..dea5aa777 100644
--- a/compiler/test/dotty/tools/dotc/ParallelTestTests.scala
+++ b/compiler/test/dotty/tools/dotc/vulpix/VulpixTests.scala
@@ -1,13 +1,14 @@
package dotty
package tools
package dotc
+package vulpix
import org.junit.Assert._
import org.junit.Test
import scala.util.control.NonFatal
-class ParallelTestTests extends ParallelTesting {
+class VulpixTests extends ParallelTesting {
import CompilationTests._
def isInteractive = !sys.env.contains("DRONE")