If I work on this patch any longer without chec...

If I work on this patch any longer without checking in I will go
stark raving mad. It is broken up into a couple pieces. This one is
the changes to test/. It includes fixing a bunch of tests, removing
deprecated constructs, moving jars used by tests to the most specific
plausible location rather than having all jars on the classpath of all
tests, and some filesystem layout change (continuations get their whole
own srcpath.) This would be the world's most tedious review, so let's
say no review.

[Note: after this commit, I doubt things will build very smoothly until
the rest of the partest changes follow. Which should only be seconds,
but just in case.]

51 files changed, 1132 insertions, 0 deletions

diff --git a/test/attic/files/cli/test1/Main.check.j9vm5 b/test/attic/files/cli/test1/Main.check.j9vm5
new file mode 100644
index 0000000000..de454ef478
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.j9vm5
@@ -0,0 +1,4 @@
+env: -cpp: No such file or directory
+env: test1.Main: No such file or directory
+env: -cp: No such file or directory
+1: test 3 passed
diff --git a/test/attic/files/cli/test1/Main.check.java b/test/attic/files/cli/test1/Main.check.java
new file mode 100644
index 0000000000..64410de98f
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.java
@@ -0,0 +1,6 @@
+Unrecognized option: -cpp
+Could not create the Java virtual machine.
+1: test 1 passed (1)
+1: test 2 passed (1)
+1: test 3 passed (1)
+1: test 4 passed (2)
diff --git a/test/attic/files/cli/test1/Main.check.java5 b/test/attic/files/cli/test1/Main.check.java5
new file mode 100644
index 0000000000..64410de98f
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.java5
@@ -0,0 +1,6 @@
+Unrecognized option: -cpp
+Could not create the Java virtual machine.
+1: test 1 passed (1)
+1: test 2 passed (1)
+1: test 3 passed (1)
+1: test 4 passed (2)
diff --git a/test/attic/files/cli/test1/Main.check.java5_api b/test/attic/files/cli/test1/Main.check.java5_api
new file mode 100644
index 0000000000..8693a5d92f
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.java5_api
@@ -0,0 +1,19 @@
+|-- allclasses-frame.html
+|-- allclasses-noframe.html
+|-- constant-values.html
+|-- deprecated-list.html
+|-- help-doc.html
+|-- index-all.html
+|-- index.html
+|-- overview-tree.html
+|-- package-list
+|-- resources
+|   `-- inherit.gif
+|-- stylesheet.css
+`-- test1
+    |-- Main.html
+    |-- package-frame.html
+    |-- package-summary.html
+    `-- package-tree.html
+
+2 directories, 15 files
diff --git a/test/attic/files/cli/test1/Main.check.java5_j9 b/test/attic/files/cli/test1/Main.check.java5_j9
new file mode 100644
index 0000000000..de454ef478
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.java5_j9
@@ -0,0 +1,4 @@
+env: -cpp: No such file or directory
+env: test1.Main: No such file or directory
+env: -cp: No such file or directory
+1: test 3 passed
diff --git a/test/attic/files/cli/test1/Main.check.javac b/test/attic/files/cli/test1/Main.check.javac
new file mode 100644
index 0000000000..ba25d9b6ca
--- /dev/null
+++ b/test/attic/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/attic/files/cli/test1/Main.check.javac5 b/test/attic/files/cli/test1/Main.check.javac5
new file mode 100644
index 0000000000..0cb29d31ff
--- /dev/null
+++ b/test/attic/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/attic/files/cli/test1/Main.check.javac6 b/test/attic/files/cli/test1/Main.check.javac6
new file mode 100644
index 0000000000..8f37a05bcb
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.javac6
@@ -0,0 +1,29 @@
+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 and annotation processors
+  -cp <path>                 Specify where to find user class files and annotation processors
+  -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
+  -proc:{none, only}         Control whether annotation processing and/or compilation is done.
+  -processor <class>         Name of the annotation processor to run; bypasses default discovery process
+  -processorpath <path>      Specify where to find annotation processors
+  -d <directory>             Specify where to place generated class files
+  -s <directory>             Specify where to place generated source 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
+  -A[key[=value]]            Options to pass to annotation processors
+  -X                         Print a synopsis of nonstandard options
+  -J<flag>                   Pass <flag> directly to the runtime system
+
diff --git a/test/attic/files/cli/test1/Main.check.jikes b/test/attic/files/cli/test1/Main.check.jikes
new file mode 100644
index 0000000000..cd891689db
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.jikes
@@ -0,0 +1,3 @@
+Error: "-dd" is an invalid option.
+use: jikes [options] [@files] file.java...
+For more help, try -help or -version.
diff --git a/test/attic/files/cli/test1/Main.check.jikes5 b/test/attic/files/cli/test1/Main.check.jikes5
new file mode 100644
index 0000000000..cd891689db
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.jikes5
@@ -0,0 +1,3 @@
+Error: "-dd" is an invalid option.
+use: jikes [options] [@files] file.java...
+For more help, try -help or -version.
diff --git a/test/attic/files/cli/test1/Main.check.scala b/test/attic/files/cli/test1/Main.check.scala
new file mode 100644
index 0000000000..43b200ae02
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.scala
@@ -0,0 +1,24 @@
+unknown option: '-cpp'
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
+
+<torun>, if present, is an object or script file to run.
+If no <torun> is present, run an interactive interpreter.
+
+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)
+1: test 4 passed (2)
diff --git a/test/attic/files/cli/test1/Main.check.scala_api b/test/attic/files/cli/test1/Main.check.scala_api
new file mode 100644
index 0000000000..6fac39d3f0
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.scala_api
@@ -0,0 +1,33 @@
+|-- 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
+|   `-- Main$object.html
+|-- test1$content.html
+`-- test1$package.html
+
+3 directories, 28 files
diff --git a/test/attic/files/cli/test1/Main.check.scala_j9 b/test/attic/files/cli/test1/Main.check.scala_j9
new file mode 100644
index 0000000000..65d5ddaac4
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.scala_j9
@@ -0,0 +1,15 @@
+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)
+1: test 4 passed (2)
diff --git a/test/attic/files/cli/test1/Main.check.scalac b/test/attic/files/cli/test1/Main.check.scalac
new file mode 100644
index 0000000000..8465810d0b
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.scalac
@@ -0,0 +1,63 @@
+scalac error: bad option: '-dd'
+  scalac -help  gives more information
+Usage: scalac <options | source files>
+where possible options include: 
+  -doc                            Generate documentation
+  -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
+  -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
+  -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-1.5,msil)
+  -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
+  -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>
+  -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
+  -Xshowobj <object>              Show object info
+  -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
+  -Xplugtypes                     parse but ignore annotations in more locations
+  -Xkilloption                    optimizes option types
+
+one error found
diff --git a/test/attic/files/cli/test1/Main.check.scalaint b/test/attic/files/cli/test1/Main.check.scalaint
new file mode 100644
index 0000000000..88345d1874
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.check.scalaint
@@ -0,0 +1,45 @@
+unknown option: '-cpp'
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
+
+<torun>, if present, is an object or script file to run.
+If no <torun> is present, run an interactive interpreter.
+
+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.
+Type :help for more information.
+
+scala> 1: test 1 passed (1)
+unnamed0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 1: test 2 passed (1)
+unnamed0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 1: test 3 passed (1)
+unnamed0: scala.Unit = ()
+
+scala> 
diff --git a/test/attic/files/cli/test1/Main.java b/test/attic/files/cli/test1/Main.java
new file mode 100644
index 0000000000..8850b87517
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.java
@@ -0,0 +1,8 @@
+// @info no dependency
+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 (" + args.length + ")");
+  }
+}
diff --git a/test/attic/files/cli/test1/Main.scala b/test/attic/files/cli/test1/Main.scala
new file mode 100644
index 0000000000..f7dd8a0a36
--- /dev/null
+++ b/test/attic/files/cli/test1/Main.scala
@@ -0,0 +1,8 @@
+// @info no dependency
+package test1
+object Main {
+  def main(args: Array[String]) = {
+    val arg = if (args != null && args.length > 0) args(0) else "?"
+    Console.println("1: test " + arg + " passed (" + args.length + ")")
+  }
+}
diff --git a/test/attic/files/cli/test2/Main.check.j9vm5 b/test/attic/files/cli/test2/Main.check.j9vm5
new file mode 100644
index 0000000000..8f4fdf8aa1
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.j9vm5
@@ -0,0 +1,4 @@
+env: -cpp: No such file or directory
+env: test2.Main: No such file or directory
+env: -cp: No such file or directory
+2: 1: test 3 passed
diff --git a/test/attic/files/cli/test2/Main.check.java b/test/attic/files/cli/test2/Main.check.java
new file mode 100644
index 0000000000..aca383de3e
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.java
@@ -0,0 +1,6 @@
+Unrecognized option: -cpp
+Could not create the Java virtual machine.
+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/attic/files/cli/test2/Main.check.java5 b/test/attic/files/cli/test2/Main.check.java5
new file mode 100644
index 0000000000..aca383de3e
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.java5
@@ -0,0 +1,6 @@
+Unrecognized option: -cpp
+Could not create the Java virtual machine.
+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/attic/files/cli/test2/Main.check.java5_api b/test/attic/files/cli/test2/Main.check.java5_api
new file mode 100644
index 0000000000..4ff775c3da
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.java5_api
@@ -0,0 +1,24 @@
+|-- allclasses-frame.html
+|-- allclasses-noframe.html
+|-- constant-values.html
+|-- deprecated-list.html
+|-- help-doc.html
+|-- index-all.html
+|-- index.html
+|-- overview-tree.html
+|-- package-list
+|-- resources
+|   `-- inherit.gif
+|-- stylesheet.css
+|-- test1
+|   |-- Main.html
+|   |-- package-frame.html
+|   |-- package-summary.html
+|   `-- package-tree.html
+`-- test2
+    |-- Main.html
+    |-- package-frame.html
+    |-- package-summary.html
+    `-- package-tree.html
+
+3 directories, 19 files
diff --git a/test/attic/files/cli/test2/Main.check.java5_j9 b/test/attic/files/cli/test2/Main.check.java5_j9
new file mode 100644
index 0000000000..2dcb6e892a
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.java5_j9
@@ -0,0 +1,36 @@
+JVMJ9VM007E Command-line option unrecognised: -cpp
+Could not create the Java virtual machine.
+
+Usage: java [-options] class [args...]
+           (to execute a class)
+   or  java [-jar] [-options] jarfile [args...]
+           (to execute a jar file)
+
+where options include:
+    -cp -classpath <directories and zip/jar files separated by :>
+              set search path for application classes and resources
+    -D<name>=<value>
+              set a system property
+    -verbose[:class|gc|jni]
+              enable verbose output
+    -version  print product version
+    -version:<value>
+        require the specified version to run
+    -showversion  print product version and continue
+    -jre-restrict-search | -no-jre-restrict-search
+              include/exclude user private JREs in the version search
+    -agentlib:<libname>[=<options>]
+              load native agent library <libname>, e.g. -agentlib:hprof
+              see also, -agentlib:jdwp=help and -agentlib:hprof=help
+    -agentpath:<pathname>[=<options>]
+              load native agent library by full pathname
+    -javaagent:<jarpath>[=<options>]
+              load Java programming language agent, see java.lang.instrument
+    -? -help  print this help message
+    -X        print help on non-standard options
+    -assert   print help on assert options
+
+The java class is not found:  test2.Main
+The java class is not found:  test2.Main
+The java class is not found:  test2.Main
+The java class is not found:  test2.Main
diff --git a/test/attic/files/cli/test2/Main.check.javac b/test/attic/files/cli/test2/Main.check.javac
new file mode 100644
index 0000000000..c40c0a7a89
--- /dev/null
+++ b/test/attic/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:6: package test1 does not exist
+    test1.Main.main(args);
+         ^
+1 error
+files/cli/test2/Main.java:6: package test1 does not exist
+    test1.Main.main(args);
+         ^
+1 error
diff --git a/test/attic/files/cli/test2/Main.check.javac5 b/test/attic/files/cli/test2/Main.check.javac5
new file mode 100644
index 0000000000..0ac32b056e
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.javac5
@@ -0,0 +1,28 @@
+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:6: package test1 does not exist
+    test1.Main.main(args);
+         ^
+1 error
diff --git a/test/attic/files/cli/test2/Main.check.javac6 b/test/attic/files/cli/test2/Main.check.javac6
new file mode 100644
index 0000000000..350d3253bc
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.javac6
@@ -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 and annotation processors
+  -cp <path>                 Specify where to find user class files and annotation processors
+  -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
+  -proc:{none, only}         Control whether annotation processing and/or compilation is done.
+  -processor <class>         Name of the annotation processor to run; bypasses default discovery process
+  -processorpath <path>      Specify where to find annotation processors
+  -d <directory>             Specify where to place generated class files
+  -s <directory>             Specify where to place generated source 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
+  -A[key[=value]]            Options to pass to annotation processors
+  -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
diff --git a/test/attic/files/cli/test2/Main.check.jikes b/test/attic/files/cli/test2/Main.check.jikes
new file mode 100644
index 0000000000..97943e8347
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.jikes
@@ -0,0 +1,9 @@
+Error: "-dd" is an invalid option.
+use: jikes [options] [@files] file.java...
+For more help, try -help or -version.
+
+Found 1 semantic error compiling "files/cli/test2/Main.java":
+
+     6.     test1.Main.main(args);
+            ^---^
+*** Semantic Error: No accessible field named "test1" was found in type "test2.Main".
diff --git a/test/attic/files/cli/test2/Main.check.jikes5 b/test/attic/files/cli/test2/Main.check.jikes5
new file mode 100644
index 0000000000..97943e8347
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.jikes5
@@ -0,0 +1,9 @@
+Error: "-dd" is an invalid option.
+use: jikes [options] [@files] file.java...
+For more help, try -help or -version.
+
+Found 1 semantic error compiling "files/cli/test2/Main.java":
+
+     6.     test1.Main.main(args);
+            ^---^
+*** Semantic Error: No accessible field named "test1" was found in type "test2.Main".
diff --git a/test/attic/files/cli/test2/Main.check.scala b/test/attic/files/cli/test2/Main.check.scala
new file mode 100644
index 0000000000..7e5f17625b
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.scala
@@ -0,0 +1,24 @@
+unknown option: '-cpp'
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
+
+<torun>, if present, is an object or script file to run.
+If no <torun> is present, run an interactive interpreter.
+
+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)
+2: 1: test 4 passed (2)
diff --git a/test/attic/files/cli/test2/Main.check.scala_api b/test/attic/files/cli/test2/Main.check.scala_api
new file mode 100644
index 0000000000..bcb0f0c7fb
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.scala_api
@@ -0,0 +1,37 @@
+|-- 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
+|   `-- Main$object.html
+|-- test1$content.html
+|-- test1$package.html
+|-- test2
+|   `-- Main$object.html
+|-- test2$content.html
+`-- test2$package.html
+
+4 directories, 31 files
diff --git a/test/attic/files/cli/test2/Main.check.scala_j9 b/test/attic/files/cli/test2/Main.check.scala_j9
new file mode 100644
index 0000000000..80cbb50fa9
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.scala_j9
@@ -0,0 +1,15 @@
+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)
+2: 1: test 4 passed (2)
diff --git a/test/attic/files/cli/test2/Main.check.scalac b/test/attic/files/cli/test2/Main.check.scalac
new file mode 100644
index 0000000000..8465810d0b
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.scalac
@@ -0,0 +1,63 @@
+scalac error: bad option: '-dd'
+  scalac -help  gives more information
+Usage: scalac <options | source files>
+where possible options include: 
+  -doc                            Generate documentation
+  -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
+  -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
+  -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-1.5,msil)
+  -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
+  -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>
+  -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
+  -Xshowobj <object>              Show object info
+  -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
+  -Xplugtypes                     parse but ignore annotations in more locations
+  -Xkilloption                    optimizes option types
+
+one error found
diff --git a/test/attic/files/cli/test2/Main.check.scalaint b/test/attic/files/cli/test2/Main.check.scalaint
new file mode 100644
index 0000000000..89b6766bb5
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.check.scalaint
@@ -0,0 +1,45 @@
+unknown option: '-cpp'
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
+
+<torun>, if present, is an object or script file to run.
+If no <torun> is present, run an interactive interpreter.
+
+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.
+Type :help for more information.
+
+scala> 2: 1: test 1 passed (1)
+unnamed0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 2: 1: test 2 passed (1)
+unnamed0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 2: 1: test 3 passed (1)
+unnamed0: scala.Unit = ()
+
+scala> 
diff --git a/test/attic/files/cli/test2/Main.java b/test/attic/files/cli/test2/Main.java
new file mode 100644
index 0000000000..f6797632bf
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.java
@@ -0,0 +1,8 @@
+// @info 1 dependency
+package test2;
+public class Main {
+  public static void main(String args[]) {
+    System.out.print("2: ");
+    test1.Main.main(args);
+  }
+}
diff --git a/test/attic/files/cli/test2/Main.scala b/test/attic/files/cli/test2/Main.scala
new file mode 100644
index 0000000000..1d43759fdf
--- /dev/null
+++ b/test/attic/files/cli/test2/Main.scala
@@ -0,0 +1,8 @@
+// @info 1 dependency
+package test2
+object Main {
+  def main(args: Array[String]) = {
+    Console.print("2: ")
+    test1.Main.main(args)
+  }
+}
diff --git a/test/attic/files/cli/test3/Main.check.j9vm5 b/test/attic/files/cli/test3/Main.check.j9vm5
new file mode 100644
index 0000000000..a094dc8daf
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.j9vm5
@@ -0,0 +1,5 @@
+env: -cpp: No such file or directory
+env: test3.Main: No such file or directory
+env: -cp: No such file or directory
+3: 1: test 3 passed
+3: 2: 1: test 3 passed
diff --git a/test/attic/files/cli/test3/Main.check.java b/test/attic/files/cli/test3/Main.check.java
new file mode 100644
index 0000000000..de3eb7b136
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.java
@@ -0,0 +1,10 @@
+Unrecognized option: -cpp
+Could not create the Java virtual machine.
+3: 1: test 1 passed (1)
+3: 2: 1: test 1 passed (1)
+3: 1: test 2 passed (1)
+3: 2: 1: test 2 passed (1)
+3: 1: test 3 passed (1)
+3: 2: 1: test 3 passed (1)
+3: 1: test 4 passed (2)
+3: 2: 1: test 4 passed (2)
diff --git a/test/attic/files/cli/test3/Main.check.java5 b/test/attic/files/cli/test3/Main.check.java5
new file mode 100644
index 0000000000..de3eb7b136
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.java5
@@ -0,0 +1,10 @@
+Unrecognized option: -cpp
+Could not create the Java virtual machine.
+3: 1: test 1 passed (1)
+3: 2: 1: test 1 passed (1)
+3: 1: test 2 passed (1)
+3: 2: 1: test 2 passed (1)
+3: 1: test 3 passed (1)
+3: 2: 1: test 3 passed (1)
+3: 1: test 4 passed (2)
+3: 2: 1: test 4 passed (2)
diff --git a/test/attic/files/cli/test3/Main.check.java5_api b/test/attic/files/cli/test3/Main.check.java5_api
new file mode 100644
index 0000000000..f6112211f0
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.java5_api
@@ -0,0 +1,29 @@
+|-- allclasses-frame.html
+|-- allclasses-noframe.html
+|-- constant-values.html
+|-- deprecated-list.html
+|-- help-doc.html
+|-- index-all.html
+|-- index.html
+|-- overview-tree.html
+|-- package-list
+|-- resources
+|   `-- inherit.gif
+|-- stylesheet.css
+|-- test1
+|   |-- Main.html
+|   |-- package-frame.html
+|   |-- package-summary.html
+|   `-- package-tree.html
+|-- test2
+|   |-- Main.html
+|   |-- package-frame.html
+|   |-- package-summary.html
+|   `-- package-tree.html
+`-- test3
+    |-- Main.html
+    |-- package-frame.html
+    |-- package-summary.html
+    `-- package-tree.html
+
+4 directories, 23 files
diff --git a/test/attic/files/cli/test3/Main.check.java5_j9 b/test/attic/files/cli/test3/Main.check.java5_j9
new file mode 100644
index 0000000000..9e228d7649
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.java5_j9
@@ -0,0 +1,36 @@
+JVMJ9VM007E Command-line option unrecognised: -cpp
+Could not create the Java virtual machine.
+
+Usage: java [-options] class [args...]
+           (to execute a class)
+   or  java [-jar] [-options] jarfile [args...]
+           (to execute a jar file)
+
+where options include:
+    -cp -classpath <directories and zip/jar files separated by :>
+              set search path for application classes and resources
+    -D<name>=<value>
+              set a system property
+    -verbose[:class|gc|jni]
+              enable verbose output
+    -version  print product version
+    -version:<value>
+        require the specified version to run
+    -showversion  print product version and continue
+    -jre-restrict-search | -no-jre-restrict-search
+              include/exclude user private JREs in the version search
+    -agentlib:<libname>[=<options>]
+              load native agent library <libname>, e.g. -agentlib:hprof
+              see also, -agentlib:jdwp=help and -agentlib:hprof=help
+    -agentpath:<pathname>[=<options>]
+              load native agent library by full pathname
+    -javaagent:<jarpath>[=<options>]
+              load Java programming language agent, see java.lang.instrument
+    -? -help  print this help message
+    -X        print help on non-standard options
+    -assert   print help on assert options
+
+The java class is not found:  test3.Main
+The java class is not found:  test3.Main
+The java class is not found:  test3.Main
+The java class is not found:  test3.Main
diff --git a/test/attic/files/cli/test3/Main.check.javac b/test/attic/files/cli/test3/Main.check.javac
new file mode 100644
index 0000000000..8d235b647b
--- /dev/null
+++ b/test/attic/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:6: package test1 does not exist
+    test1.Main.main(args);
+         ^
+files/cli/test3/Main.java:8: package test2 does not exist
+    test2.Main.main(args);
+         ^
+2 errors
+files/cli/test3/Main.java:6: package test1 does not exist
+    test1.Main.main(args);
+         ^
+files/cli/test3/Main.java:8: package test2 does not exist
+    test2.Main.main(args);
+         ^
+2 errors
diff --git a/test/attic/files/cli/test3/Main.check.javac5 b/test/attic/files/cli/test3/Main.check.javac5
new file mode 100644
index 0000000000..3a48fa000e
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.javac5
@@ -0,0 +1,31 @@
+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:6: package test1 does not exist
+    test1.Main.main(args);
+         ^
+files/cli/test3/Main.java:8: package test2 does not exist
+    test2.Main.main(args);
+         ^
+2 errors
diff --git a/test/attic/files/cli/test3/Main.check.javac6 b/test/attic/files/cli/test3/Main.check.javac6
new file mode 100644
index 0000000000..677b950aed
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.javac6
@@ -0,0 +1,36 @@
+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 and annotation processors
+  -cp <path>                 Specify where to find user class files and annotation processors
+  -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
+  -proc:{none, only}         Control whether annotation processing and/or compilation is done.
+  -processor <class>         Name of the annotation processor to run; bypasses default discovery process
+  -processorpath <path>      Specify where to find annotation processors
+  -d <directory>             Specify where to place generated class files
+  -s <directory>             Specify where to place generated source 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
+  -A[key[=value]]            Options to pass to annotation processors
+  -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
diff --git a/test/attic/files/cli/test3/Main.check.jikes b/test/attic/files/cli/test3/Main.check.jikes
new file mode 100644
index 0000000000..604333e81a
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.jikes
@@ -0,0 +1,14 @@
+Error: "-dd" is an invalid option.
+use: jikes [options] [@files] file.java...
+For more help, try -help or -version.
+
+Found 2 semantic errors compiling "files/cli/test3/Main.java":
+
+     6.     test1.Main.main(args);
+            ^---^
+*** Semantic Error: No accessible field named "test1" was found in type "test3.Main".
+
+
+     8.     test2.Main.main(args);
+            ^---^
+*** Semantic Error: No accessible field named "test2" was found in type "test3.Main".
diff --git a/test/attic/files/cli/test3/Main.check.jikes5 b/test/attic/files/cli/test3/Main.check.jikes5
new file mode 100644
index 0000000000..604333e81a
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.jikes5
@@ -0,0 +1,14 @@
+Error: "-dd" is an invalid option.
+use: jikes [options] [@files] file.java...
+For more help, try -help or -version.
+
+Found 2 semantic errors compiling "files/cli/test3/Main.java":
+
+     6.     test1.Main.main(args);
+            ^---^
+*** Semantic Error: No accessible field named "test1" was found in type "test3.Main".
+
+
+     8.     test2.Main.main(args);
+            ^---^
+*** Semantic Error: No accessible field named "test2" was found in type "test3.Main".
diff --git a/test/attic/files/cli/test3/Main.check.scala b/test/attic/files/cli/test3/Main.check.scala
new file mode 100644
index 0000000000..f78729b9a2
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.scala
@@ -0,0 +1,28 @@
+unknown option: '-cpp'
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
+
+<torun>, if present, is an object or script file to run.
+If no <torun> is present, run an interactive interpreter.
+
+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)
+3: 2: 1: test 2 passed (1)
+3: 1: test 3 passed (1)
+3: 2: 1: test 3 passed (1)
+3: 1: test 4 passed (2)
+3: 2: 1: test 4 passed (2)
diff --git a/test/attic/files/cli/test3/Main.check.scala_api b/test/attic/files/cli/test3/Main.check.scala_api
new file mode 100644
index 0000000000..4552819b5b
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.scala_api
@@ -0,0 +1,41 @@
+|-- 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
+|   `-- Main$object.html
+|-- test1$content.html
+|-- test1$package.html
+|-- test2
+|   `-- Main$object.html
+|-- test2$content.html
+|-- test2$package.html
+|-- test3
+|   `-- Main$object.html
+|-- test3$content.html
+`-- test3$package.html
+
+5 directories, 34 files
diff --git a/test/attic/files/cli/test3/Main.check.scala_j9 b/test/attic/files/cli/test3/Main.check.scala_j9
new file mode 100644
index 0000000000..3804c17636
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.scala_j9
@@ -0,0 +1,19 @@
+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)
+3: 2: 1: test 2 passed (1)
+3: 1: test 3 passed (1)
+3: 2: 1: test 3 passed (1)
+3: 1: test 4 passed (2)
+3: 2: 1: test 4 passed (2)
diff --git a/test/attic/files/cli/test3/Main.check.scalac b/test/attic/files/cli/test3/Main.check.scalac
new file mode 100644
index 0000000000..8465810d0b
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.scalac
@@ -0,0 +1,63 @@
+scalac error: bad option: '-dd'
+  scalac -help  gives more information
+Usage: scalac <options | source files>
+where possible options include: 
+  -doc                            Generate documentation
+  -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
+  -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
+  -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-1.5,msil)
+  -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
+  -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>
+  -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
+  -Xshowobj <object>              Show object info
+  -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
+  -Xplugtypes                     parse but ignore annotations in more locations
+  -Xkilloption                    optimizes option types
+
+one error found
diff --git a/test/attic/files/cli/test3/Main.check.scalaint b/test/attic/files/cli/test3/Main.check.scalaint
new file mode 100644
index 0000000000..cffa02c5b6
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.check.scalaint
@@ -0,0 +1,48 @@
+unknown option: '-cpp'
+scala [ <option> ]... [<torun> <arguments>]
+
+All options to scalac are allowed.  See scalac -help.
+
+<torun>, if present, is an object or script file to run.
+If no <torun> is present, run an interactive interpreter.
+
+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.
+Type :help for more information.
+
+scala> 3: 1: test 1 passed (1)
+3: 2: 1: test 1 passed (1)
+unnamed0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 3: 1: test 2 passed (1)
+3: 2: 1: test 2 passed (1)
+unnamed0: scala.Unit = ()
+
+scala> 
+This is an interpreter for Scala.
+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 3: 1: test 3 passed (1)
+3: 2: 1: test 3 passed (1)
+unnamed0: scala.Unit = ()
+
+scala> 
diff --git a/test/attic/files/cli/test3/Main.java b/test/attic/files/cli/test3/Main.java
new file mode 100644
index 0000000000..208863d012
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.java
@@ -0,0 +1,10 @@
+// @info 2 dependency
+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);
+  }
+}
diff --git a/test/attic/files/cli/test3/Main.scala b/test/attic/files/cli/test3/Main.scala
new file mode 100644
index 0000000000..63fc11b771
--- /dev/null
+++ b/test/attic/files/cli/test3/Main.scala
@@ -0,0 +1,10 @@
+// @info 2 dependencies
+package test3
+object Main {
+  def main(args: Array[String]) = {
+    Console.print("3: ")
+    test1.Main.main(args)
+    Console.print("3: ")
+    test2.Main.main(args)
+  }
+}