From a15bdaf0068688f0d64edea72b55b46cce52789a Mon Sep 17 00:00:00 2001
From: Nicolas Stucki <nicolas.stucki@gmail.com>
Date: Wed, 14 Dec 2016 18:24:06 +0100
Subject: Whitelist sources from scala/

---
 compiler/test/dotc/scala-collections.blacklist | 51 ++++++--------------------
 compiler/test/dotc/scala-collections.whitelist | 28 ++++++++++++++
 2 files changed, 40 insertions(+), 39 deletions(-)

(limited to 'compiler')

diff --git a/compiler/test/dotc/scala-collections.blacklist b/compiler/test/dotc/scala-collections.blacklist
index a24556689..2085228b2 100644
--- a/compiler/test/dotc/scala-collections.blacklist
+++ b/compiler/test/dotc/scala-collections.blacklist
@@ -1,7 +1,10 @@
 ../scala-scala/src/library/scala/annotation/unchecked/uncheckedVariance.scala
 
 ../scala-scala/src/library/scala/AnyVal.scala
-../scala-scala/src/library/scala/App.scala
+# 55 |abstract class AnyVal extends Any {
+#    |^
+#    |illegal redefinition of standard class AnyVal
+
 
 ../scala-scala/src/library/scala/collection/convert/Wrappers.scala
 # 34 |    def remove() = throw new UnsupportedOperationException
@@ -137,10 +140,15 @@
 ../scala-scala/src/library/scala/concurrent/package.scala
 # assertion failed
 
-
-../scala-scala/src/library/scala/Function.scala
-../scala-scala/src/library/scala/Function0.scala
 ../scala-scala/src/library/scala/Function1.scala
+../scala-scala/src/library/scala/Function2.scala
+../scala-scala/src/library/scala/Function3.scala
+../scala-scala/src/library/scala/Function4.scala
+../scala-scala/src/library/scala/Function5.scala
+../scala-scala/src/library/scala/Function6.scala
+../scala-scala/src/library/scala/Function7.scala
+../scala-scala/src/library/scala/Function8.scala
+../scala-scala/src/library/scala/Function9.scala
 ../scala-scala/src/library/scala/Function10.scala
 ../scala-scala/src/library/scala/Function11.scala
 ../scala-scala/src/library/scala/Function12.scala
@@ -151,17 +159,9 @@
 ../scala-scala/src/library/scala/Function17.scala
 ../scala-scala/src/library/scala/Function18.scala
 ../scala-scala/src/library/scala/Function19.scala
-../scala-scala/src/library/scala/Function2.scala
 ../scala-scala/src/library/scala/Function20.scala
 ../scala-scala/src/library/scala/Function21.scala
 ../scala-scala/src/library/scala/Function22.scala
-../scala-scala/src/library/scala/Function3.scala
-../scala-scala/src/library/scala/Function4.scala
-../scala-scala/src/library/scala/Function5.scala
-../scala-scala/src/library/scala/Function6.scala
-../scala-scala/src/library/scala/Function7.scala
-../scala-scala/src/library/scala/Function8.scala
-../scala-scala/src/library/scala/Function9.scala
 
 ../scala-scala/src/library/scala/io/BufferedSource.scala
 # 38 |  override lazy val iter = (
@@ -222,33 +222,6 @@
 
 ../scala-scala/src/library/scala/text/Document.scala
 
-../scala-scala/src/library/scala/Tuple1.scala
-# 19 |case class Tuple1[@specialized(Int, Long, Double) +T1](_1: T1)
-#    |                                                       ^
-#    |                                                       value _1 is already defined as method _1: => T1
-
-../scala-scala/src/library/scala/Tuple10.scala
-../scala-scala/src/library/scala/Tuple11.scala
-../scala-scala/src/library/scala/Tuple12.scala
-../scala-scala/src/library/scala/Tuple13.scala
-../scala-scala/src/library/scala/Tuple14.scala
-../scala-scala/src/library/scala/Tuple15.scala
-../scala-scala/src/library/scala/Tuple16.scala
-../scala-scala/src/library/scala/Tuple17.scala
-../scala-scala/src/library/scala/Tuple18.scala
-../scala-scala/src/library/scala/Tuple19.scala
-../scala-scala/src/library/scala/Tuple2.scala
-../scala-scala/src/library/scala/Tuple20.scala
-../scala-scala/src/library/scala/Tuple21.scala
-../scala-scala/src/library/scala/Tuple22.scala
-../scala-scala/src/library/scala/Tuple3.scala
-../scala-scala/src/library/scala/Tuple4.scala
-../scala-scala/src/library/scala/Tuple5.scala
-../scala-scala/src/library/scala/Tuple6.scala
-../scala-scala/src/library/scala/Tuple7.scala
-../scala-scala/src/library/scala/Tuple8.scala
-../scala-scala/src/library/scala/Tuple9.scala
-
 ../scala-scala/src/library/scala/util/control/Exception.scala
 # scala.MatchError: PostfixOp(Select(Ident(pf),isDefinedAt),_) (of class dotty.tools.dotc.ast.untpd$PostfixOp)
 #      at dotty.tools.dotc.ast.Trees$Instance$TreeAccumulator.foldOver(Trees.scala:1173)
diff --git a/compiler/test/dotc/scala-collections.whitelist b/compiler/test/dotc/scala-collections.whitelist
index 19872554d..51c2990a2 100644
--- a/compiler/test/dotc/scala-collections.whitelist
+++ b/compiler/test/dotc/scala-collections.whitelist
@@ -538,3 +538,31 @@
 ../scala-scala/src/library/scala/runtime/SeqCharSequence.scala
 ../scala-scala/src/library/scala/runtime/StringAdd.scala
 ../scala-scala/src/library/scala/runtime/StringFormat.scala
+
+../scala-scala/src/library/scala/App.scala
+
+../scala-scala/src/library/scala/Function.scala
+../scala-scala/src/library/scala/Function0.scala
+
+../scala-scala/src/library/scala/Tuple1.scala
+../scala-scala/src/library/scala/Tuple2.scala
+../scala-scala/src/library/scala/Tuple3.scala
+../scala-scala/src/library/scala/Tuple4.scala
+../scala-scala/src/library/scala/Tuple5.scala
+../scala-scala/src/library/scala/Tuple6.scala
+../scala-scala/src/library/scala/Tuple7.scala
+../scala-scala/src/library/scala/Tuple8.scala
+../scala-scala/src/library/scala/Tuple9.scala
+../scala-scala/src/library/scala/Tuple10.scala
+../scala-scala/src/library/scala/Tuple11.scala
+../scala-scala/src/library/scala/Tuple12.scala
+../scala-scala/src/library/scala/Tuple13.scala
+../scala-scala/src/library/scala/Tuple14.scala
+../scala-scala/src/library/scala/Tuple15.scala
+../scala-scala/src/library/scala/Tuple16.scala
+../scala-scala/src/library/scala/Tuple17.scala
+../scala-scala/src/library/scala/Tuple18.scala
+../scala-scala/src/library/scala/Tuple19.scala
+../scala-scala/src/library/scala/Tuple20.scala
+../scala-scala/src/library/scala/Tuple21.scala
+../scala-scala/src/library/scala/Tuple22.scala
-- 
cgit v1.2.3