aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDmitry Petrashko <dmitry.petrashko@gmail.com>2015-03-18 11:24:15 +0100
committerDmitry Petrashko <dmitry.petrashko@gmail.com>2015-03-18 11:24:27 +0100
commit0afbd6ce7356ff08f5d27379c71d2e759fb9602f (patch)
treef80ff14dabb3567a28f5f170451332053e000572 /test
parent8a991550c4da0a8e837f254580e4936f7d666af3 (diff)
downloaddotty-0afbd6ce7356ff08f5d27379c71d2e759fb9602f.tar.gz
dotty-0afbd6ce7356ff08f5d27379c71d2e759fb9602f.tar.bz2
dotty-0afbd6ce7356ff08f5d27379c71d2e759fb9602f.zip
Fixing conflicts between #361 and #394
Diffstat (limited to 'test')
-rw-r--r--test/dotc/tests.scala1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index 9e50dd3b5..2a1ef08ee 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -27,7 +27,6 @@ class tests extends CompilerTest {
val failedOther = List("-Ystop-before:collectEntryPoints") // some non-obvious reason. need to look deeper
val twice = List("#runs", "2", "-YnoDoubleBindings")
val staleSymbolError: List[String] = List()
- val testPickling = List("-Ytest-pickler", "-Ystop-after:pickler")
val allowDeepSubtypes = defaultOptions diff List("-Yno-deep-subtypes")