summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-06-19 11:52:21 +0000
committermichelou <michelou@epfl.ch>2006-06-19 11:52:21 +0000
commit68159e91ab11e631005d4ba399e8e30269b69cac (patch)
treea5274e6acdd1315e4385e2e01766a1514c6da234 /test
parentadab52e289e243f984578fc8c1d404041eeb5ba4 (diff)
downloadscala-68159e91ab11e631005d4ba399e8e30269b69cac.tar.gz
scala-68159e91ab11e631005d4ba399e8e30269b69cac.tar.bz2
scala-68159e91ab11e631005d4ba399e8e30269b69cac.zip
updated check files for clitest
Diffstat (limited to 'test')
-rw-r--r--test/files/cli/test1/Main.check.scala13
-rw-r--r--test/files/cli/test1/Main.check.scalac1
-rw-r--r--test/files/cli/test1/Main.check.scalaint1
-rw-r--r--test/files/cli/test2/Main.check.scala13
-rw-r--r--test/files/cli/test2/Main.check.scalac1
-rw-r--r--test/files/cli/test2/Main.check.scalaint1
-rw-r--r--test/files/cli/test3/Main.check.scala13
-rw-r--r--test/files/cli/test3/Main.check.scalac1
-rw-r--r--test/files/cli/test3/Main.check.scalaint1
9 files changed, 39 insertions, 6 deletions
diff --git a/test/files/cli/test1/Main.check.scala b/test/files/cli/test1/Main.check.scala
index 64410de98f..65d5ddaac4 100644
--- a/test/files/cli/test1/Main.check.scala
+++ b/test/files/cli/test1/Main.check.scala
@@ -1,5 +1,14 @@
-Unrecognized option: -cpp
-Could not create the Java virtual machine.
+unknown option: '-cpp'
+scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
+
+<compiler-option>'s are as for scalac; see scalac -help.
+<torun>, if present, is an object or script file to run.
+If no <torun> is present, run an interactive interpreter.
+-howtorun allows explicitly specifying how to run <torun>:
+ script: it is a script file
+ object: it is an object name
+ guess: (the default) try to guess
+
1: test 1 passed (1)
1: test 2 passed (1)
1: test 3 passed (1)
diff --git a/test/files/cli/test1/Main.check.scalac b/test/files/cli/test1/Main.check.scalac
index 099f5ad579..347d69a5bd 100644
--- a/test/files/cli/test1/Main.check.scalac
+++ b/test/files/cli/test1/Main.check.scalac
@@ -39,6 +39,7 @@ where possible options include:
-help Print a synopsis of standard options
-Xinline Perform inlining when possible
-Xcloselim Perform closure elimination
+ -Xdce Perform dead code 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 7340d0988f..dfbecc873a 100644
--- a/test/files/cli/test1/Main.check.scalaint
+++ b/test/files/cli/test1/Main.check.scalaint
@@ -38,6 +38,7 @@ where possible options include:
-help Print a synopsis of standard options
-Xinline Perform inlining when possible
-Xcloselim Perform closure elimination
+ -Xdce Perform dead code 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.scala b/test/files/cli/test2/Main.check.scala
index aca383de3e..80cbb50fa9 100644
--- a/test/files/cli/test2/Main.check.scala
+++ b/test/files/cli/test2/Main.check.scala
@@ -1,5 +1,14 @@
-Unrecognized option: -cpp
-Could not create the Java virtual machine.
+unknown option: '-cpp'
+scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
+
+<compiler-option>'s are as for scalac; see scalac -help.
+<torun>, if present, is an object or script file to run.
+If no <torun> is present, run an interactive interpreter.
+-howtorun allows explicitly specifying how to run <torun>:
+ script: it is a script file
+ object: it is an object name
+ guess: (the default) try to guess
+
2: 1: test 1 passed (1)
2: 1: test 2 passed (1)
2: 1: test 3 passed (1)
diff --git a/test/files/cli/test2/Main.check.scalac b/test/files/cli/test2/Main.check.scalac
index 099f5ad579..347d69a5bd 100644
--- a/test/files/cli/test2/Main.check.scalac
+++ b/test/files/cli/test2/Main.check.scalac
@@ -39,6 +39,7 @@ where possible options include:
-help Print a synopsis of standard options
-Xinline Perform inlining when possible
-Xcloselim Perform closure elimination
+ -Xdce Perform dead code 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 ff5d6cda12..5e8bba8f28 100644
--- a/test/files/cli/test2/Main.check.scalaint
+++ b/test/files/cli/test2/Main.check.scalaint
@@ -38,6 +38,7 @@ where possible options include:
-help Print a synopsis of standard options
-Xinline Perform inlining when possible
-Xcloselim Perform closure elimination
+ -Xdce Perform dead code elimination
-Xshowcls <class> Show class info
-Xshowobj <object> Show object info
-Xshowicode Print the generated ICode
diff --git a/test/files/cli/test3/Main.check.scala b/test/files/cli/test3/Main.check.scala
index de3eb7b136..3804c17636 100644
--- a/test/files/cli/test3/Main.check.scala
+++ b/test/files/cli/test3/Main.check.scala
@@ -1,5 +1,14 @@
-Unrecognized option: -cpp
-Could not create the Java virtual machine.
+unknown option: '-cpp'
+scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
+
+<compiler-option>'s are as for scalac; see scalac -help.
+<torun>, if present, is an object or script file to run.
+If no <torun> is present, run an interactive interpreter.
+-howtorun allows explicitly specifying how to run <torun>:
+ script: it is a script file
+ object: it is an object name
+ guess: (the default) try to guess
+
3: 1: test 1 passed (1)
3: 2: 1: test 1 passed (1)
3: 1: test 2 passed (1)
diff --git a/test/files/cli/test3/Main.check.scalac b/test/files/cli/test3/Main.check.scalac
index 099f5ad579..347d69a5bd 100644
--- a/test/files/cli/test3/Main.check.scalac
+++ b/test/files/cli/test3/Main.check.scalac
@@ -39,6 +39,7 @@ where possible options include:
-help Print a synopsis of standard options
-Xinline Perform inlining when possible
-Xcloselim Perform closure elimination
+ -Xdce Perform dead code elimination
-Xshowcls <class> Show class info
-Xshowobj <object> Show object info
-Xshowicode Print the generated ICode
diff --git a/test/files/cli/test3/Main.check.scalaint b/test/files/cli/test3/Main.check.scalaint
index 2de27b074f..6d75140c16 100644
--- a/test/files/cli/test3/Main.check.scalaint
+++ b/test/files/cli/test3/Main.check.scalaint
@@ -38,6 +38,7 @@ where possible options include:
-help Print a synopsis of standard options
-Xinline Perform inlining when possible
-Xcloselim Perform closure elimination
+ -Xdce Perform dead code elimination
-Xshowcls <class> Show class info
-Xshowobj <object> Show object info
-Xshowicode Print the generated ICode