From c1cc40e97d8a3c373e7f34826fb0047441b4e392 Mon Sep 17 00:00:00 2001
From: Gilles Dubochet <gilles.dubochet@epfl.ch>
Date: Tue, 20 Jun 2006 17:08:24 +0000
Subject: Corrected a bunch of problems with the clitest ...

Corrected a bunch of problems with the clitest script. All test cases
should now pass.
---
 test/files/cli/test3/Main.check.scala_j9 | 43 ++++++++------------------------
 test/files/cli/test3/Main.check.scalac   |  2 +-
 test/files/cli/test3/Main.check.scalaint |  2 +-
 3 files changed, 13 insertions(+), 34 deletions(-)

(limited to 'test/files/cli/test3')

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
 
 
-- 
cgit v1.2.3