Skip to content

Commit 49376d3

Browse files
committed
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`).
1 parent 39c27b6 commit 49376d3

File tree

4 files changed

+24
-7
lines changed

4 files changed

+24
-7
lines changed

compiler/test/dotc/scala-collections.blacklist

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,20 @@
6464
# |illegal redefinition of standard class AnyVal
6565
# (This is intended)
6666

67+
../scala-scala/src/library/scala/collection/parallel/Tasks.scala
68+
# java.lang.StackOverflowError
69+
70+
../scala-scala/src/library/scala/reflect/package.scala
71+
# 63 | private[scala] def materializeClassTag[T](): ClassTag[T] = macro ???
72+
# | ^^^^^
73+
# | not found: macro
74+
75+
../scala-scala/src/library/scala/StringContext.scala
76+
# 168 | def f[A >: Any](args: A*): String = macro ???
77+
# | ^^^^^
78+
# | not found: macro
79+
80+
../scala-scala/src/library/scala/util/control/Exception.scala
81+
# 51 | implicit def throwableSubtypeToCatcher[Ex <: Throwable: ClassTag, T](pf: PartialFunction[Ex, T]) =
82+
# | ^
83+
# | cyclic reference involving method mkCatcher

compiler/test/dotc/scala-collections.whitelist

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
../scala-scala/src/library/scala/Serializable.scala
6565
../scala-scala/src/library/scala/Specializable.scala
6666
../scala-scala/src/library/scala/Symbol.scala
67-
../scala-scala/src/library/scala/StringContext.scala
67+
#../scala-scala/src/library/scala/StringContext.scala
6868
../scala-scala/src/library/scala/UninitializedError.scala
6969
../scala-scala/src/library/scala/UninitializedFieldError.scala
7070
../scala-scala/src/library/scala/collection/IndexedSeqOptimized.scala
@@ -293,7 +293,7 @@
293293

294294
../scala-scala/src/library/scala/util/Try.scala
295295

296-
../scala-scala/src/library/scala/util/control/Exception.scala
296+
#../scala-scala/src/library/scala/util/control/Exception.scala
297297
../scala-scala/src/library/scala/util/control/Breaks.scala
298298
../scala-scala/src/library/scala/util/control/ControlThrowable.scala
299299
../scala-scala/src/library/scala/util/control/NonFatal.scala
@@ -445,7 +445,7 @@
445445
../scala-scala/src/library/scala/reflect/NoManifest.scala
446446
../scala-scala/src/library/scala/reflect/OptManifest.scala
447447
../scala-scala/src/library/scala/reflect/NameTransformer.scala
448-
../scala-scala/src/library/scala/reflect/package.scala
448+
#../scala-scala/src/library/scala/reflect/package.scala
449449

450450
../scala-scala/src/library/scala/Responder.scala
451451

@@ -508,7 +508,7 @@
508508
../scala-scala/src/library/scala/collection/parallel/PreciseSplitter.scala
509509
../scala-scala/src/library/scala/collection/parallel/Splitter.scala
510510
../scala-scala/src/library/scala/collection/parallel/TaskSupport.scala
511-
../scala-scala/src/library/scala/collection/parallel/Tasks.scala
511+
#../scala-scala/src/library/scala/collection/parallel/Tasks.scala
512512

513513
../scala-scala/src/library/scala/Console.scala
514514
../scala-scala/src/library/scala/Enumeration.scala

compiler/test/dotc/tests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ class tests extends CompilerTest {
245245
}
246246

247247

248-
@Test def compileStdLib = compileList("compileStdLib", stdlibFiles, "-migration" :: "-Yno-inline" :: scala2mode)
248+
@Test def compileStdLib = compileList("compileStdLib", stdlibFiles.map(_.replace("../scala-scala/src/library/", "")), "-migration" :: "-Yno-inline" :: scala2mode, Directory("../scala-scala/src/library/"))
249249
@Test def compileMixed = compileLine(
250250
"""../tests/pos/B.scala
251251
|../scala-scala/src/library/scala/collection/immutable/Seq.scala

compiler/test/dotty/tools/dotc/CompilerTest.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ abstract class CompilerTest {
220220
compileFiles(path, args, verbose, true)
221221

222222
/** Compiles the given list of code files. */
223-
def compileList(testName: String, files: List[String], args: List[String] = Nil)
223+
def compileList(testName: String, files: List[String], args: List[String] = Nil, sourceDir: Directory = Directory("."))
224224
(implicit defaultOptions: List[String]): Unit = {
225225
if (!generatePartestFiles || !partestableList(testName, files, args ++ defaultOptions)) {
226226
val expErrors = expectedErrors(files)
@@ -229,7 +229,7 @@ abstract class CompilerTest {
229229
val destDir = Directory(DPConfig.testRoot + JFile.separator + testName)
230230
files.foreach({ file =>
231231
val jfile = new JFile(file)
232-
recCopyFiles(jfile, destDir / jfile.getName)
232+
recCopyFiles(sourceDir / jfile, destDir / jfile)
233233
})
234234
compileDir(DPConfig.testRoot + JFile.separator, testName, args)
235235
destDir.deleteRecursively

0 commit comments

Comments
 (0)