summaryrefslogtreecommitdiff
path: root/test/files/cli/test2
diff options
context:
space:
mode:
Diffstat (limited to 'test/files/cli/test2')
-rw-r--r--test/files/cli/test2/Main.check.java57
-rw-r--r--test/files/cli/test2/Main.check.scala7
-rw-r--r--test/files/cli/test2/Main.check.scalac3
-rw-r--r--test/files/cli/test2/Main.check.scalaint9
4 files changed, 15 insertions, 11 deletions
diff --git a/test/files/cli/test2/Main.check.java5 b/test/files/cli/test2/Main.check.java5
index 8929b20b08..aca383de3e 100644
--- a/test/files/cli/test2/Main.check.java5
+++ b/test/files/cli/test2/Main.check.java5
@@ -1,5 +1,6 @@
Unrecognized option: -cpp
Could not create the Java virtual machine.
-2: 1: test 1 passed
-2: 1: test 2 passed
-2: 1: test 3 passed
+2: 1: test 1 passed (1)
+2: 1: test 2 passed (1)
+2: 1: test 3 passed (1)
+2: 1: test 4 passed (2)
diff --git a/test/files/cli/test2/Main.check.scala b/test/files/cli/test2/Main.check.scala
index 8929b20b08..aca383de3e 100644
--- a/test/files/cli/test2/Main.check.scala
+++ b/test/files/cli/test2/Main.check.scala
@@ -1,5 +1,6 @@
Unrecognized option: -cpp
Could not create the Java virtual machine.
-2: 1: test 1 passed
-2: 1: test 2 passed
-2: 1: test 3 passed
+2: 1: test 1 passed (1)
+2: 1: test 2 passed (1)
+2: 1: test 3 passed (1)
+2: 1: test 4 passed (2)
diff --git a/test/files/cli/test2/Main.check.scalac b/test/files/cli/test2/Main.check.scalac
index 3f3244da74..099f5ad579 100644
--- a/test/files/cli/test2/Main.check.scalac
+++ b/test/files/cli/test2/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/test2/Main.check.scalaint b/test/files/cli/test2/Main.check.scalaint
index 69bc170c4c..ff5d6cda12 100644
--- a/test/files/cli/test2/Main.check.scalaint
+++ b/test/files/cli/test2/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
@@ -53,7 +54,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> 2: 1: test 1 passed
+scala> 2: 1: test 1 passed (1)
line0: scala.Unit = ()
scala>
@@ -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> 2: 1: test 2 passed
+scala> 2: 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> 2: 1: test 3 passed
+scala> 2: 1: test 3 passed (1)
line0: scala.Unit = ()
scala>