diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2016-10-06 11:40:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-06 11:40:30 +0200 |
commit | a3064622e7ce4d73ddd91de0fc6bebfe0ec23ae9 (patch) | |
tree | 9085c715a63a324088c28ddc25828315d7cb1358 /test/dotc/tests.scala | |
parent | 93d4c8c945540d5df7ee9e8541abcf112439bb1e (diff) | |
parent | 46b325373c8ec516be2b6b1c6024ae1c783fbc8f (diff) | |
download | dotty-a3064622e7ce4d73ddd91de0fc6bebfe0ec23ae9.tar.gz dotty-a3064622e7ce4d73ddd91de0fc6bebfe0ec23ae9.tar.bz2 dotty-a3064622e7ce4d73ddd91de0fc6bebfe0ec23ae9.zip |
Merge pull request #1494 from martijnhoekstra/wintests
[WIP] fix encoding issues
Diffstat (limited to 'test/dotc/tests.scala')
-rw-r--r-- | test/dotc/tests.scala | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 9f95a30c1..c4d8085f5 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -23,8 +23,7 @@ class tests extends CompilerTest { val defaultOutputDir = "./out/" implicit val defaultOptions = noCheckOptions ++ List( - "-Yno-deep-subtypes", "-Yno-double-bindings", "-Yforce-sbt-phases", - "-d", defaultOutputDir) ++ { + "-Yno-deep-subtypes", "-Yno-double-bindings", "-Yforce-sbt-phases", "-d", defaultOutputDir) ++ { if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725 else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") } @@ -38,6 +37,9 @@ class tests extends CompilerTest { val allowDoubleBindings = defaultOptions diff List("-Yno-double-bindings") val scala2mode = List("-language:Scala2") + val explicitUTF8 = List("-encoding", "UTF8") + val explicitUTF16 = List("-encoding", "UTF16") + val testsDir = "./tests/" val posDir = testsDir + "pos/" val posSpecialDir = testsDir + "pos-special/" @@ -95,7 +97,7 @@ class tests extends CompilerTest { @Test def pos_overloadedAccess = compileFile(posDir, "overloadedAccess", twice) @Test def pos_approximateUnion = compileFile(posDir, "approximateUnion", twice) @Test def pos_tailcall = compileDir(posDir, "tailcall", twice) - @Test def pos_valueclasses = compileFiles(posDir + "valueclasses/", twice) + @Test def pos_valueclasses = compileFiles(posDir + "pos_valueclasses/", twice) @Test def pos_nullarify = compileFile(posDir, "nullarify", args = "-Ycheck:nullarify" :: Nil) @Test def pos_subtyping = compileFile(posDir, "subtyping", twice) @Test def pos_packageObj = compileFile(posDir, "i0239", twice) @@ -118,6 +120,8 @@ class tests extends CompilerTest { compileFile(posSpecialDir, "spec-t5545/S_1") compileFile(posSpecialDir, "spec-t5545/S_2") } + @Test def pos_utf8 = compileFile(posSpecialDir, "utf8encoded", explicitUTF8) + @Test def pos_utf16 = compileFile(posSpecialDir, "utf16encoded", explicitUTF16) @Test def new_all = compileFiles(newDir, twice) @Test def repl_all = replFiles(replDir) |