added more functionality to test/clitest

corrected bug in file scala/concurrent/pilib.scala

21 files changed, 629 insertions, 0 deletions

diff --git a/test/files/cli/test1/Main.check.javac b/test/files/cli/test1/Main.check.javac
new file mode 100644
index 0000000000..ba25d9b6ca
--- /dev/null
+++ b/test/files/cli/test1/Main.check.javac
@@ -0,0 +1,19 @@
+javac: invalid flag: -dd
+Usage: javac <options> <source files>
+where possible options include:
+  -g                        Generate all debugging info
+  -g:none                   Generate no debugging info
+  -g:{lines,vars,source}    Generate only some debugging info
+  -nowarn                   Generate no warnings
+  -verbose                  Output messages about what the compiler is doing
+  -deprecation              Output source locations where deprecated APIs are used
+  -classpath <path>         Specify where to find user class files
+  -sourcepath <path>        Specify where to find input source files
+  -bootclasspath <path>     Override location of bootstrap class files
+  -extdirs <dirs>           Override location of installed extensions
+  -d <directory>            Specify where to place generated class files
+  -encoding <encoding>      Specify character encoding used by source files
+  -source <release>         Provide source compatibility with specified release
+  -target <release>         Generate class files for specific VM version
+  -help                     Print a synopsis of standard options
+
diff --git a/test/files/cli/test1/Main.check.javac5 b/test/files/cli/test1/Main.check.javac5
new file mode 100644
index 0000000000..0cb29d31ff
--- /dev/null
+++ b/test/files/cli/test1/Main.check.javac5
@@ -0,0 +1,24 @@
+javac: invalid flag: -dd
+Usage: javac <options> <source files>
+where possible options include:
+  -g                         Generate all debugging info
+  -g:none                    Generate no debugging info
+  -g:{lines,vars,source}     Generate only some debugging info
+  -nowarn                    Generate no warnings
+  -verbose                   Output messages about what the compiler is doing
+  -deprecation               Output source locations where deprecated APIs are used
+  -classpath <path>          Specify where to find user class files
+  -cp <path>                 Specify where to find user class files
+  -sourcepath <path>         Specify where to find input source files
+  -bootclasspath <path>      Override location of bootstrap class files
+  -extdirs <dirs>            Override location of installed extensions
+  -endorseddirs <dirs>       Override location of endorsed standards path
+  -d <directory>             Specify where to place generated class files
+  -encoding <encoding>       Specify character encoding used by source files
+  -source <release>          Provide source compatibility with specified release
+  -target <release>          Generate class files for specific VM version
+  -version                   Version information
+  -help                      Print a synopsis of standard options
+  -X                         Print a synopsis of nonstandard options
+  -J<flag>                   Pass <flag> directly to the runtime system
+
diff --git a/test/files/cli/test1/Main.check.scala b/test/files/cli/test1/Main.check.scala
new file mode 100644
index 0000000000..12cf928e58
--- /dev/null
+++ b/test/files/cli/test1/Main.check.scala
@@ -0,0 +1,5 @@
+Unrecognized option: -cpp
+Could not create the Java virtual machine.
+1: test 1 passed
+1: test 2 passed
+1: test 3 passed
diff --git a/test/files/cli/test1/Main.check.scalac b/test/files/cli/test1/Main.check.scalac
new file mode 100644
index 0000000000..42ef754181
--- /dev/null
+++ b/test/files/cli/test1/Main.check.scalac
@@ -0,0 +1,46 @@
+scalac error: unknown option: '-dd'
+  scalac -help  gives more information
+Usage: scalac <options | source files>
+where possible options include: 
+  -doc                        Generate documentation
+  -g                          Generate debugging info
+  -nowarn                     Generate no warnings
+  -noassert                   Generate no assertions and assumptions
+  -verbose                    Output messages about what the compiler is doing
+  -classpath <path>           Specify where to find user class files
+  -sourcepath <path>          Specify where to find input source files
+  -bootclasspath <path>       Override location of bootstrap class files
+  -extdirs <dirs>             Override location of installed extensions
+  -d <directory>              Specify where to place generated class files
+  -encoding <encoding>        Specify character encoding used by source files
+  -target:<target>            Specify which backend to use (jvm,msil)
+  -migrate                    Assist in migrating from Scala version 1.0
+  -debug                      Output debugging messages
+  -statistics                 Print compiler statistics
+  -explaintypes               Explain type errors in more detail
+  -resident                   Compiler stays resident, files to compile are read from standard input
+  -uniqid                     Print identifiers with unique names (debugging option)
+  -printtypes                 Print tree types (debugging option)
+  -prompt                     Display a prompt after each error (debugging option)
+  -noimports                  Compile without any implicit imports
+  -nopredefs                  Compile without any implicit predefined values
+  -skip:<phase>               Skip <phase>
+  -check:<phase>              Check the tree at start of <phase>
+  -print:<phase>              Print out program after <phase>
+  -printer:<printer>          Printer to use (text,html)
+  -printfile <file>           Specify file in which to print trees
+  -graph:<phase>              Graph the program after <phase>
+  -browse:<phase>             Browse the abstract syntax tree after <phase>
+  -stop:<phase>               Stop after phase <phase>
+  -log:<phase>                Log operations in <phase>
+  -version                    Print product version and exit
+  -help                       Print a synopsis of standard options
+  -Xinline                    Perform inlining when possible
+  -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)
+  -Xgenerics                  Use generic Java types
+
+one error found
diff --git a/test/files/cli/test1/Main.check.scalaint b/test/files/cli/test1/Main.check.scalaint
new file mode 100644
index 0000000000..99224cae31
--- /dev/null
+++ b/test/files/cli/test1/Main.check.scalaint
@@ -0,0 +1,81 @@
+scalaint: unknown option: '-cpp'
+Usage: scalaint <options | source files>
+where possible options include: 
+  -doc                        Generate documentation
+  -g                          Generate debugging info
+  -nowarn                     Generate no warnings
+  -noassert                   Generate no assertions and assumptions
+  -verbose                    Output messages about what the compiler is doing
+  -classpath <path>           Specify where to find user class files
+  -sourcepath <path>          Specify where to find input source files
+  -bootclasspath <path>       Override location of bootstrap class files
+  -extdirs <dirs>             Override location of installed extensions
+  -d <directory>              Specify where to place generated class files
+  -encoding <encoding>        Specify character encoding used by source files
+  -target:<target>            Specify which backend to use (jvm,msil)
+  -migrate                    Assist in migrating from Scala version 1.0
+  -debug                      Output debugging messages
+  -statistics                 Print compiler statistics
+  -explaintypes               Explain type errors in more detail
+  -resident                   Compiler stays resident, files to compile are read from standard input
+  -uniqid                     Print identifiers with unique names (debugging option)
+  -printtypes                 Print tree types (debugging option)
+  -prompt                     Display a prompt after each error (debugging option)
+  -noimports                  Compile without any implicit imports
+  -nopredefs                  Compile without any implicit predefined values
+  -skip:<phase>               Skip <phase>
+  -check:<phase>              Check the tree at start of <phase>
+  -print:<phase>              Print out program after <phase>
+  -printer:<printer>          Printer to use (text,html)
+  -printfile <file>           Specify file in which to print trees
+  -graph:<phase>              Graph the program after <phase>
+  -browse:<phase>             Browse the abstract syntax tree after <phase>
+  -stop:<phase>               Stop after phase <phase>
+  -log:<phase>                Log operations in <phase>
+  -version                    Print product version and exit
+  -help                       Print a synopsis of standard options
+  -Xinline                    Perform inlining when possible
+  -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)
+  -Xgenerics                  Use generic Java types
+
+
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :quit to exit the interpreter.
+Type :compile followed by a filename to compile a complete Scala file.
+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 1 passed
+line0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :quit to exit the interpreter.
+Type :compile followed by a filename to compile a complete Scala file.
+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
+line0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :quit to exit the interpreter.
+Type :compile followed by a filename to compile a complete Scala file.
+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
+line0: scala.Unit = ()
+
+scala> 
diff --git a/test/files/cli/test1/Main.java b/test/files/cli/test1/Main.java
new file mode 100644
index 0000000000..11d50255dd
--- /dev/null
+++ b/test/files/cli/test1/Main.java
@@ -0,0 +1,7 @@
+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");
+  }
+}
diff --git a/test/files/cli/test1/Main.scala b/test/files/cli/test1/Main.scala
new file mode 100644
index 0000000000..9958d6a54c
--- /dev/null
+++ b/test/files/cli/test1/Main.scala
@@ -0,0 +1,7 @@
+package test1
+object Main {
+  def main(args: Array[String]) = {
+    val arg = if (args.length > 0) args(0) else "?"
+    Console.println("1: test " + arg + " passed")
+  }
+}
diff --git a/test/files/cli/test2/Main.check.javac b/test/files/cli/test2/Main.check.javac
new file mode 100644
index 0000000000..c25714eabb
--- /dev/null
+++ b/test/files/cli/test2/Main.check.javac
@@ -0,0 +1,27 @@
+javac: invalid flag: -dd
+Usage: javac <options> <source files>
+where possible options include:
+  -g                        Generate all debugging info
+  -g:none                   Generate no debugging info
+  -g:{lines,vars,source}    Generate only some debugging info
+  -nowarn                   Generate no warnings
+  -verbose                  Output messages about what the compiler is doing
+  -deprecation              Output source locations where deprecated APIs are used
+  -classpath <path>         Specify where to find user class files
+  -sourcepath <path>        Specify where to find input source files
+  -bootclasspath <path>     Override location of bootstrap class files
+  -extdirs <dirs>           Override location of installed extensions
+  -d <directory>            Specify where to place generated class files
+  -encoding <encoding>      Specify character encoding used by source files
+  -source <release>         Provide source compatibility with specified release
+  -target <release>         Generate class files for specific VM version
+  -help                     Print a synopsis of standard options
+
+files/cli/test2/Main.java:5: package test1 does not exist
+    test1.Main.main(args);
+         ^
+1 error
+files/cli/test2/Main.java:5: package test1 does not exist
+    test1.Main.main(args);
+         ^
+1 error
diff --git a/test/files/cli/test2/Main.check.javac5 b/test/files/cli/test2/Main.check.javac5
new file mode 100644
index 0000000000..d20df8ffe7
--- /dev/null
+++ b/test/files/cli/test2/Main.check.javac5
@@ -0,0 +1,32 @@
+javac: invalid flag: -dd
+Usage: javac <options> <source files>
+where possible options include:
+  -g                         Generate all debugging info
+  -g:none                    Generate no debugging info
+  -g:{lines,vars,source}     Generate only some debugging info
+  -nowarn                    Generate no warnings
+  -verbose                   Output messages about what the compiler is doing
+  -deprecation               Output source locations where deprecated APIs are used
+  -classpath <path>          Specify where to find user class files
+  -cp <path>                 Specify where to find user class files
+  -sourcepath <path>         Specify where to find input source files
+  -bootclasspath <path>      Override location of bootstrap class files
+  -extdirs <dirs>            Override location of installed extensions
+  -endorseddirs <dirs>       Override location of endorsed standards path
+  -d <directory>             Specify where to place generated class files
+  -encoding <encoding>       Specify character encoding used by source files
+  -source <release>          Provide source compatibility with specified release
+  -target <release>          Generate class files for specific VM version
+  -version                   Version information
+  -help                      Print a synopsis of standard options
+  -X                         Print a synopsis of nonstandard options
+  -J<flag>                   Pass <flag> directly to the runtime system
+
+files/cli/test2/Main.java:5: package test1 does not exist
+    test1.Main.main(args);
+         ^
+1 error
+files/cli/test2/Main.java:5: package test1 does not exist
+    test1.Main.main(args);
+         ^
+1 error
diff --git a/test/files/cli/test2/Main.check.scala b/test/files/cli/test2/Main.check.scala
new file mode 100644
index 0000000000..8929b20b08
--- /dev/null
+++ b/test/files/cli/test2/Main.check.scala
@@ -0,0 +1,5 @@
+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
diff --git a/test/files/cli/test2/Main.check.scalac b/test/files/cli/test2/Main.check.scalac
new file mode 100644
index 0000000000..2cf40d5de8
--- /dev/null
+++ b/test/files/cli/test2/Main.check.scalac
@@ -0,0 +1,50 @@
+scalac error: unknown option: '-dd'
+  scalac -help  gives more information
+Usage: scalac <options | source files>
+where possible options include: 
+  -doc                        Generate documentation
+  -g                          Generate debugging info
+  -nowarn                     Generate no warnings
+  -noassert                   Generate no assertions and assumptions
+  -verbose                    Output messages about what the compiler is doing
+  -classpath <path>           Specify where to find user class files
+  -sourcepath <path>          Specify where to find input source files
+  -bootclasspath <path>       Override location of bootstrap class files
+  -extdirs <dirs>             Override location of installed extensions
+  -d <directory>              Specify where to place generated class files
+  -encoding <encoding>        Specify character encoding used by source files
+  -target:<target>            Specify which backend to use (jvm,msil)
+  -migrate                    Assist in migrating from Scala version 1.0
+  -debug                      Output debugging messages
+  -statistics                 Print compiler statistics
+  -explaintypes               Explain type errors in more detail
+  -resident                   Compiler stays resident, files to compile are read from standard input
+  -uniqid                     Print identifiers with unique names (debugging option)
+  -printtypes                 Print tree types (debugging option)
+  -prompt                     Display a prompt after each error (debugging option)
+  -noimports                  Compile without any implicit imports
+  -nopredefs                  Compile without any implicit predefined values
+  -skip:<phase>               Skip <phase>
+  -check:<phase>              Check the tree at start of <phase>
+  -print:<phase>              Print out program after <phase>
+  -printer:<printer>          Printer to use (text,html)
+  -printfile <file>           Specify file in which to print trees
+  -graph:<phase>              Graph the program after <phase>
+  -browse:<phase>             Browse the abstract syntax tree after <phase>
+  -stop:<phase>               Stop after phase <phase>
+  -log:<phase>                Log operations in <phase>
+  -version                    Print product version and exit
+  -help                       Print a synopsis of standard options
+  -Xinline                    Perform inlining when possible
+  -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)
+  -Xgenerics                  Use generic Java types
+
+one error found
+files/cli/test2/Main.scala:5 error: not found: value test1
+    test1.Main.main(args)
+    ^
+one error found
diff --git a/test/files/cli/test2/Main.check.scalaint b/test/files/cli/test2/Main.check.scalaint
new file mode 100644
index 0000000000..2719b50b7d
--- /dev/null
+++ b/test/files/cli/test2/Main.check.scalaint
@@ -0,0 +1,81 @@
+scalaint: unknown option: '-cpp'
+Usage: scalaint <options | source files>
+where possible options include: 
+  -doc                        Generate documentation
+  -g                          Generate debugging info
+  -nowarn                     Generate no warnings
+  -noassert                   Generate no assertions and assumptions
+  -verbose                    Output messages about what the compiler is doing
+  -classpath <path>           Specify where to find user class files
+  -sourcepath <path>          Specify where to find input source files
+  -bootclasspath <path>       Override location of bootstrap class files
+  -extdirs <dirs>             Override location of installed extensions
+  -d <directory>              Specify where to place generated class files
+  -encoding <encoding>        Specify character encoding used by source files
+  -target:<target>            Specify which backend to use (jvm,msil)
+  -migrate                    Assist in migrating from Scala version 1.0
+  -debug                      Output debugging messages
+  -statistics                 Print compiler statistics
+  -explaintypes               Explain type errors in more detail
+  -resident                   Compiler stays resident, files to compile are read from standard input
+  -uniqid                     Print identifiers with unique names (debugging option)
+  -printtypes                 Print tree types (debugging option)
+  -prompt                     Display a prompt after each error (debugging option)
+  -noimports                  Compile without any implicit imports
+  -nopredefs                  Compile without any implicit predefined values
+  -skip:<phase>               Skip <phase>
+  -check:<phase>              Check the tree at start of <phase>
+  -print:<phase>              Print out program after <phase>
+  -printer:<printer>          Printer to use (text,html)
+  -printfile <file>           Specify file in which to print trees
+  -graph:<phase>              Graph the program after <phase>
+  -browse:<phase>             Browse the abstract syntax tree after <phase>
+  -stop:<phase>               Stop after phase <phase>
+  -log:<phase>                Log operations in <phase>
+  -version                    Print product version and exit
+  -help                       Print a synopsis of standard options
+  -Xinline                    Perform inlining when possible
+  -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)
+  -Xgenerics                  Use generic Java types
+
+
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :quit to exit the interpreter.
+Type :compile followed by a filename to compile a complete Scala file.
+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
+line0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :quit to exit the interpreter.
+Type :compile followed by a filename to compile a complete Scala file.
+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
+line0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :quit to exit the interpreter.
+Type :compile followed by a filename to compile a complete Scala file.
+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
+line0: scala.Unit = ()
+
+scala> 
diff --git a/test/files/cli/test2/Main.java b/test/files/cli/test2/Main.java
new file mode 100644
index 0000000000..808fdd7cda
--- /dev/null
+++ b/test/files/cli/test2/Main.java
@@ -0,0 +1,7 @@
+package test2;
+public class Main {
+  public static void main(String args[]) {
+    System.out.print("2: ");
+    test1.Main.main(args);
+  }
+}
diff --git a/test/files/cli/test2/Main.scala b/test/files/cli/test2/Main.scala
new file mode 100644
index 0000000000..7c7f4fd86e
--- /dev/null
+++ b/test/files/cli/test2/Main.scala
@@ -0,0 +1,7 @@
+package test2
+object Main {
+  def main(args: Array[String]) = {
+    Console.print("2: ")
+    test1.Main.main(args)
+  }
+}
diff --git a/test/files/cli/test3/Main.check.javac b/test/files/cli/test3/Main.check.javac
new file mode 100644
index 0000000000..0a2e2de023
--- /dev/null
+++ b/test/files/cli/test3/Main.check.javac
@@ -0,0 +1,33 @@
+javac: invalid flag: -dd
+Usage: javac <options> <source files>
+where possible options include:
+  -g                        Generate all debugging info
+  -g:none                   Generate no debugging info
+  -g:{lines,vars,source}    Generate only some debugging info
+  -nowarn                   Generate no warnings
+  -verbose                  Output messages about what the compiler is doing
+  -deprecation              Output source locations where deprecated APIs are used
+  -classpath <path>         Specify where to find user class files
+  -sourcepath <path>        Specify where to find input source files
+  -bootclasspath <path>     Override location of bootstrap class files
+  -extdirs <dirs>           Override location of installed extensions
+  -d <directory>            Specify where to place generated class files
+  -encoding <encoding>      Specify character encoding used by source files
+  -source <release>         Provide source compatibility with specified release
+  -target <release>         Generate class files for specific VM version
+  -help                     Print a synopsis of standard options
+
+files/cli/test3/Main.java:5: package test1 does not exist
+    test1.Main.main(args);
+         ^
+files/cli/test3/Main.java:7: package test2 does not exist
+    test2.Main.main(args);
+         ^
+2 errors
+files/cli/test3/Main.java:5: package test1 does not exist
+    test1.Main.main(args);
+         ^
+files/cli/test3/Main.java:7: package test2 does not exist
+    test2.Main.main(args);
+         ^
+2 errors
diff --git a/test/files/cli/test3/Main.check.javac5 b/test/files/cli/test3/Main.check.javac5
new file mode 100644
index 0000000000..f97ed7066b
--- /dev/null
+++ b/test/files/cli/test3/Main.check.javac5
@@ -0,0 +1,38 @@
+javac: invalid flag: -dd
+Usage: javac <options> <source files>
+where possible options include:
+  -g                         Generate all debugging info
+  -g:none                    Generate no debugging info
+  -g:{lines,vars,source}     Generate only some debugging info
+  -nowarn                    Generate no warnings
+  -verbose                   Output messages about what the compiler is doing
+  -deprecation               Output source locations where deprecated APIs are used
+  -classpath <path>          Specify where to find user class files
+  -cp <path>                 Specify where to find user class files
+  -sourcepath <path>         Specify where to find input source files
+  -bootclasspath <path>      Override location of bootstrap class files
+  -extdirs <dirs>            Override location of installed extensions
+  -endorseddirs <dirs>       Override location of endorsed standards path
+  -d <directory>             Specify where to place generated class files
+  -encoding <encoding>       Specify character encoding used by source files
+  -source <release>          Provide source compatibility with specified release
+  -target <release>          Generate class files for specific VM version
+  -version                   Version information
+  -help                      Print a synopsis of standard options
+  -X                         Print a synopsis of nonstandard options
+  -J<flag>                   Pass <flag> directly to the runtime system
+
+files/cli/test3/Main.java:5: package test1 does not exist
+    test1.Main.main(args);
+         ^
+files/cli/test3/Main.java:7: package test2 does not exist
+    test2.Main.main(args);
+         ^
+2 errors
+files/cli/test3/Main.java:5: package test1 does not exist
+    test1.Main.main(args);
+         ^
+files/cli/test3/Main.java:7: package test2 does not exist
+    test2.Main.main(args);
+         ^
+2 errors
diff --git a/test/files/cli/test3/Main.check.scala b/test/files/cli/test3/Main.check.scala
new file mode 100644
index 0000000000..d920b45a05
--- /dev/null
+++ b/test/files/cli/test3/Main.check.scala
@@ -0,0 +1,8 @@
+Unrecognized option: -cpp
+Could not create the Java virtual machine.
+3: 1: test 1 passed
+3: 2: 1: test 1 passed
+3: 1: test 2 passed
+3: 2: 1: test 2 passed
+3: 1: test 3 passed
+3: 2: 1: test 3 passed
diff --git a/test/files/cli/test3/Main.check.scalac b/test/files/cli/test3/Main.check.scalac
new file mode 100644
index 0000000000..71d2ab1cbd
--- /dev/null
+++ b/test/files/cli/test3/Main.check.scalac
@@ -0,0 +1,50 @@
+scalac error: unknown option: '-dd'
+  scalac -help  gives more information
+Usage: scalac <options | source files>
+where possible options include: 
+  -doc                        Generate documentation
+  -g                          Generate debugging info
+  -nowarn                     Generate no warnings
+  -noassert                   Generate no assertions and assumptions
+  -verbose                    Output messages about what the compiler is doing
+  -classpath <path>           Specify where to find user class files
+  -sourcepath <path>          Specify where to find input source files
+  -bootclasspath <path>       Override location of bootstrap class files
+  -extdirs <dirs>             Override location of installed extensions
+  -d <directory>              Specify where to place generated class files
+  -encoding <encoding>        Specify character encoding used by source files
+  -target:<target>            Specify which backend to use (jvm,msil)
+  -migrate                    Assist in migrating from Scala version 1.0
+  -debug                      Output debugging messages
+  -statistics                 Print compiler statistics
+  -explaintypes               Explain type errors in more detail
+  -resident                   Compiler stays resident, files to compile are read from standard input
+  -uniqid                     Print identifiers with unique names (debugging option)
+  -printtypes                 Print tree types (debugging option)
+  -prompt                     Display a prompt after each error (debugging option)
+  -noimports                  Compile without any implicit imports
+  -nopredefs                  Compile without any implicit predefined values
+  -skip:<phase>               Skip <phase>
+  -check:<phase>              Check the tree at start of <phase>
+  -print:<phase>              Print out program after <phase>
+  -printer:<printer>          Printer to use (text,html)
+  -printfile <file>           Specify file in which to print trees
+  -graph:<phase>              Graph the program after <phase>
+  -browse:<phase>             Browse the abstract syntax tree after <phase>
+  -stop:<phase>               Stop after phase <phase>
+  -log:<phase>                Log operations in <phase>
+  -version                    Print product version and exit
+  -help                       Print a synopsis of standard options
+  -Xinline                    Perform inlining when possible
+  -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)
+  -Xgenerics                  Use generic Java types
+
+one error found
+files/cli/test3/Main.scala:5 error: not found: value test1
+    test1.Main.main(args)
+    ^
+one error found
diff --git a/test/files/cli/test3/Main.check.scalaint b/test/files/cli/test3/Main.check.scalaint
new file mode 100644
index 0000000000..9b5d479db0
--- /dev/null
+++ b/test/files/cli/test3/Main.check.scalaint
@@ -0,0 +1,84 @@
+scalaint: unknown option: '-cpp'
+Usage: scalaint <options | source files>
+where possible options include: 
+  -doc                        Generate documentation
+  -g                          Generate debugging info
+  -nowarn                     Generate no warnings
+  -noassert                   Generate no assertions and assumptions
+  -verbose                    Output messages about what the compiler is doing
+  -classpath <path>           Specify where to find user class files
+  -sourcepath <path>          Specify where to find input source files
+  -bootclasspath <path>       Override location of bootstrap class files
+  -extdirs <dirs>             Override location of installed extensions
+  -d <directory>              Specify where to place generated class files
+  -encoding <encoding>        Specify character encoding used by source files
+  -target:<target>            Specify which backend to use (jvm,msil)
+  -migrate                    Assist in migrating from Scala version 1.0
+  -debug                      Output debugging messages
+  -statistics                 Print compiler statistics
+  -explaintypes               Explain type errors in more detail
+  -resident                   Compiler stays resident, files to compile are read from standard input
+  -uniqid                     Print identifiers with unique names (debugging option)
+  -printtypes                 Print tree types (debugging option)
+  -prompt                     Display a prompt after each error (debugging option)
+  -noimports                  Compile without any implicit imports
+  -nopredefs                  Compile without any implicit predefined values
+  -skip:<phase>               Skip <phase>
+  -check:<phase>              Check the tree at start of <phase>
+  -print:<phase>              Print out program after <phase>
+  -printer:<printer>          Printer to use (text,html)
+  -printfile <file>           Specify file in which to print trees
+  -graph:<phase>              Graph the program after <phase>
+  -browse:<phase>             Browse the abstract syntax tree after <phase>
+  -stop:<phase>               Stop after phase <phase>
+  -log:<phase>                Log operations in <phase>
+  -version                    Print product version and exit
+  -help                       Print a synopsis of standard options
+  -Xinline                    Perform inlining when possible
+  -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)
+  -Xgenerics                  Use generic Java types
+
+
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :quit to exit the interpreter.
+Type :compile followed by a filename to compile a complete Scala file.
+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> 3: 1: test 1 passed
+3: 2: 1: test 1 passed
+line0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :quit to exit the interpreter.
+Type :compile followed by a filename to compile a complete Scala file.
+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> 3: 1: test 2 passed
+3: 2: 1: test 2 passed
+line0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :quit to exit the interpreter.
+Type :compile followed by a filename to compile a complete Scala file.
+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> 3: 1: test 3 passed
+3: 2: 1: test 3 passed
+line0: scala.Unit = ()
+
+scala> 
diff --git a/test/files/cli/test3/Main.java b/test/files/cli/test3/Main.java
new file mode 100644
index 0000000000..41cafefa55
--- /dev/null
+++ b/test/files/cli/test3/Main.java
@@ -0,0 +1,9 @@
+package test3;
+public class Main {
+  public static void main(String args[]) {
+    System.out.print("3: ");
+    test1.Main.main(args);
+    System.out.print("3: ");
+    test2.Main.main(args);
+  }
+}
\ No newline at end of file
diff --git a/test/files/cli/test3/Main.scala b/test/files/cli/test3/Main.scala
new file mode 100644
index 0000000000..2d38e438f6
--- /dev/null
+++ b/test/files/cli/test3/Main.scala
@@ -0,0 +1,9 @@
+package test3
+object Main {
+  def main(args: Array[String]) = {
+    Console.print("3: ")
+    test1.Main.main(args)
+    Console.print("3: ")
+    test2.Main.main(args)
+  }
+}
\ No newline at end of file