Corrected a bunch of problems with the clitest ...

Corrected a bunch of problems with the clitest script. All test cases
should now pass.

10 files changed, 40 insertions, 103 deletions

diff --git a/test/clitest b/test/clitest
index 046473566e..d01e235f77 100755
--- a/test/clitest
+++ b/test/clitest
@@ -225,8 +225,8 @@ test_interpret() {
     printf "\\n" >> $LOG_FILE  # newline
 
     printf "Interpret $main with variable CLASSPATH\\n"
-    test_run "(env CLASSPATH=$OUTPUT_DIR \
-        printf $main'.main(Array(\"1\"))\n:q' | $INTERPRETER_COMMAND \
+    test_run "(printf $main'.main(Array(\"1\"))\n:q' \
+        | env CLASSPATH=$OUTPUT_DIR $INTERPRETER_COMMAND \
         2>> $LOG_FILE 1>> $LOG_FILE)";
     printf "\\n" >> $LOG_FILE  # newline
 
diff --git a/test/files/cli/test1/Main.check.scala_j9 b/test/files/cli/test1/Main.check.scala_j9
index 408327e1e7..65d5ddaac4 100644
--- a/test/files/cli/test1/Main.check.scala_j9
+++ b/test/files/cli/test1/Main.check.scala_j9
@@ -1,36 +1,15 @@
-JVMJ9VM007E Command-line option unrecognised: -cpp
-Could not create the Java virtual machine.
+unknown option: '-cpp'
+scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
 
-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
+<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 (4)
+1: test 4 passed (2)
diff --git a/test/files/cli/test1/Main.check.scalac b/test/files/cli/test1/Main.check.scalac
index 347d69a5bd..c1ef09b436 100644
--- a/test/files/cli/test1/Main.check.scalac
+++ b/test/files/cli/test1/Main.check.scalac
@@ -44,7 +44,7 @@ where possible options include:
   -Xshowobj <object>              Show object info
   -Xshowicode                     Print the generated ICode
   -Xgadt                          enable gadt for classes
-  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo)
+  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
   -Xgenerics                      Use generic Java types
 
 one error found
diff --git a/test/files/cli/test1/Main.check.scalaint b/test/files/cli/test1/Main.check.scalaint
index dfbecc873a..78ea0a424e 100644
--- a/test/files/cli/test1/Main.check.scalaint
+++ b/test/files/cli/test1/Main.check.scalaint
@@ -43,7 +43,7 @@ where possible options include:
   -Xshowobj <object>              Show object info
   -Xshowicode                     Print the generated ICode
   -Xgadt                          enable gadt for classes
-  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo)
+  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
   -Xgenerics                      Use generic Java types
 
 
@@ -55,7 +55,7 @@ Type :load followed by a filename to load a sequence of interpreter commands.
 Type :replay to reset execution and replay all previous commands.
 Type :help to repeat this message later.
 
-scala> 1: test 1 passed
+scala> 1: test 1 passed (1)
 line0: scala.Unit = ()
 
 scala> 
diff --git a/test/files/cli/test2/Main.check.scala_j9 b/test/files/cli/test2/Main.check.scala_j9
index 8e05719831..80cbb50fa9 100644
--- a/test/files/cli/test2/Main.check.scala_j9
+++ b/test/files/cli/test2/Main.check.scala_j9
@@ -1,36 +1,15 @@
-JVMJ9VM007E Command-line option unrecognised: -cpp
-Could not create the Java virtual machine.
+unknown option: '-cpp'
+scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
 
-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
+<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 (4)
+2: 1: test 4 passed (2)
diff --git a/test/files/cli/test2/Main.check.scalac b/test/files/cli/test2/Main.check.scalac
index 347d69a5bd..c1ef09b436 100644
--- a/test/files/cli/test2/Main.check.scalac
+++ b/test/files/cli/test2/Main.check.scalac
@@ -44,7 +44,7 @@ where possible options include:
   -Xshowobj <object>              Show object info
   -Xshowicode                     Print the generated ICode
   -Xgadt                          enable gadt for classes
-  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo)
+  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
   -Xgenerics                      Use generic Java types
 
 one error found
diff --git a/test/files/cli/test2/Main.check.scalaint b/test/files/cli/test2/Main.check.scalaint
index 5e8bba8f28..e9f2bc743d 100644
--- a/test/files/cli/test2/Main.check.scalaint
+++ b/test/files/cli/test2/Main.check.scalaint
@@ -43,7 +43,7 @@ where possible options include:
   -Xshowobj <object>              Show object info
   -Xshowicode                     Print the generated ICode
   -Xgadt                          enable gadt for classes
-  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo)
+  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
   -Xgenerics                      Use generic Java types
 
 
diff --git a/test/files/cli/test3/Main.check.scala_j9 b/test/files/cli/test3/Main.check.scala_j9
index 5ffe43d57a..3804c17636 100644
--- a/test/files/cli/test3/Main.check.scala_j9
+++ b/test/files/cli/test3/Main.check.scala_j9
@@ -1,34 +1,13 @@
-JVMJ9VM007E Command-line option unrecognised: -cpp
-Could not create the Java virtual machine.
+unknown option: '-cpp'
+scala [ <compiler-option> | -howtorun:how ]... [<torun> <arguments>]
 
-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
+<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)
@@ -36,5 +15,5 @@ where options include:
 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 (4)
-3: 2: 1: test 4 passed (4)
+3: 1: test 4 passed (2)
+3: 2: 1: test 4 passed (2)
diff --git a/test/files/cli/test3/Main.check.scalac b/test/files/cli/test3/Main.check.scalac
index 347d69a5bd..c1ef09b436 100644
--- a/test/files/cli/test3/Main.check.scalac
+++ b/test/files/cli/test3/Main.check.scalac
@@ -44,7 +44,7 @@ where possible options include:
   -Xshowobj <object>              Show object info
   -Xshowicode                     Print the generated ICode
   -Xgadt                          enable gadt for classes
-  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo)
+  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
   -Xgenerics                      Use generic Java types
 
 one error found
diff --git a/test/files/cli/test3/Main.check.scalaint b/test/files/cli/test3/Main.check.scalaint
index 6d75140c16..ac14f5f315 100644
--- a/test/files/cli/test3/Main.check.scalaint
+++ b/test/files/cli/test3/Main.check.scalaint
@@ -43,7 +43,7 @@ where possible options include:
   -Xshowobj <object>              Show object info
   -Xshowicode                     Print the generated ICode
   -Xgadt                          enable gadt for classes
-  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo)
+  -Xlinearizer:<Xlinearizer>      Linearizer to use (normal,dfs,rpo,dump)
   -Xgenerics                      Use generic Java types