updated ant and cli tests

10 files changed, 80 insertions, 18 deletions

diff --git a/test/files/ant/fsc-build.xml b/test/files/ant/fsc-build.xml
index 5941ae8568..a3b3d2cb0d 100644
--- a/test/files/ant/fsc-build.xml
+++ b/test/files/ant/fsc-build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: $ -->
+<!-- $Id$ -->
 
 <project name="fsc" default="run" basedir=".">
 
@@ -15,6 +15,7 @@ BUILD
     <fsc
       srcdir="${source.dir}"
       includes="**/${ant.project.name}*.scala"
+      deprecation="yes" unchecked="yes"
       destdir="${build.dir}"
       classpathref="build.classpath"
     />
diff --git a/test/files/ant/imported.xml b/test/files/ant/imported.xml
index 1bb2318a8f..f728a00e97 100644
--- a/test/files/ant/imported.xml
+++ b/test/files/ant/imported.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: $ -->
+<!-- $Id$ -->
 
 <project name="imported" default="run" basedir=".">
 
diff --git a/test/files/ant/scalac-build.xml b/test/files/ant/scalac-build.xml
index dcbc420800..b727737248 100644
--- a/test/files/ant/scalac-build.xml
+++ b/test/files/ant/scalac-build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- $Id: $ -->
+<!-- $Id$ -->
 
 <project name="scalac" default="run" basedir=".">
 
@@ -15,6 +15,7 @@ BUILD
     <scalac
       srcdir="${source.dir}"
       includes="**/${ant.project.name}*.scala"
+      deprecation="yes" unchecked="yes"
       destdir="${build.dir}"
       classpathref="build.classpath"
     />
diff --git a/test/files/ant/scaladoc-build.xml b/test/files/ant/scaladoc-build.xml
new file mode 100644
index 0000000000..e854af772b
--- /dev/null
+++ b/test/files/ant/scaladoc-build.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: $ -->
+
+<project name="scaladoc" default="run" basedir=".">
+
+  <import file="${basedir}/imported.xml"/>
+
+<!-- ===========================================================================
+BUILD
+============================================================================ -->
+
+  <target name="build" depends="init">
+    <echo level="verbose" message="build.dir=${build.dir}"/>
+    <mkdir dir="${build.dir}"/>
+    <scaladoc
+      srcdir="${source.dir}"
+      includes="**/${ant.project.name}*.scala"
+      deprecation="yes" unchecked="yes"
+      destdir="${build.dir}"
+      classpathref="build.classpath"
+    />
+    <dirname property="log.dir" file="${build.dir}"/>
+    <echo level="verbose" message="log.dir=${log.dir}"/>
+    <replace
+      file="${log.dir}/${ant.project.name}-ant.log"
+      token="${log.dir}"
+      value="[...]/files/ant"
+    />
+  </target>
+
+</project>
+
diff --git a/test/files/ant/scaladoc.check b/test/files/ant/scaladoc.check
new file mode 100644
index 0000000000..a404edce45
--- /dev/null
+++ b/test/files/ant/scaladoc.check
@@ -0,0 +1,13 @@
+Buildfile: [...]/files/ant/scaladoc-build.xml
+
+quick.init:
+
+latest.init:
+
+installed.init:
+
+init:
+
+build:
+    [mkdir] Created dir: [...]/files/ant/scaladoc-ant.obj
+ [scaladoc] Documenting 1 source file to [...]/files/ant/scaladoc-ant.obj
diff --git a/test/files/ant/scaladoc.scala b/test/files/ant/scaladoc.scala
new file mode 100644
index 0000000000..47131daac6
--- /dev/null
+++ b/test/files/ant/scaladoc.scala
@@ -0,0 +1,6 @@
+package test
+
+object Main {
+  def main(args: Array[String]): Unit =
+    Console.println(args.toList)
+}
diff --git a/test/files/cli/test1/Main.check.scalac b/test/files/cli/test1/Main.check.scalac
index a3c0d101fe..22020d918d 100644
--- a/test/files/cli/test1/Main.check.scalac
+++ b/test/files/cli/test1/Main.check.scalac
@@ -1,5 +1,5 @@
-Scala compiler error: bad option: '-dd'
-  Scala compiler -help  gives more information
+scalac error: bad option: '-dd'
+  scalac -help  gives more information
 Usage: scalac <options | source files>
 where possible options include: 
   -doc                            Generate documentation
@@ -17,6 +17,8 @@ where possible options include:
   -documenttitle <documenttitle>  Specify document title of generated HTML documentation
   -target:<target>                Specify which backend to use (jvm-1.5,jvm-1.4,msil,cldc)
   -migrate                        Assist in migrating from Scala version 1.0
+  -o <file>                       Name of the output assembly (only relevant with -target:msil)
+  -r <path>                       List of assemblies referenced by the program (only relevant with -target:msil)
   -debug                          Output debugging messages
   -deprecation                    enable detailed deprecation warnings
   -unchecked                      enable detailed unchecked warnings
@@ -37,12 +39,15 @@ where possible options include:
   -browse:<phase>                 Browse the abstract syntax tree after <phase>
   -stop:<phase>                   Stop after phase <phase>
   -log:<phase>                    Log operations in <phase>
+  -logall                         Log all operations
   -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
+  -XO                             Optimize. implies -Xinline, -Xcloselim and -Xdce
   -Xcloselim                      Perform closure elimination
   -Xdce                           Perform dead code elimination
+  -Xwarndeadcode                  Emit warnings for dead code
   -XbytecodeRead                  Enable bytecode reader.
   -Xdetach                        Perform detaching of remote closures
   -Xshowcls <class>               Show class info
@@ -52,9 +57,7 @@ where possible options include:
   -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
-  -XprintOuterMatches             prints outer-checks caused by pattern matching
 
 one error found
diff --git a/test/files/cli/test1/Main.check.scalaint b/test/files/cli/test1/Main.check.scalaint
index 073d45354e..88345d1874 100644
--- a/test/files/cli/test1/Main.check.scalaint
+++ b/test/files/cli/test1/Main.check.scalaint
@@ -24,7 +24,7 @@ Type in expressions to have them evaluated.
 Type :help for more information.
 
 scala> 1: test 1 passed (1)
-line0: scala.Unit = {}
+unnamed0: scala.Unit = ()
 
 scala> 
 This is an interpreter for Scala.
@@ -32,7 +32,7 @@ Type in expressions to have them evaluated.
 Type :help for more information.
 
 scala> 1: test 2 passed (1)
-line0: scala.Unit = {}
+unnamed0: scala.Unit = ()
 
 scala> 
 This is an interpreter for Scala.
@@ -40,6 +40,6 @@ Type in expressions to have them evaluated.
 Type :help for more information.
 
 scala> 1: test 3 passed (1)
-line0: scala.Unit = {}
+unnamed0: scala.Unit = ()
 
 scala> 
diff --git a/test/files/cli/test2/Main.check.scalac b/test/files/cli/test2/Main.check.scalac
index a3c0d101fe..22020d918d 100644
--- a/test/files/cli/test2/Main.check.scalac
+++ b/test/files/cli/test2/Main.check.scalac
@@ -1,5 +1,5 @@
-Scala compiler error: bad option: '-dd'
-  Scala compiler -help  gives more information
+scalac error: bad option: '-dd'
+  scalac -help  gives more information
 Usage: scalac <options | source files>
 where possible options include: 
   -doc                            Generate documentation
@@ -17,6 +17,8 @@ where possible options include:
   -documenttitle <documenttitle>  Specify document title of generated HTML documentation
   -target:<target>                Specify which backend to use (jvm-1.5,jvm-1.4,msil,cldc)
   -migrate                        Assist in migrating from Scala version 1.0
+  -o <file>                       Name of the output assembly (only relevant with -target:msil)
+  -r <path>                       List of assemblies referenced by the program (only relevant with -target:msil)
   -debug                          Output debugging messages
   -deprecation                    enable detailed deprecation warnings
   -unchecked                      enable detailed unchecked warnings
@@ -37,12 +39,15 @@ where possible options include:
   -browse:<phase>                 Browse the abstract syntax tree after <phase>
   -stop:<phase>                   Stop after phase <phase>
   -log:<phase>                    Log operations in <phase>
+  -logall                         Log all operations
   -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
+  -XO                             Optimize. implies -Xinline, -Xcloselim and -Xdce
   -Xcloselim                      Perform closure elimination
   -Xdce                           Perform dead code elimination
+  -Xwarndeadcode                  Emit warnings for dead code
   -XbytecodeRead                  Enable bytecode reader.
   -Xdetach                        Perform detaching of remote closures
   -Xshowcls <class>               Show class info
@@ -52,9 +57,7 @@ where possible options include:
   -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
-  -XprintOuterMatches             prints outer-checks caused by pattern matching
 
 one error found
diff --git a/test/files/cli/test3/Main.check.scalac b/test/files/cli/test3/Main.check.scalac
index a3c0d101fe..22020d918d 100644
--- a/test/files/cli/test3/Main.check.scalac
+++ b/test/files/cli/test3/Main.check.scalac
@@ -1,5 +1,5 @@
-Scala compiler error: bad option: '-dd'
-  Scala compiler -help  gives more information
+scalac error: bad option: '-dd'
+  scalac -help  gives more information
 Usage: scalac <options | source files>
 where possible options include: 
   -doc                            Generate documentation
@@ -17,6 +17,8 @@ where possible options include:
   -documenttitle <documenttitle>  Specify document title of generated HTML documentation
   -target:<target>                Specify which backend to use (jvm-1.5,jvm-1.4,msil,cldc)
   -migrate                        Assist in migrating from Scala version 1.0
+  -o <file>                       Name of the output assembly (only relevant with -target:msil)
+  -r <path>                       List of assemblies referenced by the program (only relevant with -target:msil)
   -debug                          Output debugging messages
   -deprecation                    enable detailed deprecation warnings
   -unchecked                      enable detailed unchecked warnings
@@ -37,12 +39,15 @@ where possible options include:
   -browse:<phase>                 Browse the abstract syntax tree after <phase>
   -stop:<phase>                   Stop after phase <phase>
   -log:<phase>                    Log operations in <phase>
+  -logall                         Log all operations
   -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
+  -XO                             Optimize. implies -Xinline, -Xcloselim and -Xdce
   -Xcloselim                      Perform closure elimination
   -Xdce                           Perform dead code elimination
+  -Xwarndeadcode                  Emit warnings for dead code
   -XbytecodeRead                  Enable bytecode reader.
   -Xdetach                        Perform detaching of remote closures
   -Xshowcls <class>               Show class info
@@ -52,9 +57,7 @@ where possible options include:
   -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
-  -XprintOuterMatches             prints outer-checks caused by pattern matching
 
 one error found