diff options
author | michelou <michelou@epfl.ch> | 2006-05-09 14:59:37 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-05-09 14:59:37 +0000 |
commit | 960380abbfd6b4986915247198f6c8b3576362cb (patch) | |
tree | 124cc8572a568794ef3f9e038422a8ae3d933afa /test/files/cli/test1 | |
parent | 3379165fc10883211f6de9ed6ea89b5424c4bf86 (diff) | |
download | scala-960380abbfd6b4986915247198f6c8b3576362cb.tar.gz scala-960380abbfd6b4986915247198f6c8b3576362cb.tar.bz2 scala-960380abbfd6b4986915247198f6c8b3576362cb.zip |
fixed error in file templates/generic-unix.tmpl
added corresponding test in script file test/clitest
Diffstat (limited to 'test/files/cli/test1')
-rw-r--r-- | test/files/cli/test1/Main.check.java5 | 7 | ||||
-rw-r--r-- | test/files/cli/test1/Main.check.scala | 7 | ||||
-rw-r--r-- | test/files/cli/test1/Main.check.scalac | 3 | ||||
-rw-r--r-- | test/files/cli/test1/Main.check.scalaint | 7 | ||||
-rw-r--r-- | test/files/cli/test1/Main.java | 2 | ||||
-rw-r--r-- | test/files/cli/test1/Main.scala | 2 |
6 files changed, 16 insertions, 12 deletions
diff --git a/test/files/cli/test1/Main.check.java5 b/test/files/cli/test1/Main.check.java5 index 12cf928e58..64410de98f 100644 --- a/test/files/cli/test1/Main.check.java5 +++ b/test/files/cli/test1/Main.check.java5 @@ -1,5 +1,6 @@ Unrecognized option: -cpp Could not create the Java virtual machine. -1: test 1 passed -1: test 2 passed -1: test 3 passed +1: test 1 passed (1) +1: test 2 passed (1) +1: test 3 passed (1) +1: test 4 passed (2) diff --git a/test/files/cli/test1/Main.check.scala b/test/files/cli/test1/Main.check.scala index 12cf928e58..64410de98f 100644 --- a/test/files/cli/test1/Main.check.scala +++ b/test/files/cli/test1/Main.check.scala @@ -1,5 +1,6 @@ Unrecognized option: -cpp Could not create the Java virtual machine. -1: test 1 passed -1: test 2 passed -1: test 3 passed +1: test 1 passed (1) +1: test 2 passed (1) +1: test 3 passed (1) +1: test 4 passed (2) diff --git a/test/files/cli/test1/Main.check.scalac b/test/files/cli/test1/Main.check.scalac index 3f3244da74..099f5ad579 100644 --- a/test/files/cli/test1/Main.check.scalac +++ b/test/files/cli/test1/Main.check.scalac @@ -15,7 +15,7 @@ where possible options include: -encoding <encoding> Specify character encoding used by source files -windowtitle <windowtitle> Specify window title of generated HTML documentation -documenttitle <documenttitle> Specify document title of generated HTML documentation - -target:<target> Specify which backend to use (jvm,msil) + -target:<target> Specify which backend to use (jvm-1.5,jvm-1.4,msil,cldc) -migrate Assist in migrating from Scala version 1.0 -debug Output debugging messages -statistics Print compiler statistics @@ -38,6 +38,7 @@ where possible options include: -version Print product version and exit -help Print a synopsis of standard options -Xinline Perform inlining when possible + -Xcloselim Perform closure elimination -Xshowcls <class> Show class info -Xshowobj <object> Show object info -Xshowicode Print the generated ICode diff --git a/test/files/cli/test1/Main.check.scalaint b/test/files/cli/test1/Main.check.scalaint index f19606ede5..7340d0988f 100644 --- a/test/files/cli/test1/Main.check.scalaint +++ b/test/files/cli/test1/Main.check.scalaint @@ -14,7 +14,7 @@ where possible options include: -encoding <encoding> Specify character encoding used by source files -windowtitle <windowtitle> Specify window title of generated HTML documentation -documenttitle <documenttitle> Specify document title of generated HTML documentation - -target:<target> Specify which backend to use (jvm,msil) + -target:<target> Specify which backend to use (jvm-1.5,jvm-1.4,msil,cldc) -migrate Assist in migrating from Scala version 1.0 -debug Output debugging messages -statistics Print compiler statistics @@ -37,6 +37,7 @@ where possible options include: -version Print product version and exit -help Print a synopsis of standard options -Xinline Perform inlining when possible + -Xcloselim Perform closure elimination -Xshowcls <class> Show class info -Xshowobj <object> Show object info -Xshowicode Print the generated ICode @@ -65,7 +66,7 @@ Type :load followed by a filename to load a sequence of interpreter commands. Type :replay to reset execution and replay all previous commands. Type :help to repeat this message later. -scala> 1: test 2 passed +scala> 1: test 2 passed (1) line0: scala.Unit = () scala> @@ -77,7 +78,7 @@ Type :load followed by a filename to load a sequence of interpreter commands. Type :replay to reset execution and replay all previous commands. Type :help to repeat this message later. -scala> 1: test 3 passed +scala> 1: test 3 passed (1) line0: scala.Unit = () scala> diff --git a/test/files/cli/test1/Main.java b/test/files/cli/test1/Main.java index 14e94cb4c5..8850b87517 100644 --- a/test/files/cli/test1/Main.java +++ b/test/files/cli/test1/Main.java @@ -3,6 +3,6 @@ package test1; public class Main { public static void main(String args[]) { String arg = (args.length > 0) ? args[0] : "?"; - System.out.println("1: test " + arg + " passed"); + System.out.println("1: test " + arg + " passed (" + args.length + ")"); } } diff --git a/test/files/cli/test1/Main.scala b/test/files/cli/test1/Main.scala index 8a4da2d0ab..f7dd8a0a36 100644 --- a/test/files/cli/test1/Main.scala +++ b/test/files/cli/test1/Main.scala @@ -3,6 +3,6 @@ package test1 object Main { def main(args: Array[String]) = { val arg = if (args != null && args.length > 0) args(0) else "?" - Console.println("1: test " + arg + " passed") + Console.println("1: test " + arg + " passed (" + args.length + ")") } } |