diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-05-23 16:56:41 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-05-23 16:56:41 +0200 |
| commit | 9a703b4a654ce990397d254b0031e366096afcf5 (patch) | |
| tree | fa4b9c55eea958ed557fb82d380b7c1a61d8556b /test/files | |
| parent | f640fa0a6d01270b4c16238073c154bf0e71b559 (diff) | |
| parent | 7f514bba9ff1993ccbfdcf4a37a8045849f1647a (diff) | |
| download | scala-9a703b4a654ce990397d254b0031e366096afcf5.tar.gz scala-9a703b4a654ce990397d254b0031e366096afcf5.tar.bz2 scala-9a703b4a654ce990397d254b0031e366096afcf5.zip | |
Merge pull request #5169 from som-snytt/issue/4625
SI-4625 Recognize App in script
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/run/t4625.check | 1 | ||||
| -rw-r--r-- | test/files/run/t4625.scala | 7 | ||||
| -rw-r--r-- | test/files/run/t4625.script | 5 | ||||
| -rw-r--r-- | test/files/run/t4625b.check | 1 | ||||
| -rw-r--r-- | test/files/run/t4625b.scala | 7 | ||||
| -rw-r--r-- | test/files/run/t4625b.script | 8 | ||||
| -rw-r--r-- | test/files/run/t4625c.check | 3 | ||||
| -rw-r--r-- | test/files/run/t4625c.scala | 7 | ||||
| -rw-r--r-- | test/files/run/t4625c.script | 7 |
9 files changed, 46 insertions, 0 deletions
diff --git a/test/files/run/t4625.check b/test/files/run/t4625.check new file mode 100644 index 0000000000..e4a4d15b87 --- /dev/null +++ b/test/files/run/t4625.check @@ -0,0 +1 @@ +Test ran. diff --git a/test/files/run/t4625.scala b/test/files/run/t4625.scala new file mode 100644 index 0000000000..44f6225220 --- /dev/null +++ b/test/files/run/t4625.scala @@ -0,0 +1,7 @@ + +import scala.tools.partest.ScriptTest + +object Test extends ScriptTest { + // must be called Main to get probing treatment in parser + override def testmain = "Main" +} diff --git a/test/files/run/t4625.script b/test/files/run/t4625.script new file mode 100644 index 0000000000..600ceacbb6 --- /dev/null +++ b/test/files/run/t4625.script @@ -0,0 +1,5 @@ + +object Main extends Runnable with App { + def run() = println("Test ran.") + run() +} diff --git a/test/files/run/t4625b.check b/test/files/run/t4625b.check new file mode 100644 index 0000000000..e79539a5c4 --- /dev/null +++ b/test/files/run/t4625b.check @@ -0,0 +1 @@ +Misc top-level detritus diff --git a/test/files/run/t4625b.scala b/test/files/run/t4625b.scala new file mode 100644 index 0000000000..44f6225220 --- /dev/null +++ b/test/files/run/t4625b.scala @@ -0,0 +1,7 @@ + +import scala.tools.partest.ScriptTest + +object Test extends ScriptTest { + // must be called Main to get probing treatment in parser + override def testmain = "Main" +} diff --git a/test/files/run/t4625b.script b/test/files/run/t4625b.script new file mode 100644 index 0000000000..f21a553dd1 --- /dev/null +++ b/test/files/run/t4625b.script @@ -0,0 +1,8 @@ + +trait X { def x = "Misc top-level detritus" } + +object Bumpkus + +object Main extends X with App { + println(x) +} diff --git a/test/files/run/t4625c.check b/test/files/run/t4625c.check new file mode 100644 index 0000000000..6acb1710b9 --- /dev/null +++ b/test/files/run/t4625c.check @@ -0,0 +1,3 @@ +newSource1.scala:2: warning: Script has a main object but statement is disallowed +val x = "value x" + ^ diff --git a/test/files/run/t4625c.scala b/test/files/run/t4625c.scala new file mode 100644 index 0000000000..44f6225220 --- /dev/null +++ b/test/files/run/t4625c.scala @@ -0,0 +1,7 @@ + +import scala.tools.partest.ScriptTest + +object Test extends ScriptTest { + // must be called Main to get probing treatment in parser + override def testmain = "Main" +} diff --git a/test/files/run/t4625c.script b/test/files/run/t4625c.script new file mode 100644 index 0000000000..16159208e0 --- /dev/null +++ b/test/files/run/t4625c.script @@ -0,0 +1,7 @@ + +val x = "value x" +val y = "value y" + +object Main extends App { + println(s"Test ran with $x.") +} |