Skip to content

Only execute optimised/idempotency test on Drone #3194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2017
Merged

Only execute optimised/idempotency test on Drone #3194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions compiler/test/dotty/tools/dotc/CompilationTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package dotc

import org.junit.{ Test, BeforeClass, AfterClass }
import org.junit.Assert._
import org.junit.Assume._

import java.nio.file._
import java.util.stream.{ Stream => JStream }
Expand Down Expand Up @@ -295,6 +296,7 @@ class CompilationTests extends ParallelTesting {
}

@Test def testOptimised: Unit = {
assumeTrue("Only executes on Drone", dotty.Properties.isRunByDrone)
val outputDir = defaultOutputDir + "optimised/"
compileFilesInDir("../tests/pos", defaultOptimised, outputDir).checkCompile()
compileFilesInDir("../tests/run", defaultOptimised, outputDir).checkRuns()
Expand Down
12 changes: 7 additions & 5 deletions compiler/test/dotty/tools/dotc/IdempotencyTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package dotty
package tools
package dotc

import java.io.{ File => JFile }
import java.nio.file.{ Files, Paths, Path }
import java.io.{File => JFile}
import java.nio.file.{Files, Path, Paths}

import org.junit.{ Test, AfterClass }
import org.junit.Assume.assumeTrue
import org.junit.{AfterClass, Test}

import scala.concurrent.duration._

import vulpix.{ ParallelTesting, SummaryReport, SummaryReporting, TestConfiguration }
import vulpix.{ParallelTesting, SummaryReport, SummaryReporting, TestConfiguration}


class IdempotencyTests extends ParallelTesting {
Expand All @@ -26,6 +26,8 @@ class IdempotencyTests extends ParallelTesting {

/* TODO: Only run them selectively? */
@Test def idempotency: Unit = {
assumeTrue("Only executes on Drone", dotty.Properties.isRunByDrone)

val opt = defaultOptions.and("-YemitTasty")

def sourcesFrom(dir: Path) = CompilationTests.sources(Files.walk(dir))
Expand Down