diff options
author | michelou <michelou@epfl.ch> | 2006-04-24 15:15:56 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-04-24 15:15:56 +0000 |
commit | 1819fb81bfb65e97acce6d45eda237735c65b01c (patch) | |
tree | d8c42a502d618939364a9a5197e69d7b3edbc24c /test/files | |
parent | 78d3bf33640987c825fa97f11f19919b1bca6dde (diff) | |
download | scala-1819fb81bfb65e97acce6d45eda237735c65b01c.tar.gz scala-1819fb81bfb65e97acce6d45eda237735c65b01c.tar.bz2 scala-1819fb81bfb65e97acce6d45eda237735c65b01c.zip |
corrected errors in script test/clitest
added cli tests to package 'scala-test'
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/cli/test1/Main.check.java5 | 5 | ||||
-rw-r--r-- | test/files/cli/test1/Main.check.javac6 | 29 | ||||
-rw-r--r-- | test/files/cli/test2/Main.check.java5 | 5 | ||||
-rw-r--r-- | test/files/cli/test2/Main.check.javac5 | 4 | ||||
-rw-r--r-- | test/files/cli/test2/Main.check.javac6 | 33 | ||||
-rw-r--r-- | test/files/cli/test3/Main.check.java5 | 8 | ||||
-rw-r--r-- | test/files/cli/test3/Main.check.javac5 | 7 | ||||
-rw-r--r-- | test/files/cli/test3/Main.check.javac6 | 36 |
8 files changed, 116 insertions, 11 deletions
diff --git a/test/files/cli/test1/Main.check.java5 b/test/files/cli/test1/Main.check.java5 new file mode 100644 index 0000000000..12cf928e58 --- /dev/null +++ b/test/files/cli/test1/Main.check.java5 @@ -0,0 +1,5 @@ +Unrecognized option: -cpp +Could not create the Java virtual machine. +1: test 1 passed +1: test 2 passed +1: test 3 passed diff --git a/test/files/cli/test1/Main.check.javac6 b/test/files/cli/test1/Main.check.javac6 new file mode 100644 index 0000000000..8f37a05bcb --- /dev/null +++ b/test/files/cli/test1/Main.check.javac6 @@ -0,0 +1,29 @@ +javac: invalid flag: -dd +Usage: javac <options> <source files> +where possible options include: + -g Generate all debugging info + -g:none Generate no debugging info + -g:{lines,vars,source} Generate only some debugging info + -nowarn Generate no warnings + -verbose Output messages about what the compiler is doing + -deprecation Output source locations where deprecated APIs are used + -classpath <path> Specify where to find user class files and annotation processors + -cp <path> Specify where to find user class files and annotation processors + -sourcepath <path> Specify where to find input source files + -bootclasspath <path> Override location of bootstrap class files + -extdirs <dirs> Override location of installed extensions + -endorseddirs <dirs> Override location of endorsed standards path + -proc:{none, only} Control whether annotation processing and/or compilation is done. + -processor <class> Name of the annotation processor to run; bypasses default discovery process + -processorpath <path> Specify where to find annotation processors + -d <directory> Specify where to place generated class files + -s <directory> Specify where to place generated source files + -encoding <encoding> Specify character encoding used by source files + -source <release> Provide source compatibility with specified release + -target <release> Generate class files for specific VM version + -version Version information + -help Print a synopsis of standard options + -A[key[=value]] Options to pass to annotation processors + -X Print a synopsis of nonstandard options + -J<flag> Pass <flag> directly to the runtime system + diff --git a/test/files/cli/test2/Main.check.java5 b/test/files/cli/test2/Main.check.java5 new file mode 100644 index 0000000000..8929b20b08 --- /dev/null +++ b/test/files/cli/test2/Main.check.java5 @@ -0,0 +1,5 @@ +Unrecognized option: -cpp +Could not create the Java virtual machine. +2: 1: test 1 passed +2: 1: test 2 passed +2: 1: test 3 passed diff --git a/test/files/cli/test2/Main.check.javac5 b/test/files/cli/test2/Main.check.javac5 index d20df8ffe7..52bb3a06e3 100644 --- a/test/files/cli/test2/Main.check.javac5 +++ b/test/files/cli/test2/Main.check.javac5 @@ -26,7 +26,3 @@ files/cli/test2/Main.java:5: package test1 does not exist test1.Main.main(args); ^ 1 error -files/cli/test2/Main.java:5: package test1 does not exist - test1.Main.main(args); - ^ -1 error diff --git a/test/files/cli/test2/Main.check.javac6 b/test/files/cli/test2/Main.check.javac6 new file mode 100644 index 0000000000..350d3253bc --- /dev/null +++ b/test/files/cli/test2/Main.check.javac6 @@ -0,0 +1,33 @@ +javac: invalid flag: -dd +Usage: javac <options> <source files> +where possible options include: + -g Generate all debugging info + -g:none Generate no debugging info + -g:{lines,vars,source} Generate only some debugging info + -nowarn Generate no warnings + -verbose Output messages about what the compiler is doing + -deprecation Output source locations where deprecated APIs are used + -classpath <path> Specify where to find user class files and annotation processors + -cp <path> Specify where to find user class files and annotation processors + -sourcepath <path> Specify where to find input source files + -bootclasspath <path> Override location of bootstrap class files + -extdirs <dirs> Override location of installed extensions + -endorseddirs <dirs> Override location of endorsed standards path + -proc:{none, only} Control whether annotation processing and/or compilation is done. + -processor <class> Name of the annotation processor to run; bypasses default discovery process + -processorpath <path> Specify where to find annotation processors + -d <directory> Specify where to place generated class files + -s <directory> Specify where to place generated source files + -encoding <encoding> Specify character encoding used by source files + -source <release> Provide source compatibility with specified release + -target <release> Generate class files for specific VM version + -version Version information + -help Print a synopsis of standard options + -A[key[=value]] Options to pass to annotation processors + -X Print a synopsis of nonstandard options + -J<flag> Pass <flag> directly to the runtime system + +files/cli/test2/Main.java:5: package test1 does not exist + test1.Main.main(args); + ^ +1 error diff --git a/test/files/cli/test3/Main.check.java5 b/test/files/cli/test3/Main.check.java5 new file mode 100644 index 0000000000..d920b45a05 --- /dev/null +++ b/test/files/cli/test3/Main.check.java5 @@ -0,0 +1,8 @@ +Unrecognized option: -cpp +Could not create the Java virtual machine. +3: 1: test 1 passed +3: 2: 1: test 1 passed +3: 1: test 2 passed +3: 2: 1: test 2 passed +3: 1: test 3 passed +3: 2: 1: test 3 passed diff --git a/test/files/cli/test3/Main.check.javac5 b/test/files/cli/test3/Main.check.javac5 index f97ed7066b..2a5d233989 100644 --- a/test/files/cli/test3/Main.check.javac5 +++ b/test/files/cli/test3/Main.check.javac5 @@ -29,10 +29,3 @@ files/cli/test3/Main.java:7: package test2 does not exist test2.Main.main(args); ^ 2 errors -files/cli/test3/Main.java:5: package test1 does not exist - test1.Main.main(args); - ^ -files/cli/test3/Main.java:7: package test2 does not exist - test2.Main.main(args); - ^ -2 errors diff --git a/test/files/cli/test3/Main.check.javac6 b/test/files/cli/test3/Main.check.javac6 new file mode 100644 index 0000000000..677b950aed --- /dev/null +++ b/test/files/cli/test3/Main.check.javac6 @@ -0,0 +1,36 @@ +javac: invalid flag: -dd +Usage: javac <options> <source files> +where possible options include: + -g Generate all debugging info + -g:none Generate no debugging info + -g:{lines,vars,source} Generate only some debugging info + -nowarn Generate no warnings + -verbose Output messages about what the compiler is doing + -deprecation Output source locations where deprecated APIs are used + -classpath <path> Specify where to find user class files and annotation processors + -cp <path> Specify where to find user class files and annotation processors + -sourcepath <path> Specify where to find input source files + -bootclasspath <path> Override location of bootstrap class files + -extdirs <dirs> Override location of installed extensions + -endorseddirs <dirs> Override location of endorsed standards path + -proc:{none, only} Control whether annotation processing and/or compilation is done. + -processor <class> Name of the annotation processor to run; bypasses default discovery process + -processorpath <path> Specify where to find annotation processors + -d <directory> Specify where to place generated class files + -s <directory> Specify where to place generated source files + -encoding <encoding> Specify character encoding used by source files + -source <release> Provide source compatibility with specified release + -target <release> Generate class files for specific VM version + -version Version information + -help Print a synopsis of standard options + -A[key[=value]] Options to pass to annotation processors + -X Print a synopsis of nonstandard options + -J<flag> Pass <flag> directly to the runtime system + +files/cli/test3/Main.java:5: package test1 does not exist + test1.Main.main(args); + ^ +files/cli/test3/Main.java:7: package test2 does not exist + test2.Main.main(args); + ^ +2 errors |