aboutsummaryrefslogtreecommitdiff
path: root/compiler/test/dotty/tools/dotc/CompilerTest.scala
diff options
context:
space:
mode:
authorNicolas Stucki <nicolas.stucki@gmail.com>2017-01-03 11:19:11 +0100
committerNicolas Stucki <nicolas.stucki@gmail.com>2017-01-03 14:16:20 +0100
commit25d4f8e348bd4bacf9c69c4dd173ff99a0121b8d (patch)
tree521a34d715a33f1f29020d9400141ff5729fc6d6 /compiler/test/dotty/tools/dotc/CompilerTest.scala
parent3247bf40f0d481dc5030526f129198da637ccb87 (diff)
downloaddotty-25d4f8e348bd4bacf9c69c4dd173ff99a0121b8d.tar.gz
dotty-25d4f8e348bd4bacf9c69c4dd173ff99a0121b8d.tar.bz2
dotty-25d4f8e348bd4bacf9c69c4dd173ff99a0121b8d.zip
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`).
Diffstat (limited to 'compiler/test/dotty/tools/dotc/CompilerTest.scala')
-rw-r--r--compiler/test/dotty/tools/dotc/CompilerTest.scala5
1 files changed, 3 insertions, 2 deletions
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