1 files changed, 12 insertions, 6 deletions
diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala
index af2c88e1a..efecc1df3 100644
--- a/compiler/test/dotc/tests.scala
+++ b/compiler/test/dotc/tests.scala
@@ -3,6 +3,7 @@ package dotc
 import dotty.Jars
 import dotty.tools.dotc.CompilerTest
 import dotty.tools.StdLibSources
+import org.junit.experimental.categories.Category
 import org.junit.{Before, Test}
 import org.junit.Assert._
 
@@ -10,10 +11,15 @@ import java.io.{ File => JFile }
 import scala.reflect.io.Directory
 import scala.io.Source
 
-// tests that match regex '(pos|dotc|run|java|compileStdLib)\.*' would be executed as benchmarks.
+/** WARNING
+ *  =======
+ *  These are legacy, do not add tests here, see `CompilationTests.scala`
+ */
+@Category(Array(classOf[java.lang.Exception]))
 class tests extends CompilerTest {
 
-  def isRunByJenkins: Boolean = sys.props.isDefinedAt("dotty.jenkins.build")
+  // tests that match regex '(pos|dotc|run|java|compileStdLib)\.*' would be
+  // executed as benchmarks.
 
   val defaultOutputDir = "../out/"
 
@@ -62,7 +68,7 @@ class tests extends CompilerTest {
   }
 
   implicit val defaultOptions: List[String] = noCheckOptions ++ {
-    if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725
+    if (dotty.Properties.isRunByDrone) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725
     else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef")
   } ++ checkOptions ++ classPath
 
@@ -204,8 +210,8 @@ class tests extends CompilerTest {
   private val stdlibFiles: List[String] = StdLibSources.whitelisted
 
   @Test def compileStdLib =
-    if (!generatePartestFiles)
-      compileList("compileStdLib", stdlibFiles, "-migration" :: "-Yno-inline" :: scala2mode)
+    compileList("compileStdLib", stdlibFiles, "-migration" :: "-Yno-inline" :: scala2mode)
+
   @Test def compileMixed = compileLine(
       """../tests/pos/B.scala
         |../scala-scala/src/library/scala/collection/immutable/Seq.scala
@@ -221,7 +227,7 @@ class tests extends CompilerTest {
         |../scala-scala/src/library/scala/collection/parallel/mutable/ParSet.scala
         |../scala-scala/src/library/scala/collection/mutable/SetLike.scala""".stripMargin)(scala2mode ++ defaultOptions)
 
-  @Test def dotty = {
+  @Test def dottyBooted = {
     dottyBootedLib
     dottyDependsOnBootedLib
   }