updated check files for cli tests

12 files changed, 177 insertions, 35 deletions

diff --git a/test/files/cli/test1/Main.check.scala b/test/files/cli/test1/Main.check.scala
index 65d5ddaac4..43b200ae02 100644
--- a/test/files/cli/test1/Main.check.scala
+++ b/test/files/cli/test1/Main.check.scala
@@ -1,14 +1,23 @@
 unknown option: '-cpp'
-scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
 
-<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>:
+
+Option -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
 
+Option -savecompiled requests that the compiled script be saved
+for future use.
+
+Option -nocompdaemon requests that the fsc offline compiler not be used.
+
+Option -Dproperty=value sets a Java system property.
+
 1: test 1 passed (1)
 1: test 2 passed (1)
 1: test 3 passed (1)
diff --git a/test/files/cli/test1/Main.check.scala_api b/test/files/cli/test1/Main.check.scala_api
index 352a278046..6fac39d3f0 100644
--- a/test/files/cli/test1/Main.check.scala_api
+++ b/test/files/cli/test1/Main.check.scala_api
@@ -1,7 +1,28 @@
 |-- all-classes.html
 |-- index.html
 |-- modules.html
+|-- nav-classes.html
 |-- root-content.html
+|-- scala
+|   |-- Any.html
+|   |-- AnyRef.html
+|   |-- AnyVal.html
+|   |-- Boolean.html
+|   |-- Byte.html
+|   |-- Char.html
+|   |-- Double.html
+|   |-- Float.html
+|   |-- Int.html
+|   |-- Long.html
+|   |-- Nothing.html
+|   |-- Null.html
+|   |-- Short.html
+|   |-- Unit.html
+|   `-- runtime
+|       |-- BoxedFloat.html
+|       |-- BoxedInt.html
+|       |-- BoxedLong.html
+|       `-- BoxedNumber.html
 |-- script.js
 |-- style.css
 |-- test1
@@ -9,4 +30,4 @@
 |-- test1$content.html
 `-- test1$package.html
 
-1 directory, 9 files
+3 directories, 28 files
diff --git a/test/files/cli/test1/Main.check.scalac b/test/files/cli/test1/Main.check.scalac
index c1ef09b436..e90c2c5d03 100644
--- a/test/files/cli/test1/Main.check.scalac
+++ b/test/files/cli/test1/Main.check.scalac
@@ -1,9 +1,9 @@
-Scala compiler error: unknown option: '-dd'
+Scala compiler error: bad option: '-dd'
   Scala compiler -help  gives more information
 Usage: scalac <options | source files>
 where possible options include: 
   -doc                            Generate documentation
-  -g                              Generate debugging info
+  -g:<g>                          Generate debugging info (none,source,line,vars,notc)
   -nowarn                         Generate no warnings
   -noassert                       Generate no assertions and assumptions
   -verbose                        Output messages about what the compiler is doing
@@ -18,6 +18,8 @@ where possible options include:
   -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
+  -deprecation                    enable detailed deprecation warnings
+  -unchecked                      enable detailed unchecked warnings
   -statistics                     Print compiler statistics
   -explaintypes                   Explain type errors in more detail
   -resident                       Compiler stays resident, files to compile are read from standard input
@@ -37,14 +39,21 @@ where possible options include:
   -log:<phase>                    Log operations in <phase>
   -version                        Print product version and exit
   -help                           Print a synopsis of standard options
+  -nouescape                      disables handling of \u unicode escapes
   -Xinline                        Perform inlining when possible
   -Xcloselim                      Perform closure elimination
   -Xdce                           Perform dead code elimination
+  -XbytecodeRead                  Enable bytecode reader.
+  -Xdetach                        Perform detaching of remote closures
   -Xshowcls <class>               Show class info
   -Xshowobj <object>              Show object info
-  -Xshowicode                     Print the generated ICode
-  -Xgadt                          enable gadt for classes
   -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
   -Xgenerics                      Use generic Java types
+  -Xprintpos                      Print tree positions (as offsets)
+  -Xscript                        compile script file
+  -Xexperimental                  enable experimental extensions
+  -Xunapply                       enable unapply pattern matching
+  -Xplugtypes                     parse but ignore annotations in more locations
+  -Xkilloption                    optimizes option types
 
 one error found
diff --git a/test/files/cli/test1/Main.check.scalaint b/test/files/cli/test1/Main.check.scalaint
index 78ddab22d7..03dcae101b 100644
--- a/test/files/cli/test1/Main.check.scalaint
+++ b/test/files/cli/test1/Main.check.scalaint
@@ -1,14 +1,23 @@
 unknown option: '-cpp'
-scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
 
-<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>:
+
+Option -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
 
+Option -savecompiled requests that the compiled script be saved
+for future use.
+
+Option -nocompdaemon requests that the fsc offline compiler not be used.
+
+Option -Dproperty=value sets a Java system property.
+
 
 This is an interpreter for Scala.
 Type in expressions to have them evaluated.
diff --git a/test/files/cli/test2/Main.check.scala b/test/files/cli/test2/Main.check.scala
index 80cbb50fa9..7e5f17625b 100644
--- a/test/files/cli/test2/Main.check.scala
+++ b/test/files/cli/test2/Main.check.scala
@@ -1,14 +1,23 @@
 unknown option: '-cpp'
-scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
 
-<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>:
+
+Option -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
 
+Option -savecompiled requests that the compiled script be saved
+for future use.
+
+Option -nocompdaemon requests that the fsc offline compiler not be used.
+
+Option -Dproperty=value sets a Java system property.
+
 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.scala_api b/test/files/cli/test2/Main.check.scala_api
index 1df1a7fb32..bcb0f0c7fb 100644
--- a/test/files/cli/test2/Main.check.scala_api
+++ b/test/files/cli/test2/Main.check.scala_api
@@ -1,7 +1,28 @@
 |-- all-classes.html
 |-- index.html
 |-- modules.html
+|-- nav-classes.html
 |-- root-content.html
+|-- scala
+|   |-- Any.html
+|   |-- AnyRef.html
+|   |-- AnyVal.html
+|   |-- Boolean.html
+|   |-- Byte.html
+|   |-- Char.html
+|   |-- Double.html
+|   |-- Float.html
+|   |-- Int.html
+|   |-- Long.html
+|   |-- Nothing.html
+|   |-- Null.html
+|   |-- Short.html
+|   |-- Unit.html
+|   `-- runtime
+|       |-- BoxedFloat.html
+|       |-- BoxedInt.html
+|       |-- BoxedLong.html
+|       `-- BoxedNumber.html
 |-- script.js
 |-- style.css
 |-- test1
@@ -13,5 +34,4 @@
 |-- test2$content.html
 `-- test2$package.html
 
-
-2 directories, 12 files
+4 directories, 31 files
diff --git a/test/files/cli/test2/Main.check.scalac b/test/files/cli/test2/Main.check.scalac
index c1ef09b436..e90c2c5d03 100644
--- a/test/files/cli/test2/Main.check.scalac
+++ b/test/files/cli/test2/Main.check.scalac
@@ -1,9 +1,9 @@
-Scala compiler error: unknown option: '-dd'
+Scala compiler error: bad option: '-dd'
   Scala compiler -help  gives more information
 Usage: scalac <options | source files>
 where possible options include: 
   -doc                            Generate documentation
-  -g                              Generate debugging info
+  -g:<g>                          Generate debugging info (none,source,line,vars,notc)
   -nowarn                         Generate no warnings
   -noassert                       Generate no assertions and assumptions
   -verbose                        Output messages about what the compiler is doing
@@ -18,6 +18,8 @@ where possible options include:
   -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
+  -deprecation                    enable detailed deprecation warnings
+  -unchecked                      enable detailed unchecked warnings
   -statistics                     Print compiler statistics
   -explaintypes                   Explain type errors in more detail
   -resident                       Compiler stays resident, files to compile are read from standard input
@@ -37,14 +39,21 @@ where possible options include:
   -log:<phase>                    Log operations in <phase>
   -version                        Print product version and exit
   -help                           Print a synopsis of standard options
+  -nouescape                      disables handling of \u unicode escapes
   -Xinline                        Perform inlining when possible
   -Xcloselim                      Perform closure elimination
   -Xdce                           Perform dead code elimination
+  -XbytecodeRead                  Enable bytecode reader.
+  -Xdetach                        Perform detaching of remote closures
   -Xshowcls <class>               Show class info
   -Xshowobj <object>              Show object info
-  -Xshowicode                     Print the generated ICode
-  -Xgadt                          enable gadt for classes
   -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
   -Xgenerics                      Use generic Java types
+  -Xprintpos                      Print tree positions (as offsets)
+  -Xscript                        compile script file
+  -Xexperimental                  enable experimental extensions
+  -Xunapply                       enable unapply pattern matching
+  -Xplugtypes                     parse but ignore annotations in more locations
+  -Xkilloption                    optimizes option types
 
 one error found
diff --git a/test/files/cli/test2/Main.check.scalaint b/test/files/cli/test2/Main.check.scalaint
index e01f2b77ee..94b353e5b9 100644
--- a/test/files/cli/test2/Main.check.scalaint
+++ b/test/files/cli/test2/Main.check.scalaint
@@ -1,14 +1,23 @@
 unknown option: '-cpp'
-scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
 
-<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>:
+
+Option -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
 
+Option -savecompiled requests that the compiled script be saved
+for future use.
+
+Option -nocompdaemon requests that the fsc offline compiler not be used.
+
+Option -Dproperty=value sets a Java system property.
+
 
 This is an interpreter for Scala.
 Type in expressions to have them evaluated.
diff --git a/test/files/cli/test3/Main.check.scala b/test/files/cli/test3/Main.check.scala
index 3804c17636..f78729b9a2 100644
--- a/test/files/cli/test3/Main.check.scala
+++ b/test/files/cli/test3/Main.check.scala
@@ -1,14 +1,23 @@
 unknown option: '-cpp'
-scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
 
-<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>:
+
+Option -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
 
+Option -savecompiled requests that the compiled script be saved
+for future use.
+
+Option -nocompdaemon requests that the fsc offline compiler not be used.
+
+Option -Dproperty=value sets a Java system property.
+
 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.scala_api b/test/files/cli/test3/Main.check.scala_api
index e65cebac24..4552819b5b 100644
--- a/test/files/cli/test3/Main.check.scala_api
+++ b/test/files/cli/test3/Main.check.scala_api
@@ -1,7 +1,28 @@
 |-- all-classes.html
 |-- index.html
 |-- modules.html
+|-- nav-classes.html
 |-- root-content.html
+|-- scala
+|   |-- Any.html
+|   |-- AnyRef.html
+|   |-- AnyVal.html
+|   |-- Boolean.html
+|   |-- Byte.html
+|   |-- Char.html
+|   |-- Double.html
+|   |-- Float.html
+|   |-- Int.html
+|   |-- Long.html
+|   |-- Nothing.html
+|   |-- Null.html
+|   |-- Short.html
+|   |-- Unit.html
+|   `-- runtime
+|       |-- BoxedFloat.html
+|       |-- BoxedInt.html
+|       |-- BoxedLong.html
+|       `-- BoxedNumber.html
 |-- script.js
 |-- style.css
 |-- test1
@@ -17,5 +38,4 @@
 |-- test3$content.html
 `-- test3$package.html
 
-
-3 directories, 15 files
+5 directories, 34 files
diff --git a/test/files/cli/test3/Main.check.scalac b/test/files/cli/test3/Main.check.scalac
index c1ef09b436..e90c2c5d03 100644
--- a/test/files/cli/test3/Main.check.scalac
+++ b/test/files/cli/test3/Main.check.scalac
@@ -1,9 +1,9 @@
-Scala compiler error: unknown option: '-dd'
+Scala compiler error: bad option: '-dd'
   Scala compiler -help  gives more information
 Usage: scalac <options | source files>
 where possible options include: 
   -doc                            Generate documentation
-  -g                              Generate debugging info
+  -g:<g>                          Generate debugging info (none,source,line,vars,notc)
   -nowarn                         Generate no warnings
   -noassert                       Generate no assertions and assumptions
   -verbose                        Output messages about what the compiler is doing
@@ -18,6 +18,8 @@ where possible options include:
   -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
+  -deprecation                    enable detailed deprecation warnings
+  -unchecked                      enable detailed unchecked warnings
   -statistics                     Print compiler statistics
   -explaintypes                   Explain type errors in more detail
   -resident                       Compiler stays resident, files to compile are read from standard input
@@ -37,14 +39,21 @@ where possible options include:
   -log:<phase>                    Log operations in <phase>
   -version                        Print product version and exit
   -help                           Print a synopsis of standard options
+  -nouescape                      disables handling of \u unicode escapes
   -Xinline                        Perform inlining when possible
   -Xcloselim                      Perform closure elimination
   -Xdce                           Perform dead code elimination
+  -XbytecodeRead                  Enable bytecode reader.
+  -Xdetach                        Perform detaching of remote closures
   -Xshowcls <class>               Show class info
   -Xshowobj <object>              Show object info
-  -Xshowicode                     Print the generated ICode
-  -Xgadt                          enable gadt for classes
   -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
   -Xgenerics                      Use generic Java types
+  -Xprintpos                      Print tree positions (as offsets)
+  -Xscript                        compile script file
+  -Xexperimental                  enable experimental extensions
+  -Xunapply                       enable unapply pattern matching
+  -Xplugtypes                     parse but ignore annotations in more locations
+  -Xkilloption                    optimizes option types
 
 one error found
diff --git a/test/files/cli/test3/Main.check.scalaint b/test/files/cli/test3/Main.check.scalaint
index 7beaa665ae..4343b29a09 100644
--- a/test/files/cli/test3/Main.check.scalaint
+++ b/test/files/cli/test3/Main.check.scalaint
@@ -1,14 +1,23 @@
 unknown option: '-cpp'
-scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
 
-<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>:
+
+Option -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
 
+Option -savecompiled requests that the compiled script be saved
+for future use.
+
+Option -nocompdaemon requests that the fsc offline compiler not be used.
+
+Option -Dproperty=value sets a Java system property.
+
 
 This is an interpreter for Scala.
 Type in expressions to have them evaluated.