From 25d4f8e348bd4bacf9c69c4dd173ff99a0121b8d Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 3 Jan 2017 11:19:11 +0100 Subject: Fix test pos/compileStdLib The issue was that all the files stdlib files where copied in partest-generated/pos/compileStdLib direclty (i.e. directories flattend). This implies that files with the same names would overwrite eachother (like `package.scala` and `Set.scala`). --- compiler/test/dotty/tools/dotc/CompilerTest.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'compiler/test/dotty/tools/dotc/CompilerTest.scala') diff --git a/compiler/test/dotty/tools/dotc/CompilerTest.scala b/compiler/test/dotty/tools/dotc/CompilerTest.scala index 5192ec84c..eaa0bea84 100644 --- a/compiler/test/dotty/tools/dotc/CompilerTest.scala +++ b/compiler/test/dotty/tools/dotc/CompilerTest.scala @@ -228,8 +228,9 @@ abstract class CompilerTest { } else { val destDir = Directory(DPConfig.testRoot + JFile.separator + testName) files.foreach({ file => - val jfile = new JFile(file) - recCopyFiles(jfile, destDir / jfile.getName) + val sourceFile = new JFile(file) + val destFile = destDir / (if (file.startsWith("../")) file.substring(3) else file) + recCopyFiles(sourceFile, destFile) }) compileDir(DPConfig.testRoot + JFile.separator, testName, args) destDir.deleteRecursively -- cgit v1.2.3