aboutsummaryrefslogtreecommitdiff
path: root/test/dotc/tests.scala
diff options
context:
space:
mode:
authorodersky <odersky@gmail.com>2014-11-26 09:25:40 +0100
committerodersky <odersky@gmail.com>2014-11-26 09:25:40 +0100
commit5733684a4ec6857ece1048d56654dcd749163510 (patch)
treedfa3b78fe47141bf145f6b9fe4664cbe2e8513e5 /test/dotc/tests.scala
parent779afd2f65f967ec5af1ac5ec7464ad5851852ad (diff)
parenta2884d5338e139fb2ff795b3d08947df58f9b953 (diff)
downloaddotty-5733684a4ec6857ece1048d56654dcd749163510.tar.gz
dotty-5733684a4ec6857ece1048d56654dcd749163510.tar.bz2
dotty-5733684a4ec6857ece1048d56654dcd749163510.zip
Merge pull request #238 from dotty-staging/fix/bounds-propagation-v2
Fix/bounds propagation v2
Diffstat (limited to 'test/dotc/tests.scala')
-rw-r--r--test/dotc/tests.scala9
1 files changed, 4 insertions, 5 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala
index f4aa074de..1c437e833 100644
--- a/test/dotc/tests.scala
+++ b/test/dotc/tests.scala
@@ -68,7 +68,7 @@ class tests extends CompilerTest {
@Test def neg_typedapply() = compileFile(negDir, "typedapply", xerrors = 4)
@Test def neg_typedidents() = compileFile(negDir, "typedIdents", xerrors = 2)
@Test def neg_assignments() = compileFile(negDir, "assignments", xerrors = 3)
- @Test def neg_typers() = compileFile(negDir, "typers", xerrors = 13)
+ @Test def neg_typers() = compileFile(negDir, "typers", xerrors = 12)
@Test def neg_privates() = compileFile(negDir, "privates", xerrors = 2)
@Test def neg_rootImports = compileFile(negDir, "rootImplicits", xerrors = 2)
@Test def neg_templateParents() = compileFile(negDir, "templateParents", xerrors = 3)
@@ -95,9 +95,7 @@ class tests extends CompilerTest {
@Test def neg_tailcall = compileFile(negDir, "tailcall/tailrec", xerrors = 7)
@Test def neg_tailcall2 = compileFile(negDir, "tailcall/tailrec-2", xerrors = 2)
@Test def neg_tailcall3 = compileFile(negDir, "tailcall/tailrec-3", xerrors = 2)
- @Test def neg_t1048 = compileFile(negDir, "t1048", xerrors = 1)
@Test def nef_t1279a = compileFile(negDir, "t1279a", xerrors = 1)
- @Test def neg_t1843 = compileFile(negDir, "t1843", xerrors = 1)
@Test def neg_t1843_variances = compileFile(negDir, "t1843-variances", xerrors = 1)
@Test def neg_t2660_ambi = compileFile(negDir, "t2660", xerrors = 2)
@Test def neg_t2994 = compileFile(negDir, "t2994", xerrors = 2)
@@ -106,14 +104,15 @@ class tests extends CompilerTest {
@Test def neg_badAuxConstr = compileFile(negDir, "badAuxConstr", xerrors = 2)
@Test def neg_typetest = compileFile(negDir, "typetest", xerrors = 1)
@Test def neg_t1569_failedAvoid = compileFile(negDir, "t1569-failedAvoid", xerrors = 1)
- @Test def neg_cycles = compileFile(negDir, "cycles", xerrors = 6)
+ @Test def neg_cycles = compileFile(negDir, "cycles", xerrors = 8)
+ @Test def neg_boundspropagation = compileFile(negDir, "boundspropagation", xerrors = 4)
@Test def dotc = compileDir(dotcDir + "tools/dotc", twice)(allowDeepSubtypes)
@Test def dotc_ast = compileDir(dotcDir + "tools/dotc/ast", twice)
@Test def dotc_config = compileDir(dotcDir + "tools/dotc/config", twice)
@Test def dotc_core = compileDir(dotcDir + "tools/dotc/core", twice)(allowDeepSubtypes)
@Test def dotc_core_pickling = compileDir(dotcDir + "tools/dotc/core/pickling", twice)(allowDeepSubtypes)
- // @Test def dotc_transform = compileDir(dotcDir + "tools/dotc/transform", twice)
+ // @Test def dotc_transform = compileDir(dotcDir + "tools/dotc/transform", twice)(allowDeepSubtypes)
// @odersky causes race error in ResolveSuper
@Test def dotc_parsing = compileDir(dotcDir + "tools/dotc/parsing", twice)