aboutsummaryrefslogtreecommitdiff
path: root/compiler/test
diff options
context:
space:
mode:
authorFelix Mulder <felix.mulder@gmail.com>2017-03-20 17:05:50 +0100
committerFelix Mulder <felix.mulder@gmail.com>2017-03-29 10:33:25 +0200
commit52488dae47d7c17dbac36c5d1d985e2a81ebe9de (patch)
tree52fb055904570afde075598caa541722eec5bd78 /compiler/test
parent8c02da6858615dacfbcc09c2431e0945fce6d730 (diff)
downloaddotty-52488dae47d7c17dbac36c5d1d985e2a81ebe9de.tar.gz
dotty-52488dae47d7c17dbac36c5d1d985e2a81ebe9de.tar.bz2
dotty-52488dae47d7c17dbac36c5d1d985e2a81ebe9de.zip
Disable interactive mode in CI
Diffstat (limited to 'compiler/test')
-rw-r--r--compiler/test/dotc/comptest.scala2
-rw-r--r--compiler/test/dotty/tools/dotc/CompilationTests.scala2
-rw-r--r--compiler/test/dotty/tools/dotc/ParallelTesting.scala4
3 files changed, 7 insertions, 1 deletions
diff --git a/compiler/test/dotc/comptest.scala b/compiler/test/dotc/comptest.scala
index 03e3d859e..c2c88abb3 100644
--- a/compiler/test/dotc/comptest.scala
+++ b/compiler/test/dotc/comptest.scala
@@ -4,6 +4,8 @@ import dotty.tools.dotc.ParallelTesting
object comptest extends ParallelTesting {
+ def interactive: Boolean = true
+
implicit val defaultOutputDir: String = "."
val posDir = "./tests/pos/"
diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
index e7ecd342a..8df415a37 100644
--- a/compiler/test/dotty/tools/dotc/CompilationTests.scala
+++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -8,6 +8,8 @@ import java.io.{ File => JFile }
class CompilationTests extends ParallelTesting {
import CompilationTests._
+ def interactive: Boolean = !sys.env.contains("DRONE")
+
// Positive tests ------------------------------------------------------------
@Test def compilePos: Unit = {
diff --git a/compiler/test/dotty/tools/dotc/ParallelTesting.scala b/compiler/test/dotty/tools/dotc/ParallelTesting.scala
index d89a8940b..54f8effcd 100644
--- a/compiler/test/dotty/tools/dotc/ParallelTesting.scala
+++ b/compiler/test/dotty/tools/dotc/ParallelTesting.scala
@@ -20,6 +20,8 @@ import java.util.HashMap
trait ParallelTesting {
+ def interactive: Boolean
+
private sealed trait Target { self =>
def outDir: JFile
def flags: Array[String]
@@ -128,7 +130,7 @@ trait ParallelTesting {
case None => JExecutors.newWorkStealingPool()
}
- pool.submit(statusRunner)
+ if (interactive) pool.submit(statusRunner)
targets.foreach { target =>
pool.submit(compilationRunnable(target))