From 0e5851ba8ed3b87dc4dbe12647edb97b6683c769 Mon Sep 17 00:00:00 2001 From: Dmitry Petrashko Date: Thu, 21 May 2015 17:15:34 +0200 Subject: [PATCH 1/5] Use UTF8 by default on jenkins. --- scripts/common | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/common b/scripts/common index 1c7be04f286a..6386ab2f578d 100755 --- a/scripts/common +++ b/scripts/common @@ -11,4 +11,6 @@ update() { git reset --hard } -sbtArgs="-Ddotty.travis.build=yes -ivy $baseDir/ivy2 -Dsbt.global.base=$HOME/.sbt/0.13 -sbt-dir $HOME/.sbt/0.13" +export LC_ALL=en_US.UTF-8 + +sbtArgs="-Ddotty.travis.build=yes -Dfile.encoding=UTF-8 -ivy $baseDir/ivy2 -Dsbt.global.base=$HOME/.sbt/0.13 -sbt-dir $HOME/.sbt/0.13" From 9fff1ac663f80a0477a2464216c608dc2ecd81b0 Mon Sep 17 00:00:00 2001 From: vsalvis Date: Wed, 13 May 2015 12:18:39 +0200 Subject: [PATCH 2/5] Partest command line options (same as scala) useable from sbt --- test/test/CompilerTest.scala | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test/test/CompilerTest.scala b/test/test/CompilerTest.scala index 7b2e24ac12de..a712cb4a0002 100644 --- a/test/test/CompilerTest.scala +++ b/test/test/CompilerTest.scala @@ -146,25 +146,24 @@ abstract class CompilerTest extends DottyTest { (implicit defaultOptions: List[String]): Unit = compileDir(prefix, dirName, args, xerrors, true) - def runFiles(path: String, args: List[String] = Nil, verbose: Boolean = true) - (implicit defaultOptions: List[String]): Unit = - compileFiles(path, args, verbose, true) - /** Compiles each source in the directory path separately by calling * compileFile resp. compileDir. */ - def compileFiles(path: String, args: List[String] = Nil, verbose: Boolean = true, isRunTest: Boolean = false) + def compileFiles(path: String, args: List[String] = Nil, verbose: Boolean = true, runTest: Boolean = false) (implicit defaultOptions: List[String]): Unit = { val dir = Directory(path) val fileNames = dir.files.toArray.map(_.jfile.getName).filter(name => (name endsWith ".scala") || (name endsWith ".java")) for (name <- fileNames) { if (verbose) println(s"testing $path$name") - compileFile(path, name, args, 0, "", isRunTest) + compileFile(path, name, args, 0, "", runTest) } for (subdir <- dir.dirs) { if (verbose) println(s"testing $subdir") - compileDir(path, subdir.jfile.getName, args, 0, isRunTest) + compileDir(path, subdir.jfile.getName, args, 0, runTest) } } + def runFiles(path: String, args: List[String] = Nil, verbose: Boolean = true) + (implicit defaultOptions: List[String]): Unit = + compileFiles(path, args, verbose, true) /** Compiles the given list of code files. */ def compileList(testName: String, files: List[String], args: List[String] = Nil, xerrors: Int = 0) From 12f7dcba50671361f3de04d3a23b049f74a79280 Mon Sep 17 00:00:00 2001 From: vsalvis Date: Wed, 13 May 2015 14:41:21 +0200 Subject: [PATCH 3/5] Added partest-only sbt target and less verbose file generation --- project/Build.scala | 3 +- test/test/CompilerTest.scala | 56 +++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 271e54f8786d..d29b6a76ef60 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -118,7 +118,8 @@ object DottyBuild extends Build { ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath } - ) ++ addCommandAlias("partest", ";test:compile;lockPartestFile;test:test;runPartestRunner") + ) ++ addCommandAlias("partest", ";test:compile;lockPartestFile;test:test;runPartestRunner") ++ + addCommandAlias("partest-only", ";test:compile;lockPartestFile;test:test-only dotc.tests;runPartestRunner") lazy val dotty = Project(id = "dotty", base = file("."), settings = defaults) diff --git a/test/test/CompilerTest.scala b/test/test/CompilerTest.scala index a712cb4a0002..36a1b9d34be5 100644 --- a/test/test/CompilerTest.scala +++ b/test/test/CompilerTest.scala @@ -61,14 +61,13 @@ abstract class CompilerTest extends DottyTest { new JFile("." + JFile.separator + "tests" + JFile.separator + "locks" + JFile.separator + s"partest-$pid.lock").exists } - // Delete generated files from previous run - if (generatePartestFiles) - CompilerTest.init + // Delete generated files from previous run and create new log + val logFile = if (!generatePartestFiles) None else Some(CompilerTest.init) /** Always run with JUnit. */ def compileLine(cmdLine: String, xerrors: Int = 0)(implicit defaultOptions: List[String]): Unit = { if (generatePartestFiles) - NestUI.echoWarning("WARNING: compileLine will always run with JUnit, no partest files generated.") + log("WARNING: compileLine will always run with JUnit, no partest files generated.") compileArgs(cmdLine.split("\n"), xerrors) } @@ -87,11 +86,11 @@ abstract class CompilerTest extends DottyTest { (implicit defaultOptions: List[String]): Unit = { if (!generatePartestFiles || !partestableFile(prefix, fileName, extension, args ++ defaultOptions, xerrors)) { if (runTest) - NestUI.echoWarning(s"WARNING: run tests can only be run by partest, JUnit just verifies compilation: $prefix$fileName$extension") + log(s"WARNING: run tests can only be run by partest, JUnit just verifies compilation: $prefix$fileName$extension") compileArgs((s"$prefix$fileName$extension" :: args).toArray, xerrors) } else { val kind = testKind(prefix, xerrors, runTest) - println(s"generating partest files for test file: $prefix$fileName$extension of kind $kind") + log(s"generating partest files for test file: $prefix$fileName$extension of kind $kind") val sourceFile = new JFile(prefix + fileName + extension) if (sourceFile.exists) { @@ -102,8 +101,7 @@ abstract class CompilerTest extends DottyTest { } } } - - def runFile(prefix: String, fileName: String, args: List[String] = Nil, xerrors: Int = 0, + def runFile(prefix: String, fileName: String, args: List[String] = Nil, xerrors: Int = 0, extension: String = ".scala")(implicit defaultOptions: List[String]): Unit = compileFile(prefix, fileName, args, xerrors, extension, true) @@ -113,7 +111,7 @@ abstract class CompilerTest extends DottyTest { (implicit defaultOptions: List[String]): Unit = { if (!generatePartestFiles || !partestableDir(prefix, dirName, args ++ defaultOptions, xerrors)) { if (runTest) - NestUI.echoWarning(s"WARNING: run tests can only be run by partest, JUnit just verifies compilation: $prefix$dirName") + log(s"WARNING: run tests can only be run by partest, JUnit just verifies compilation: $prefix$dirName") val dir = Directory(prefix + dirName) val (files, normArgs) = args match { case "-deep" :: args1 => (dir.deepFiles, args1) @@ -127,21 +125,18 @@ abstract class CompilerTest extends DottyTest { case _ => (new JFile(prefix + dirName), args ++ defaultOptions, "shallow") } val kind = testKind(prefix, xerrors, runTest) - println(s"generating partest files for test directory ($deep): $prefix$dirName of kind $kind") + log(s"generating partest files for test directory ($deep): $prefix$dirName of kind $kind") if (sourceDir.exists) { val firstDest = Directory(DPConfig.testRoot + JFile.separator + kind + JFile.separator + dirName) computeDestAndCopyFiles(sourceDir, firstDest, kind, flags, xerrors.toString) - if (deep == "deep") { - sourceDir.listFiles.foreach(_.delete) - sourceDir.delete - } + if (deep == "deep") + deleteDir(sourceDir) } else { throw new java.io.FileNotFoundException(s"Unable to locate test dir $prefix$dirName") } } } - def runDir(prefix: String, dirName: String, args: List[String] = Nil, xerrors: Int = 0) (implicit defaultOptions: List[String]): Unit = compileDir(prefix, dirName, args, xerrors, true) @@ -153,11 +148,11 @@ abstract class CompilerTest extends DottyTest { val dir = Directory(path) val fileNames = dir.files.toArray.map(_.jfile.getName).filter(name => (name endsWith ".scala") || (name endsWith ".java")) for (name <- fileNames) { - if (verbose) println(s"testing $path$name") + if (verbose) log(s"testing $path$name") compileFile(path, name, args, 0, "", runTest) } for (subdir <- dir.dirs) { - if (verbose) println(s"testing $subdir") + if (verbose) log(s"testing $subdir") compileDir(path, subdir.jfile.getName, args, 0, runTest) } } @@ -177,6 +172,7 @@ abstract class CompilerTest extends DottyTest { recCopyFiles(jfile, destDir / jfile.getName) }) compileDir(DPConfig.testRoot + JFile.separator, testName, args, xerrors) + deleteDir(destDir.jfile) } } @@ -197,7 +193,7 @@ abstract class CompilerTest extends DottyTest { if (runTest) "run" else if (xerrors > 0) "neg" else if (prefixDir.endsWith("run" + JFile.separator)) { - NestUI.echoWarning("WARNING: test is being run as pos test despite being in a run directory. " + + log("WARNING: test is being run as pos test despite being in a run directory. " + "Use runFile/runDir instead of compileFile/compileDir to do a run test") "pos" } else "pos" @@ -246,7 +242,7 @@ abstract class CompilerTest extends DottyTest { if (kind == "run") FileManager.copyFile(check.jfile, dest.changeExtension("check").jfile) else - NestUI.echoWarning(s"WARNING: ignoring $check for test kind $kind") + log(s"WARNING: ignoring $check for test kind $kind") }) } @@ -259,7 +255,7 @@ abstract class CompilerTest extends DottyTest { dest.parent.jfile.mkdirs FileManager.copyFile(sourceFile.jfile, dest.jfile) } else { - NestUI.echoWarning(s"WARNING: ignoring $sf") + log(s"WARNING: ignoring $sf") } }, { sdir => dest.jfile.mkdirs @@ -330,14 +326,28 @@ abstract class CompilerTest extends DottyTest { destDir.jfile } + /** Recursively deletes directories (and files). */ + private def deleteDir(dir: JFile): Unit = { + val children = dir.listFiles + if (children != null) + children.foreach(deleteDir(_)) + dir.delete + } + + /** Write either to console (JUnit) or log file (partest). */ + private def log(msg: String) = logFile.map(_.appendAll(msg + "\n")).getOrElse(println(msg)) } object CompilerTest extends App { - /** Delete generated partest sources from a previous run. */ - lazy val init = { + /** Deletes generated partest sources from a previous run, recreates + * directory and returns the freshly created log file. */ + lazy val init: SFile = { scala.reflect.io.Directory(DPConfig.testRoot).deleteRecursively - new java.io.File(DPConfig.testRoot).mkdirs + new JFile(DPConfig.testRoot).mkdirs + val log = (Path(DPConfig.testRoot) / Path("gen.log")).createFile(true) + println(s"CompilerTest is generating tests for partest, log: $log") + log } // val dotcDir = "/Users/odersky/workspace/dotty/src/dotty/" From ed31c2a82d6b59ef092e17bd8811278f5ffd15e9 Mon Sep 17 00:00:00 2001 From: vsalvis Date: Tue, 19 May 2015 14:51:19 +0200 Subject: [PATCH 4/5] Less verbose partest with compiler output redirected, better --verbose output --- test/dotty/partest/DPConfig.scala | 4 +- test/dotty/partest/DPConsoleRunner.scala | 62 +++++++++++++----------- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/test/dotty/partest/DPConfig.scala b/test/dotty/partest/DPConfig.scala index c744a95622de..ad9c271ef8ea 100644 --- a/test/dotty/partest/DPConfig.scala +++ b/test/dotty/partest/DPConfig.scala @@ -18,9 +18,7 @@ object DPConfig { lazy val testDirs = { val root = new File(testRoot) val dirs = if (!root.exists) Array.empty[String] else root.listFiles.filter(_.isDirectory).map(_.getName) - if (dirs.length > 0) - println(s"Partest found generated source directories in $testRoot: " + dirs.mkString(", ")) - else + if (dirs.isEmpty) throw new Exception("Partest did not detect any generated sources") dirs } diff --git a/test/dotty/partest/DPConsoleRunner.scala b/test/dotty/partest/DPConsoleRunner.scala index 1f3eaa39d760..b0d05f4bfa1e 100644 --- a/test/dotty/partest/DPConsoleRunner.scala +++ b/test/dotty/partest/DPConsoleRunner.scala @@ -9,7 +9,7 @@ import scala.tools.partest._ import scala.tools.partest.nest._ import scala.util.matching.Regex import tools.nsc.io.{ File => NSCFile } -import java.io.File +import java.io.{ File, PrintStream, FileOutputStream } import java.net.URLClassLoader /** Runs dotty partest from the Console, discovering test sources in @@ -25,7 +25,7 @@ object DPConsoleRunner { val (jarList, otherArgs) = args.toList.partition(jarFinder.findFirstIn(_).isDefined) val (extraJars, moreArgs) = jarList match { case Nil => sys.error("Error: DPConsoleRunner needs \"-dottyJars *\".") - case jarFinder(nr, jarString) :: Nil => + case jarFinder(nr, jarString) :: Nil => val jars = jarString.split(" ").toList val count = nr.toInt if (jars.length < count) @@ -64,7 +64,7 @@ class DPSuiteRunner(testSourcePath: String, // relative path, like "files", or " failed: Boolean, javaCmdPath: String = PartestDefaults.javaCmd, javacCmdPath: String = PartestDefaults.javacCmd, - scalacExtraArgs: Seq[String] = Seq.empty) + scalacExtraArgs: Seq[String] = Seq.empty) extends SuiteRunner(testSourcePath, fileManager, updateCheck, failed, javaCmdPath, javacCmdPath, scalacExtraArgs) { if (!DPConfig.runTestsInParallel) @@ -82,32 +82,38 @@ extends SuiteRunner(testSourcePath, fileManager, updateCheck, failed, javaCmdPat """.stripMargin } - // override to provide DPTestRunner + // override for DPTestRunner and redirecting compilation output to test.clog override def runTest(testFile: File): TestState = { val runner = new DPTestRunner(testFile, this) - // when option "--failed" is provided execute test only if log - // is present (which means it failed before) val state = - if (failed && !runner.logFile.canRead) - runner.genPass() - else { - val (state, _) = - try timed(runner.run()) - catch { - case t: Throwable => throw new RuntimeException(s"Error running $testFile", t) - } - NestUI.reportTest(state) - runner.cleanup() - state + try { + // IO redirection is messy, there are no concurrency guarantees. + // Parts of test output might end up in the wrong file or get lost. + Console.out.flush + Console.err.flush + val clog = SFile(runner.logFile).changeExtension("clog") + val stream = new PrintStream(new FileOutputStream(clog.jfile), true) + val result = Console.withOut(stream)({ Console.withErr(stream)({ + runner.run() + Console.err.flush + Console.out.flush + })}) + result match { + // Append compiler output to transcript if compilation failed, + // printed with --verbose option + case TestState.Fail(f, r@"compilation failed", transcript) => + TestState.Fail(f, r, transcript ++ clog.fileLines.dropWhile(_ == "")) + case res => res + } + } catch { + case t: Throwable => throw new RuntimeException(s"Error running $testFile", t) } + NestUI.reportTest(state) + runner.cleanup() + onFinishTest(testFile, state) } - - // override val fileManager = new DottyFileManager(testClassLoader) - // sbt package generates a dotty compiler jar, currently - // ".../git/dotty/target/scala-2.11/dotty_2.11-0.1-SNAPSHOT.jar" - // but it doesn't seem to be used anywhere } class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runner(testFile, suiteRunner) { @@ -146,7 +152,7 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn def nerrIsOk(reason: String) = { val nerrFinder = """compilation failed with (\d+) errors""".r reason match { - case nerrFinder(found) => + case nerrFinder(found) => SFile(FileOps(testFile) changeExtension "nerr").safeSlurp match { case Some(exp) if (exp != found) => CompFailedButWrongNErr(exp, found) case _ => CompFailed @@ -154,10 +160,10 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn case _ => CompFailed } } - + // we keep the partest semantics where only one round needs to fail // compilation, not all - val compFailingRounds = compilationRounds(testFile).map({round => + val compFailingRounds = compilationRounds(testFile).map({round => val ok = round.isOk setLastState(if (ok) genPass else genFail("compilation failed")) (round.result, ok) @@ -173,14 +179,14 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn if (failureStates.exists({ case CompFailed => true; case _ => false })) { true } else { - val existsNerr = failureStates.exists({ + val existsNerr = failureStates.exists({ case CompFailedButWrongNErr(exp, found) => nextTestActionFailing(s"wrong number of compilation errors, expected: $exp, found: $found"); true case _ => false }) if (existsNerr) { - false + false } else { - val existsDiff = failureStates.exists({ + val existsDiff = failureStates.exists({ case CompFailedButWrongDiff() => nextTestActionFailing(s"output differs"); true case _ => false }) From adfe78d740b2443dd09c9008c78bc98f0f3894a0 Mon Sep 17 00:00:00 2001 From: vsalvis Date: Wed, 20 May 2015 13:43:14 +0200 Subject: [PATCH 5/5] Update-check option for partest, added "do not edit" header --- test/dotty/partest/DPConsoleRunner.scala | 54 +++++++++++++++++++++--- test/partest | 12 +----- test/test/CompilerTest.scala | 31 +++++++------- 3 files changed, 66 insertions(+), 31 deletions(-) diff --git a/test/dotty/partest/DPConsoleRunner.scala b/test/dotty/partest/DPConsoleRunner.scala index b0d05f4bfa1e..788abe0e1b80 100644 --- a/test/dotty/partest/DPConsoleRunner.scala +++ b/test/dotty/partest/DPConsoleRunner.scala @@ -39,13 +39,13 @@ object DPConsoleRunner { // console runner has a suite runner which creates a test runner for each test class DPConsoleRunner(args: String, extraJars: List[String]) extends ConsoleRunner(args) { - println("ConsoleRunner options: " + args) override val suiteRunner = new DPSuiteRunner ( testSourcePath = optSourcePath getOrElse DPConfig.testRoot, fileManager = new DottyFileManager(extraJars), updateCheck = optUpdateCheck, - failed = optFailed) + failed = optFailed, + consoleArgs = args) override def run = {} def runPartest = super.run @@ -62,6 +62,7 @@ class DPSuiteRunner(testSourcePath: String, // relative path, like "files", or " fileManager: DottyFileManager, updateCheck: Boolean, failed: Boolean, + consoleArgs: String, javaCmdPath: String = PartestDefaults.javaCmd, javacCmdPath: String = PartestDefaults.javacCmd, scalacExtraArgs: Seq[String] = Seq.empty) @@ -76,9 +77,11 @@ extends SuiteRunner(testSourcePath, fileManager, updateCheck, failed, javaCmdPat override def banner: String = { s"""|Welcome to Partest for Dotty! Partest version: ${Properties.versionNumberString} |Compiler under test: dotty.tools.dotc.Bench or dotty.tools.dotc.Main - |Test root: ${PathSettings.srcDir}${File.separator} + |Generated test sources: ${PathSettings.srcDir}${File.separator} |Test directories: ${DPConfig.testDirs.toList.mkString(", ")} + |Debugging: failed tests have compiler output in test-kind.clog, run output in test-kind.log, class files in test-kind.obj |Parallel: ${DPConfig.runTestsInParallel} + |Options: (use partest --help for usage information) ${consoleArgs} """.stripMargin } @@ -92,12 +95,13 @@ extends SuiteRunner(testSourcePath, fileManager, updateCheck, failed, javaCmdPat // Parts of test output might end up in the wrong file or get lost. Console.out.flush Console.err.flush - val clog = SFile(runner.logFile).changeExtension("clog") + val clog = runner.cLogFile val stream = new PrintStream(new FileOutputStream(clog.jfile), true) val result = Console.withOut(stream)({ Console.withErr(stream)({ - runner.run() + val res = runner.run() Console.err.flush Console.out.flush + res })}) result match { // Append compiler output to transcript if compilation failed, @@ -117,6 +121,8 @@ extends SuiteRunner(testSourcePath, fileManager, updateCheck, failed, javaCmdPat } class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runner(testFile, suiteRunner) { + val cLogFile = SFile(logFile).changeExtension("clog") + // override to provide DottyCompiler override def newCompiler = new dotty.partest.DPDirectCompiler(this) @@ -199,6 +205,38 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn } } + // override to change check file updating to original file, not generated + override def diffIsOk: Boolean = { + // always normalize the log first + normalizeLog() + val diff = currentDiff + // if diff is not empty, is update needed? + val updating: Option[Boolean] = ( + if (diff == "") None + else Some(suiteRunner.updateCheck) + ) + pushTranscript(s"diff $logFile $checkFile") + nextTestAction(updating) { + case Some(true) => + val origCheck = SFile(checkFile.changeExtension("checksrc").fileLines(1)) + NestUI.echo("Updating original checkfile " + origCheck) + origCheck writeAll file2String(logFile) + genUpdated() + case Some(false) => + // Get a word-highlighted diff from git if we can find it + val bestDiff = if (updating.isEmpty) "" else { + if (checkFile.canRead) + gitDiff(logFile, checkFile) getOrElse { + s"diff $logFile $checkFile\n$diff" + } + else diff + } + pushTranscript(bestDiff) + genFail("output differs") + case None => genPass() // redundant default case + } getOrElse true + } + // override because Dotty currently doesn't handle separate compilation well, // so we ignore groups (tests suffixed with _1 and _2) override def groupedFiles(sources: List[File]): List[List[File]] = { @@ -223,4 +261,10 @@ class DPTestRunner(testFile: File, suiteRunner: DPSuiteRunner) extends nest.Runn // override to add dotty and scala jars to classpath override def extraClasspath = suiteRunner.fileManager.asInstanceOf[DottyFileManager].extraJarList ::: super.extraClasspath + // override to keep class files if failed and delete clog if ok + override def cleanup = if (lastState.isOk) { + logFile.delete + cLogFile.delete + Directory(outDir).deleteRecursively + } } diff --git a/test/partest b/test/partest index 5794e2e5793e..0ac50aa8ef33 100755 --- a/test/partest +++ b/test/partest @@ -1,12 +1,4 @@ #!/usr/bin/env bash -# partest error message references partest script to update check files, but -# doesn't work for dotty because we don't know where tests came from. +# partest error message references partest script to update check files -if [ $1='--update-check' ]; -then - echo """ERROR: Since dotty partest runs on generated files, please update the check -files in the original location (run tests) or update the expected error count -(neg tests) in the test file." -else - echo "This script doesn't launch partest, please use sbt partest instead." -fi \ No newline at end of file +exec sbt "partest-only $*" diff --git a/test/test/CompilerTest.scala b/test/test/CompilerTest.scala index 36a1b9d34be5..4a8ec6da0759 100644 --- a/test/test/CompilerTest.scala +++ b/test/test/CompilerTest.scala @@ -101,7 +101,7 @@ abstract class CompilerTest extends DottyTest { } } } - def runFile(prefix: String, fileName: String, args: List[String] = Nil, xerrors: Int = 0, + def runFile(prefix: String, fileName: String, args: List[String] = Nil, xerrors: Int = 0, extension: String = ".scala")(implicit defaultOptions: List[String]): Unit = compileFile(prefix, fileName, args, xerrors, extension, true) @@ -131,7 +131,7 @@ abstract class CompilerTest extends DottyTest { val firstDest = Directory(DPConfig.testRoot + JFile.separator + kind + JFile.separator + dirName) computeDestAndCopyFiles(sourceDir, firstDest, kind, flags, xerrors.toString) if (deep == "deep") - deleteDir(sourceDir) + Directory(sourceDir).deleteRecursively } else { throw new java.io.FileNotFoundException(s"Unable to locate test dir $prefix$dirName") } @@ -172,7 +172,7 @@ abstract class CompilerTest extends DottyTest { recCopyFiles(jfile, destDir / jfile.getName) }) compileDir(DPConfig.testRoot + JFile.separator, testName, args, xerrors) - deleteDir(destDir.jfile) + destDir.deleteRecursively } } @@ -186,14 +186,14 @@ abstract class CompilerTest extends DottyTest { } // In particular, don't copy flags from scalac tests - private val extensionsToCopy = scala.collection.immutable.HashSet("scala", "java", "check") + private val extensionsToCopy = scala.collection.immutable.HashSet("scala", "java") /** Determines what kind of test to run. */ private def testKind(prefixDir: String, xerrors: Int, runTest: Boolean) = { if (runTest) "run" else if (xerrors > 0) "neg" else if (prefixDir.endsWith("run" + JFile.separator)) { - log("WARNING: test is being run as pos test despite being in a run directory. " + + log("WARNING: test is being run as pos test despite being in a run directory. " + "Use runFile/runDir instead of compileFile/compileDir to do a run test") "pos" } else "pos" @@ -239,10 +239,12 @@ abstract class CompilerTest extends DottyTest { if (nerr != "0") dest.changeExtension("nerr").createFile(true).writeAll(nerr) sourceFile.changeExtension("check").ifFile({ check => - if (kind == "run") + if (kind == "run") { FileManager.copyFile(check.jfile, dest.changeExtension("check").jfile) - else + dest.changeExtension("checksrc").createFile(true).writeAll("check file generated from source:\n" + check.toString) + } else { log(s"WARNING: ignoring $check for test kind $kind") + } }) } @@ -253,7 +255,12 @@ abstract class CompilerTest extends DottyTest { processFileDir(sourceFile, { sf => if (extensionsToCopy.contains(sf.extension)) { dest.parent.jfile.mkdirs - FileManager.copyFile(sourceFile.jfile, dest.jfile) + dest.toFile.writeAll("/* ==========================================\n", + " * ========= AUTOMATICALLY GENERATED ========\n", + " * ========= DO NOT EDIT THIS FILE ==========\n", + " * ==========================================\n", + " * Original: " + sf.toString + " */\n\n", + sf.slurp()) } else { log(s"WARNING: ignoring $sf") } @@ -326,14 +333,6 @@ abstract class CompilerTest extends DottyTest { destDir.jfile } - /** Recursively deletes directories (and files). */ - private def deleteDir(dir: JFile): Unit = { - val children = dir.listFiles - if (children != null) - children.foreach(deleteDir(_)) - dir.delete - } - /** Write either to console (JUnit) or log file (partest). */ private def log(msg: String) = logFile.map(_.appendAll(msg + "\n")).getOrElse(println(msg)) }