summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-05-09 17:21:33 +0200
committerJason Zaugg <jzaugg@gmail.com>2014-05-09 17:21:33 +0200
commitaf6941fbcf6f4f4efeb372a9a937463ff630b81c (patch)
treec22b180d0fea992cd3af2d67b5d65f2328a9283b
parent6f33b2418a56ea7b945ec101c5fbe4b904d467df (diff)
parentbdb1258d2ab8ff10d8e9f4924069a227ae82e690 (diff)
downloadscala-af6941fbcf6f4f4efeb372a9a937463ff630b81c.tar.gz
scala-af6941fbcf6f4f4efeb372a9a937463ff630b81c.tar.bz2
scala-af6941fbcf6f4f4efeb372a9a937463ff630b81c.zip
Merge pull request #3732 from retronym/revert/5905
Revert "SI-5905 Clarify test case"
-rw-r--r--test/files/run/t5905-features.flags1
-rw-r--r--test/files/run/t5905-features.scala8
2 files changed, 4 insertions, 5 deletions
diff --git a/test/files/run/t5905-features.flags b/test/files/run/t5905-features.flags
new file mode 100644
index 0000000000..ad51758c39
--- /dev/null
+++ b/test/files/run/t5905-features.flags
@@ -0,0 +1 @@
+-nowarn
diff --git a/test/files/run/t5905-features.scala b/test/files/run/t5905-features.scala
index 547a521cb5..a3848eef2a 100644
--- a/test/files/run/t5905-features.scala
+++ b/test/files/run/t5905-features.scala
@@ -3,13 +3,13 @@ import tools.partest.DirectTest
// verify that all languageFeature names are accepted by -language
object Test extends DirectTest {
- override def code = "class Code { def f = (1 to 10) size }" // exercise a feature to sanity-check coverage of -language options
+ override def code = "class Code { def f = (1 to 10) size }" // exercise a feature
override def extraSettings = s"-usejavacp -d ${testOutput.path}"
override def show() = {
- val global = newCompiler("-Ystop-after:typer")
- compileString(global)("") // warm me up, scotty
+ val global = newCompiler("-language:postfixOps", "-Ystop-after:typer")
+ compileString(global)(code)
import global._
exitingTyper {
//def isFeature(s: Symbol) = s.annotations.exists((a: AnnotationInfo) => a.tpe <:< typeOf[scala.annotation.meta.languageFeature])
@@ -21,8 +21,6 @@ object Test extends DirectTest {
assert(feats.nonEmpty, "Test must find feature flags.")
- //compile("junk") // tragically, does not fail the test
-
//dynamics,postfixOps,reflectiveCalls,implicitConversions,higherKinds,existentials,experimental.macros
compile(s"-language:$all")
}