From c555a4aff7ad3a302a1495ab502948420bb4df14 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Mon, 19 Dec 2016 13:08:37 +0100 Subject: Fix booted tests not compiling anything This was broken in 06a3d47ea9fd1b67b3acba9d115a16d18549e377 when the -deep argument was removed --- compiler/test/dotc/tests.scala | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'compiler/test/dotc/tests.scala') diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala index 84cf1a051..65074d4c2 100644 --- a/compiler/test/dotc/tests.scala +++ b/compiler/test/dotc/tests.scala @@ -98,6 +98,9 @@ class tests extends CompilerTest { val typerDir = dotcDir + "typer/" val libDir = "../library/src/" + def dottyBootedLib = compileDir(libDir, ".", List("-deep", "-Ycheck-reentrant", "-strict") ::: defaultOptions)(allowDeepSubtypes) // note the -deep argument + def dottyDependsOnBootedLib = compileDir(dottyDir, ".", List("-deep", "-Ycheck-reentrant", "-strict") ::: defaultOptions)(allowDeepSubtypes) // note the -deep argument + @Before def cleanup(): Unit = { // remove class files from stdlib and tests compilation Directory(defaultOutputDir + "scala").deleteRecursively() @@ -253,12 +256,6 @@ class tests extends CompilerTest { |../scala-scala/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin) @Test def compileIndexedSeq = compileLine("../scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala") - // Not a junit test anymore since it is order dependent - def dottyBootedLib = compileDir(libDir, ".")(allowDeepSubtypes) // note the -deep argument - - // Not a junit test anymore since it is order dependent - def dottyDependsOnBootedLib = compileDir(dottyDir, ".")(allowDeepSubtypes) // note the -deep argument - @Test def dotc_ast = compileDir(dotcDir, "ast") @Test def dotc_config = compileDir(dotcDir, "config") @Test def dotc_core = compileDir(dotcDir, "core")(allowDeepSubtypes)// twice omitted to make tests run faster -- cgit v1.2.3