Merge pull request #1765 from paulp/pr/remove-detach

Removing more of that which merits removal

67 files changed, 0 insertions, 1841 deletions

diff --git a/test/attic/files/cli/test1/Main.check.j9vm5 b/test/attic/files/cli/test1/Main.check.j9vm5
deleted file mode 100644
index de454ef478..0000000000
--- a/test/attic/files/cli/test1/Main.check.j9vm5
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 64410de98f..0000000000
--- a/test/attic/files/cli/test1/Main.check.java
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 64410de98f..0000000000
--- a/test/attic/files/cli/test1/Main.check.java5
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 8693a5d92f..0000000000
--- a/test/attic/files/cli/test1/Main.check.java5_api
+++ /dev/null
@@ -1,19 +0,0 @@
-|-- 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
deleted file mode 100644
index de454ef478..0000000000
--- a/test/attic/files/cli/test1/Main.check.java5_j9
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index ba25d9b6ca..0000000000
--- a/test/attic/files/cli/test1/Main.check.javac
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 0cb29d31ff..0000000000
--- a/test/attic/files/cli/test1/Main.check.javac5
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 8f37a05bcb..0000000000
--- a/test/attic/files/cli/test1/Main.check.javac6
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index cd891689db..0000000000
--- a/test/attic/files/cli/test1/Main.check.jikes
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index cd891689db..0000000000
--- a/test/attic/files/cli/test1/Main.check.jikes5
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 43b200ae02..0000000000
--- a/test/attic/files/cli/test1/Main.check.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 6fac39d3f0..0000000000
--- a/test/attic/files/cli/test1/Main.check.scala_api
+++ /dev/null
@@ -1,33 +0,0 @@
-|-- 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
deleted file mode 100644
index 65d5ddaac4..0000000000
--- a/test/attic/files/cli/test1/Main.check.scala_j9
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 5561cc1ead..0000000000
--- a/test/attic/files/cli/test1/Main.check.scalac
+++ /dev/null
@@ -1,61 +0,0 @@
-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)
-  -migrate                        Assist in migrating from Scala version 1.0
-  -debug                          Output debugging messages
-  -deprecation                    enable detailed deprecation warnings
-  -unchecked                      enable detailed unchecked warnings
-  -statistics                     Print compiler statistics
-  -explaintypes                   Explain type errors in more detail
-  -resident                       Compiler stays resident, files to compile are read from standard input
-  -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
deleted file mode 100644
index 88345d1874..0000000000
--- a/test/attic/files/cli/test1/Main.check.scalaint
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index 8850b87517..0000000000
--- a/test/attic/files/cli/test1/Main.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// @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
deleted file mode 100644
index f7dd8a0a36..0000000000
--- a/test/attic/files/cli/test1/Main.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-// @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
deleted file mode 100644
index 8f4fdf8aa1..0000000000
--- a/test/attic/files/cli/test2/Main.check.j9vm5
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index aca383de3e..0000000000
--- a/test/attic/files/cli/test2/Main.check.java
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index aca383de3e..0000000000
--- a/test/attic/files/cli/test2/Main.check.java5
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 4ff775c3da..0000000000
--- a/test/attic/files/cli/test2/Main.check.java5_api
+++ /dev/null
@@ -1,24 +0,0 @@
-|-- 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
deleted file mode 100644
index 2dcb6e892a..0000000000
--- a/test/attic/files/cli/test2/Main.check.java5_j9
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index c40c0a7a89..0000000000
--- a/test/attic/files/cli/test2/Main.check.javac
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 0ac32b056e..0000000000
--- a/test/attic/files/cli/test2/Main.check.javac5
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 350d3253bc..0000000000
--- a/test/attic/files/cli/test2/Main.check.javac6
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index 97943e8347..0000000000
--- a/test/attic/files/cli/test2/Main.check.jikes
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 97943e8347..0000000000
--- a/test/attic/files/cli/test2/Main.check.jikes5
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 7e5f17625b..0000000000
--- a/test/attic/files/cli/test2/Main.check.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index bcb0f0c7fb..0000000000
--- a/test/attic/files/cli/test2/Main.check.scala_api
+++ /dev/null
@@ -1,37 +0,0 @@
-|-- 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
deleted file mode 100644
index 80cbb50fa9..0000000000
--- a/test/attic/files/cli/test2/Main.check.scala_j9
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 5561cc1ead..0000000000
--- a/test/attic/files/cli/test2/Main.check.scalac
+++ /dev/null
@@ -1,61 +0,0 @@
-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)
-  -migrate                        Assist in migrating from Scala version 1.0
-  -debug                          Output debugging messages
-  -deprecation                    enable detailed deprecation warnings
-  -unchecked                      enable detailed unchecked warnings
-  -statistics                     Print compiler statistics
-  -explaintypes                   Explain type errors in more detail
-  -resident                       Compiler stays resident, files to compile are read from standard input
-  -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
deleted file mode 100644
index 89b6766bb5..0000000000
--- a/test/attic/files/cli/test2/Main.check.scalaint
+++ /dev/null
@@ -1,45 +0,0 @@
-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
deleted file mode 100644
index f6797632bf..0000000000
--- a/test/attic/files/cli/test2/Main.java
+++ /dev/null
@@ -1,8 +0,0 @@
-// @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
deleted file mode 100644
index 11c878b9c0..0000000000
--- a/test/attic/files/cli/test2/Main.scala
+++ /dev/null
@@ -1,8 +0,0 @@
-// @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
deleted file mode 100644
index a094dc8daf..0000000000
--- a/test/attic/files/cli/test3/Main.check.j9vm5
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index de3eb7b136..0000000000
--- a/test/attic/files/cli/test3/Main.check.java
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index de3eb7b136..0000000000
--- a/test/attic/files/cli/test3/Main.check.java5
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index f6112211f0..0000000000
--- a/test/attic/files/cli/test3/Main.check.java5_api
+++ /dev/null
@@ -1,29 +0,0 @@
-|-- 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
deleted file mode 100644
index 9e228d7649..0000000000
--- a/test/attic/files/cli/test3/Main.check.java5_j9
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 8d235b647b..0000000000
--- a/test/attic/files/cli/test3/Main.check.javac
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index 3a48fa000e..0000000000
--- a/test/attic/files/cli/test3/Main.check.javac5
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 677b950aed..0000000000
--- a/test/attic/files/cli/test3/Main.check.javac6
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 604333e81a..0000000000
--- a/test/attic/files/cli/test3/Main.check.jikes
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 604333e81a..0000000000
--- a/test/attic/files/cli/test3/Main.check.jikes5
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index f78729b9a2..0000000000
--- a/test/attic/files/cli/test3/Main.check.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-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
deleted file mode 100644
index 4552819b5b..0000000000
--- a/test/attic/files/cli/test3/Main.check.scala_api
+++ /dev/null
@@ -1,41 +0,0 @@
-|-- 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
deleted file mode 100644
index 3804c17636..0000000000
--- a/test/attic/files/cli/test3/Main.check.scala_j9
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index 5561cc1ead..0000000000
--- a/test/attic/files/cli/test3/Main.check.scalac
+++ /dev/null
@@ -1,61 +0,0 @@
-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)
-  -migrate                        Assist in migrating from Scala version 1.0
-  -debug                          Output debugging messages
-  -deprecation                    enable detailed deprecation warnings
-  -unchecked                      enable detailed unchecked warnings
-  -statistics                     Print compiler statistics
-  -explaintypes                   Explain type errors in more detail
-  -resident                       Compiler stays resident, files to compile are read from standard input
-  -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
deleted file mode 100644
index cffa02c5b6..0000000000
--- a/test/attic/files/cli/test3/Main.check.scalaint
+++ /dev/null
@@ -1,48 +0,0 @@
-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
deleted file mode 100644
index 208863d012..0000000000
--- a/test/attic/files/cli/test3/Main.java
+++ /dev/null
@@ -1,10 +0,0 @@
-// @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
deleted file mode 100644
index 63fc11b771..0000000000
--- a/test/attic/files/cli/test3/Main.scala
+++ /dev/null
@@ -1,10 +0,0 @@
-// @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)
-  }
-}
diff --git a/test/files/detach-neg/det_bar.check b/test/files/detach-neg/det_bar.check
deleted file mode 100644
index 70b47581a5..0000000000
--- a/test/files/detach-neg/det_bar.check
+++ /dev/null
@@ -1,4 +0,0 @@
-det_bar.scala:7: error: detach inapplicable for method bar
-  detach(bar)
-         ^
-one error found
diff --git a/test/files/detach-neg/det_bar.scala b/test/files/detach-neg/det_bar.scala
deleted file mode 100644
index 862afb1d6e..0000000000
--- a/test/files/detach-neg/det_bar.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-import scala.remoting._
-class A(y: Int) {
-  var z = 2
-  var bar = (x: Int) => x + y + z
-  def foo(x: Int): Int = x + y + z
-  bar = (x: Int) => x * y
-  detach(bar)
-}
-
-object test extends App {
-  val a = new A(1)
-  println(a.bar(2))
-}
diff --git a/test/files/detach-run/actor-run.check b/test/files/detach-run/actor-run.check
deleted file mode 100644
index 9448ddd5fe..0000000000
--- a/test/files/detach-run/actor-run.check
+++ /dev/null
@@ -1,5 +0,0 @@
-Server.main 8889
-Client.main 127.0.0.1 8889
-yInstVal = 10
-zLocVal = 1000
-result received: 11111
diff --git a/test/files/detach-run/actor/Client.scala b/test/files/detach-run/actor/Client.scala
deleted file mode 100644
index 12573e24d3..0000000000
--- a/test/files/detach-run/actor/Client.scala
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- *  @author Stephane Micheloud
- */
-
-import scala.actors.Actor._, ClientHelper._
-import scala.actors.remote._, RemoteActor._
-import scala.remoting._, Debug._
-
-object Foo {
-  def trace(msg: String) { info("[Foo.trace] "+msg)}
-}
-object Client {
-  val yInstVal: Int = 10
-  var yInstVar: Int = 99
-  object Bar {
-    def trace(msg: String) { info("[Bar.trace] "+msg) }
-  }
-  def main(args: Array[String]) {
-    init(args)
-    actor {
-      val server = select(Node(host, port), 'Server)
-      val zLocVal: Int = 1000
-      var zLocVar: Int = 9998
-      server ! detach(
-        (x: Int) => {
-          println("yInstVal = "+yInstVal)
-          this.trace("yInstVar = "+yInstVar)
-          Bar.trace("zLocVal = "+zLocVal)
-          Foo.trace("zLocVar = "+zLocVar)
-          zLocVar += 2
-          System.out.println("zLocVal = "+zLocVal)
-          Debug.info("zLocVar = "+zLocVar)
-          x + yInstVal + yInstVar + zLocVal + zLocVar
-        })
-      react {
-        case result: Int =>
-          println("result received: " + result)
-          Predef.exit(0)
-      }
-    }
-  }
-  private def trace(msg: String) { info("[Client.trace] "+msg) }
-}
-
-object ClientHelper {
-  private var _host = "127.0.0.1"
-  private var _port = 8888
-  def host = _host
-  def port = _port
-  def init(args: Array[String]) {
-    try { _host = args(0) } catch { case _ => }
-    try { _port = args(1).toInt } catch { case _ => }
-  }
-}
diff --git a/test/files/detach-run/actor/Server.scala b/test/files/detach-run/actor/Server.scala
deleted file mode 100644
index b56d22f744..0000000000
--- a/test/files/detach-run/actor/Server.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  @author Stephane Micheloud
- */
-
-import scala.actors.Actor._
-import scala.actors.remote.RemoteActor._
-
-object Server extends ServerConsole {
-  private def computation(f: Int => Int): Int = {
-    //some time-consuming task
-    f(2)
-  }
-  def main(args: Array[String]) {
-    actor {
-      classLoader = serverClassLoader
-      alive(args(0).toInt)
-      register('Server, self)
-      loopWhile(isRunning) {
-        react {
-          case f: (Int => Int) =>
-            val result = computation(f)
-            sender ! result
-        }
-      }
-    }
-  }
-}
diff --git a/test/files/detach-run/actor/ServerConsole.scala b/test/files/detach-run/actor/ServerConsole.scala
deleted file mode 100644
index 8ebd9d4c2e..0000000000
--- a/test/files/detach-run/actor/ServerConsole.scala
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- *  @author Stephane Micheloud
- */
-
-import java.io.{BufferedReader, InputStreamReader}
-
-import scala.compat.Platform.currentTime
-import scala.remoting.Debug, Debug._
-
-trait ServerConsole extends Thread {
-  private val startTime = currentTime
-  actors.Debug.level = // e.g. 3 // info+warning+error
-    try { System.getProperty("scala.actors.logLevel", "0").toInt }
-    catch { case e => 0 }
-
-  start()
-
-  val serverClassLoader = {
-    import java.rmi.server.RMIClassLoader
-    val codebase = System.getProperty("java.rmi.server.codebase")
-    info("[ServerConsole] codebase="+codebase)
-    RMIClassLoader getClassLoader codebase
-  }
-
-  private var isTerminated = false
-
-  def terminate() { isTerminated = false }
-
-  def isRunning = !isTerminated
-
-  override def run() {
-    val in = new BufferedReader(new InputStreamReader(System.in))
-    var quit = false
-    while (!quit) {
-      val args = getArgs(in)
-      if (args contains "quit")
-        quit = true
-      if (args contains "cls") {
-        println(ERASE_SCREEN)
-        println(CURSOR_HOME)
-      }
-      if (args contains "warning")
-        Debug.level = Level.WARNING
-      if (args contains "info")
-        Debug.level = Level.INFO
-      if (args contains "silent")
-        Debug.level = Level.SILENT
-    }
-    terminate()
-    println("Server exited ("+mkTimeString(currentTime - startTime)+")")
-    sys.exit(0)
-  }
-
-  protected def trace(msg: String) {
-    Debug.info("[ServerConsole.trace] "+msg)
-  }
-
-  private def getArgs(in: BufferedReader): List[String] = {
-    val input = try { in.readLine() } catch { case _ => null }
-    if (input != null) (input.trim split "\\s+").toList else Nil
-  }
-
-  private def mkTimeString(time: Long): String = {
-    def twoDigits(i: Long) = (if (i < 10) "0" else "")+i
-    val sec = time / 1000
-    val min = sec / 60
-    val h = min / 60
-    twoDigits(h) +":"+
-    twoDigits(min - h * 60)+":"+
-    twoDigits(sec - min * 60)
-  }
-
-  private val ERASE_SCREEN = "\033[2J"
-  private val CURSOR_HOME  = "\033[H"
-}
diff --git a/test/files/detach-run/actor/actor.flags b/test/files/detach-run/actor/actor.flags
deleted file mode 100644
index 55eed8bbcd..0000000000
--- a/test/files/detach-run/actor/actor.flags
+++ /dev/null
@@ -1 +0,0 @@
--Xpluginsdir ../../../../build/pack/misc/scala-devel/plugins -Xplugin-require:detach -P:detach:enable
diff --git a/test/files/detach-run/actor/actor.scala b/test/files/detach-run/actor/actor.scala
deleted file mode 100644
index 23a10d6982..0000000000
--- a/test/files/detach-run/actor/actor.scala
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- *  @author Stephane Micheloud
- */
-
-object Test {
-
-  val name = "actor"
-  val host = "127.0.0.1"
-  val port = 8889
-
-  def main(args: Array[String]) {
-    setenv()
-    println("Server.main "+port)
-    Server.main(Array(port.toString))
-    println("Client.main "+host+" "+port)
-    Client.main(Array(host, port.toString))
-    Server.terminate()
-  }
-
-  private def setenv() {
-    import Env._
-
-    // Java properties for server & client
-    System.setProperty("scala.actors.logLevel", actors_logLevel)
-    System.setProperty("scala.remoting.logLevel", logLevel)
-    System.setProperty("java.security.manager", "")
-    System.setProperty("java.security.policy", policyFile)
-    // Java properties for server only
-    System.setProperty("java.rmi.server.codebase", deployUrl)
-    System.setProperty("java.rmi.server.hostname", host)
-    System.setProperty("java.rmi.server.useCodebaseOnly", "true")
-
-    // application-specific classes to be deployed and accessed via URL
-    // (i.e. detached closure, proxy interfaces and proxy stubs)
-    val classNames = List(
-      "$anonfun$main$1$proxy",
-      "$anonfun$main$1$proxyImpl_Stub",
-      "Bar$proxy",
-      "Bar$proxyImpl_Stub",
-      "Client$$anonfun$main$1$$anonfun$apply$1$detach",
-      "Client$proxy",
-      "Client$proxyImpl_Stub",
-      "Foo$proxy",
-      "Foo$proxyImpl_Stub")
-
-    val proxyImplNames =
-      for (n <- classNames; i = n lastIndexOf "_Stub"; if i > 0)
-      yield n.substring(0, i)
-
-    generatePolicyFile()
-    generateRmiStubs(proxyImplNames)
-    generateJarFile(classNames)
-  }
-}
-
-object Env {
-  import java.io._, java.util.jar._
-
-  val actors_logLevel = "0"
-                   // = "3" // info+warning+error
-  val logLevel = "silent"
-            // = "info"     // debug user code only
-            // = "info,lib" // debug user & library code
-
-  // we assume an Apache server is running locally for deployment
-  private val sep = File.separator
-  val docPath = System.getProperty("user.home")+sep+"public_html"
-  val docRoot = "http://127.0.0.1/~"+System.getProperty("user.name")
-
-  private val policyTmpl =
-    System.getProperty("partest.cwd")+sep+Test.name+sep+"java.policy"
-  val outPath = System.getProperty("partest.output")
-  val libPath = System.getProperty("partest.lib")
-  val policyFile = outPath+sep+"java.policy"
-  val codebaseDir = outPath+sep+"-"
-
-  assert((new File(docPath)).isDirectory,
-         "Root directory \""+docPath+"\" not found")
-  val deployJar = docPath+sep+Test.name+"_deploy.jar"
-  val deployUrl = docRoot+"/"+Test.name+"_deploy.jar"
-
-  def generatePolicyFile() {
-    val in = new BufferedReader(new FileReader(policyTmpl))
-    val out = new PrintWriter(new BufferedWriter(new FileWriter(policyFile)))
-    var line = in.readLine()
-    while (line != null) {
-      val line1 = line.replaceAll("@PROJECT_LIB_BASE@", codebaseDir)
-      out.println(line1)
-      line = in.readLine()
-    }
-    in.close()
-    out.close()
-  }
-
-  def generateRmiStubs(classNames: List[String]) {
-    val options = List(
-      "-v1.2",
-      "-classpath "+libPath+File.pathSeparator+outPath,
-      "-d "+outPath)
-    rmic(options, classNames)
-    //ls(outPath)
-  }
-
-  def generateJarFile(classNames: List[String]) {
-    val out = new JarOutputStream(new FileOutputStream(deployJar))
-    classNames foreach (name => try {
-      val classFile = name+".class"
-      val in = new FileInputStream(outPath+sep+classFile)
-      out putNextEntry new JarEntry(classFile)
-      val buf = new Array[Byte](512)
-      var len = in read buf
-      while (len != -1) {
-        out.write(buf, 0, len)
-        len = in read buf
-      }
-      in.close()
-    } catch {
-      case e: FileNotFoundException => println(e)   
-    })
-    out.close()
-  }
-
-  private def ls(path: String) { exec("ls -al "+path) }
-
-  private def rmic(options: List[String], classNames: List[String]) {
-    val javaHome = scala.util.Properties.javaHome
-    val jdkHome =
-      if (javaHome endsWith "jre") javaHome.substring(0, javaHome.length-4)
-      else javaHome
-    val rmicExt = if (scala.util.Properties.isWin) ".exe" else ""
-    val rmicCmd = jdkHome+sep+"bin"+sep+"rmic"+rmicExt
-    val cmdLine = rmicCmd+options.mkString(" ", " ", "")+
-                          classNames.mkString(" "," ","")
-    // println(cmdLine)
-    exec(cmdLine)
-  }
-
-  private def exec(command: String) {
-    val proc = Runtime.getRuntime exec command
-    proc.waitFor()
-    val out = new BufferedReader(new InputStreamReader(proc.getInputStream))
-    var line = out.readLine()
-    while (line != null) {
-      println(line)
-      line = out.readLine()
-    }
-    out.close()
-    val err = new BufferedReader(new InputStreamReader(proc.getErrorStream))
-    line = err.readLine()
-    while (line != null) {
-      println(line)
-      line = err.readLine()
-    }
-    err.close()
-  }
-}
-
diff --git a/test/files/detach-run/actor/java.policy b/test/files/detach-run/actor/java.policy
deleted file mode 100644
index b305f10b4c..0000000000
--- a/test/files/detach-run/actor/java.policy
+++ /dev/null
@@ -1,25 +0,0 @@
-// See http://java.sun.com/javase/6/docs/technotes/guides/security/permissions.html
-// See http://mindprod.com/jgloss/policyfile.html
-// The policy expands ${/} to the correct path or folder delimiter on your host platform.
-
-// Actions available with SocketPermission: accept, connect, listen, resolve
-// 1) The "resolve" action is implied when any of the other actions are present.
-// 2) The "listen" action is only meaningful when used with "localhost".
-
-grant {
-    permission java.net.SocketPermission "*:80", "connect,accept,listen";
-    permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-    permission java.util.PropertyPermission "scala.remoting.logLevel", "read";
-    permission java.util.PropertyPermission "scala.remoting.port", "read";
-};
-
-grant codeBase "@PROJECT_LIB_BASE@" {
-    permission java.lang.RuntimePermission "getClassLoader";
-    permission java.util.PropertyPermission "java.rmi.server.codebase", "read";
-    permission java.util.PropertyPermission "java.rmi.server.hostname", "read";
-    permission java.util.PropertyPermission "sun.rmi.dgc.server.gcInterval", "read,write";
-};
-
-//grant {
-//    permission java.security.AllPermission;
-//};
diff --git a/test/files/detach-run/basic-run.check b/test/files/detach-run/basic-run.check
deleted file mode 100644
index 6463d97497..0000000000
--- a/test/files/detach-run/basic-run.check
+++ /dev/null
@@ -1,5 +0,0 @@
-Server.main 8889
-> Client.main 127.0.0.1 8889
-yInstVal = 10
-zLocVal = 1000
-result received: 11111
diff --git a/test/files/detach-run/basic/Client.scala b/test/files/detach-run/basic/Client.scala
deleted file mode 100644
index f8eddb041d..0000000000
--- a/test/files/detach-run/basic/Client.scala
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- *  @author Stephane Micheloud
- */
-
-import java.net._, Thread._, ClientHelper._
-import scala.remoting._, Debug._
-
-object Foo {
-  def trace(s: String) { info("[Foo.trace] "+s)}
-}
-object Client {
-  val yInstVal: Int = 10
-  var yInstVar: Int = 99
-  object Bar {
-    def trace(s: String) { info("[Bar.trace] "+s) }
-  }
-  def main(args: Array[String]) {
-    init(args)
-    val server = new Channel(host, port)
-    val zLocVal: Int = 1000
-    var zLocVar: Int = 9998
-    server ! detach(
-      (x: Int) => {
-        println("yInstVal = "+yInstVal)
-        this.trace("yInstVar = "+yInstVar)
-        Bar.trace("zLocVal = "+zLocVal)
-        Foo.trace("zLocVar = "+zLocVar)
-        zLocVar += 2
-        System.out.println("zLocVal = "+zLocVal)
-        Debug.info("zLocVar = "+zLocVar)
-        x + yInstVal + yInstVar + zLocVal + zLocVar
-      })
-    val result = server.receiveInt
-    println("result received: " + result)
-  }
-  private def trace(s: String) { info("[Client.trace] "+s) }
-}
-
-object ClientHelper {
-  private var _host = "127.0.0.1"
-  private var _port = 8888
-  def host = _host
-  def port = _port
-  def init(args: Array[String]) {
-    try { _host = args(0) } catch { case _ => }
-    try { _port = args(1).toInt } catch { case _ => }
-  }
-}
diff --git a/test/files/detach-run/basic/Server.scala b/test/files/detach-run/basic/Server.scala
deleted file mode 100644
index f8aa02a4ba..0000000000
--- a/test/files/detach-run/basic/Server.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  @author Stephane Micheloud
- */
-
-import scala.remoting.ServerChannel
-
-object Server extends ServerConsole {
-  private def computation(f: Int => Int): Int = {
-    //some time-consuming task
-    f(2)
-  }
-  def main(args: Array[String]) {
-    val server = new ServerChannel(args(0).toInt)
-    loop {
-      val client = server.accept
-      val f = client.receive[Int => Int]
-      val result = computation(f)
-      client ! result
-    }
-    server.close()
-  }
-}
diff --git a/test/files/detach-run/basic/ServerConsole.scala b/test/files/detach-run/basic/ServerConsole.scala
deleted file mode 100644
index 65b81c0ca1..0000000000
--- a/test/files/detach-run/basic/ServerConsole.scala
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- *  @author Stephane Micheloud
- */
-
-import java.io._
-
-import scala.compat.Platform.currentTime
-import scala.remoting.Debug, Debug._
-
-trait ServerConsole extends Thread {
-  private val startTime = currentTime
-
-  start()
-
-  private var isTerminated = false
-
-  def terminate() { isTerminated = true }
-
-  protected def loop(block: => Unit) {
-    while (!isTerminated) {
-      try {
-        block
-      }
-      catch {
-        case e: ObjectStreamException =>
-          trace("Object stream error ("+e.getMessage+")")
-        case e: EOFException =>
-          trace("Connection lost")
-        case e: ClassNotFoundException =>
-          trace("Class not found")
-        case e =>
-          trace("Server error: "+e)
-      }
-    }
-  }
-
-  override def run() {
-    val in = new BufferedReader(new InputStreamReader(System.in))
-    var quit = false
-    while (!quit) {
-      val args = getArgs(in)
-      if (args contains "quit")
-        quit = true
-      if (args contains "cls") {
-        println(ERASE_SCREEN)
-        println(CURSOR_HOME)
-      }
-      if (args contains "warning")
-        Debug.level = Level.WARNING
-      if (args contains "info")
-        Debug.level = Level.INFO
-      if (args contains "silent")
-        Debug.level = Level.SILENT
-    }
-    terminate()
-    println("Server exited ("+mkTimeString(currentTime - startTime)+")")
-    exit(0)
-
-  }
-
-  protected def trace(msg: String) {
-    Debug.info("[ServerConsole.trace] "+msg)
-  }
-
-  private def getArgs(in: BufferedReader): List[String] = {
-    print("> ")
-    val input = try { in.readLine() } catch { case _ => null }
-    if (input != null) (input.trim split "\\s+").toList else Nil
-  }
-
-  private def mkTimeString(time: Long): String = {
-    def twoDigits(i: Long) = (if (i < 10) "0" else "")+i
-    val sec = time / 1000
-    val min = sec / 60
-    val h = min / 60
-    twoDigits(h) +":"+
-    twoDigits(min - h * 60)+":"+
-    twoDigits(sec - min * 60)
-  }
-
-  private val ERASE_SCREEN = "\033[2J"
-  private val CURSOR_HOME  = "\033[H"
-}
diff --git a/test/files/detach-run/basic/basic.flags b/test/files/detach-run/basic/basic.flags
deleted file mode 100644
index 55eed8bbcd..0000000000
--- a/test/files/detach-run/basic/basic.flags
+++ /dev/null
@@ -1 +0,0 @@
--Xpluginsdir ../../../../build/pack/misc/scala-devel/plugins -Xplugin-require:detach -P:detach:enable
diff --git a/test/files/detach-run/basic/basic.scala b/test/files/detach-run/basic/basic.scala
deleted file mode 100644
index 4d0fc2d933..0000000000
--- a/test/files/detach-run/basic/basic.scala
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- *  @author Stephane Micheloud
- */
-
-object Test {
-
-  val name = "basic"
-  val host = "127.0.0.1"
-  val port = 8889
-
-  def main(args: Array[String]) {
-    setenv()
-    println("Server.main "+port)
-    server.start()
-    println("Client.main "+host+" "+port)
-    client.start()
-    server.terminate()
-  }
-
-  private var server = new ServerThread(port)
-  private var client = new ClientThread(host, port)
-
-  private class ServerThread(port: Int) extends Runnable {
-    private var th = new Thread(this)
-    def start() { th.start(); Thread.sleep(1000) }
-    def run() { Server.main(Array(port.toString)) }
-    def terminate() { Server.terminate(); sys.exit(0) }
-  }
-
-  private class ClientThread(host: String, port: Int) extends Runnable {
-    private var th = new Thread(this)
-    def start() { th.start(); th.join() }
-    def run() { Client.main(Array(host, port.toString)) }
-  }
-
-  private def setenv() {
-    import Env._
-
-    // Java properties for server & client
-    System.setProperty("scala.remoting.logLevel", logLevel)
-    System.setProperty("java.security.manager", "")
-    System.setProperty("java.security.policy", policyFile)
-    // Java properties for server only
-    System.setProperty("java.rmi.server.codebase", deployUrl)
-    System.setProperty("java.rmi.server.hostname", host)
-    System.setProperty("java.rmi.server.useCodebaseOnly", "true")
-
-    // application-secific classes to be deployed and accessed via URL
-    // (i.e. detached closure, proxy interfaces and proxy stubs)
-    val classNames = List(
-      "Bar$proxy",
-      "Bar$proxyImpl_Stub",
-      "Client$$anonfun$main$1$detach",
-      "Client$proxy",
-      "Client$proxyImpl_Stub",
-      "Foo$proxy",
-      "Foo$proxyImpl_Stub")
-
-    val proxyImplNames =
-      for (n <- classNames; i = n lastIndexOf "_Stub"; if i > 0)
-      yield n.substring(0, i)
-
-    generatePolicyFile()
-    generateRmiStubs(proxyImplNames)
-    generateJarFile(classNames)
-  }
-}
-
-object Env {
-  import java.io._, java.util.jar._
-
-  val actors_logLevel = "0"
-                   // = "3" // info+warning+error
-  val logLevel = "silent"
-            // = "info"     // debug user code only
-            // = "info,lib" // debug user & library code
-
-  // we assume an Apache server is running locally for deployment
-  private val sep = File.separator
-  val docPath = System.getProperty("user.home")+sep+"public_html"
-  val docRoot = "http://127.0.0.1/~"+System.getProperty("user.name")
-
-  private val policyTmpl =
-    System.getProperty("partest.cwd")+sep+Test.name+sep+"java.policy"
-  val outPath = System.getProperty("partest.output")
-  val libPath = System.getProperty("partest.lib")
-  val policyFile = outPath+sep+"java.policy"
-  val codebaseDir = outPath+sep+"-"
-
-  assert((new File(docPath)).isDirectory,
-         "Root directory \""+docPath+"\" not found")
-  val deployJar = docPath+sep+Test.name+"_deploy.jar"
-  val deployUrl = docRoot+"/"+Test.name+"_deploy.jar"
-
-  def generatePolicyFile() {
-    val in = new BufferedReader(new FileReader(policyTmpl))
-    val out = new PrintWriter(new BufferedWriter(new FileWriter(policyFile)))
-    var line = in.readLine()
-    while (line != null) {
-      val line1 = line.replaceAll("@PROJECT_LIB_BASE@", codebaseDir)
-      out.println(line1)
-      line = in.readLine()
-    }
-    in.close()
-    out.close()
-  }
-
-  def generateRmiStubs(classNames: List[String]) {
-    val options = List(
-      "-v1.2",
-      "-classpath "+libPath+File.pathSeparator+outPath,
-      "-d "+outPath)
-    rmic(options, classNames)
-    //ls(outPath)
-  }
-
-  def generateJarFile(classNames: List[String]) {
-    val out = new JarOutputStream(new FileOutputStream(deployJar))
-    classNames foreach (name => try {
-      val classFile = name+".class"
-      val in = new FileInputStream(outPath+sep+classFile)
-      out putNextEntry new JarEntry(classFile)
-      val buf = new Array[Byte](512)
-      var len = in read buf
-      while (len != -1) {
-        out.write(buf, 0, len)
-        len = in read buf
-      }
-      in.close()
-    } catch {
-      case e: FileNotFoundException => println(e)
-    })
-    out.close()
-  }
-
-  private def ls(path: String) { exec("ls -al "+path) }
-
-  private def rmic(options: List[String], classNames: List[String]) {
-    val javaHome = scala.util.Properties.javaHome
-    val jdkHome =
-      if (javaHome endsWith "jre") javaHome.substring(0, javaHome.length-4)
-      else javaHome
-    val rmicExt = if (scala.util.Properties.isWin) ".exe" else ""
-    val rmicCmd = jdkHome+sep+"bin"+sep+"rmic"+rmicExt
-    val cmdLine = rmicCmd+options.mkString(" ", " ", "")+
-                          classNames.mkString(" "," ","")
-    // println(cmdLine)
-    exec(cmdLine)
-  }
-
-  private def exec(command: String) {
-    val proc = Runtime.getRuntime exec command
-    proc.waitFor()
-    val out = new BufferedReader(new InputStreamReader(proc.getInputStream))
-    var line = out.readLine()
-    while (line != null) {
-      println(line)
-      line = out.readLine()
-    }
-    out.close()
-    val err = new BufferedReader(new InputStreamReader(proc.getErrorStream))
-    line = err.readLine()
-    while (line != null) {
-      println(line)
-      line = err.readLine()
-    }
-    err.close()
-  }
-}
diff --git a/test/files/detach-run/basic/java.policy b/test/files/detach-run/basic/java.policy
deleted file mode 100644
index 92c1045c3d..0000000000
--- a/test/files/detach-run/basic/java.policy
+++ /dev/null
@@ -1,26 +0,0 @@
-// See http://java.sun.com/javase/6/docs/technotes/guides/security/permissions.html
-// See http://mindprod.com/jgloss/policyfile.html
-// The policy expands ${/} to the correct path or folder delimiter on your host platform.
-
-// Actions available with SocketPermission: accept, connect, listen, resolve
-// 1) The "resolve" action is implied when any of the other actions are present.
-// 2) The "listen" action is only meaningful when used with "localhost".
-
-grant {
-    permission java.net.SocketPermission "*:80", "connect,accept,listen";
-    permission java.net.SocketPermission "*:1024-", "connect,accept,listen";
-    permission java.util.PropertyPermission "scala.remoting.logLevel", "read";
-    permission java.util.PropertyPermission "scala.remoting.port", "read";
-};
-
-grant codeBase "@PROJECT_LIB_BASE@" {
-    permission java.lang.RuntimePermission "getClassLoader";
-    permission java.lang.RuntimePermission "createClassLoader";
-    permission java.util.PropertyPermission "java.rmi.server.codebase", "read";
-    permission java.util.PropertyPermission "java.rmi.server.hostname", "read";
-    permission java.util.PropertyPermission "sun.rmi.dgc.server.gcInterval", "read,write";
-};
-
-//grant {
-//    permission java.security.AllPermission;
-//};