diff options
author | michelou <michelou@epfl.ch> | 2006-04-25 15:38:45 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-04-25 15:38:45 +0000 |
commit | ffa1aaad1bd80bc251ba3e60b34a600beddb2d35 (patch) | |
tree | 70bffe928dbba99ca053357586e0eb77dc66d6cd /test/files/cli | |
parent | 2313191913d6d0af36eb397c8882ff3953fa9f94 (diff) | |
download | scala-ffa1aaad1bd80bc251ba3e60b34a600beddb2d35.tar.gz scala-ffa1aaad1bd80bc251ba3e60b34a600beddb2d35.tar.bz2 scala-ffa1aaad1bd80bc251ba3e60b34a600beddb2d35.zip |
improved script test/clitest
Diffstat (limited to 'test/files/cli')
-rw-r--r-- | test/files/cli/test1/Main.java | 1 | ||||
-rw-r--r-- | test/files/cli/test1/Main.scala | 1 | ||||
-rw-r--r-- | test/files/cli/test2/Main.check.javac5 | 2 | ||||
-rw-r--r-- | test/files/cli/test2/Main.check.jikes | 2 | ||||
-rw-r--r-- | test/files/cli/test2/Main.java | 1 | ||||
-rw-r--r-- | test/files/cli/test2/Main.scala | 1 | ||||
-rw-r--r-- | test/files/cli/test3/Main.check.javac5 | 4 | ||||
-rw-r--r-- | test/files/cli/test3/Main.check.jikes | 4 | ||||
-rw-r--r-- | test/files/cli/test3/Main.java | 1 | ||||
-rw-r--r-- | test/files/cli/test3/Main.scala | 1 |
10 files changed, 12 insertions, 6 deletions
diff --git a/test/files/cli/test1/Main.java b/test/files/cli/test1/Main.java index 11d50255dd..14e94cb4c5 100644 --- a/test/files/cli/test1/Main.java +++ b/test/files/cli/test1/Main.java @@ -1,3 +1,4 @@ +// @info no dependency package test1; public class Main { public static void main(String args[]) { diff --git a/test/files/cli/test1/Main.scala b/test/files/cli/test1/Main.scala index 885651e0ee..8a4da2d0ab 100644 --- a/test/files/cli/test1/Main.scala +++ b/test/files/cli/test1/Main.scala @@ -1,3 +1,4 @@ +// @info no dependency package test1 object Main { def main(args: Array[String]) = { diff --git a/test/files/cli/test2/Main.check.javac5 b/test/files/cli/test2/Main.check.javac5 index 52bb3a06e3..0ac32b056e 100644 --- a/test/files/cli/test2/Main.check.javac5 +++ b/test/files/cli/test2/Main.check.javac5 @@ -22,7 +22,7 @@ where possible options include: -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 +files/cli/test2/Main.java:6: package test1 does not exist test1.Main.main(args); ^ 1 error diff --git a/test/files/cli/test2/Main.check.jikes b/test/files/cli/test2/Main.check.jikes index 44131b22c2..97943e8347 100644 --- a/test/files/cli/test2/Main.check.jikes +++ b/test/files/cli/test2/Main.check.jikes @@ -4,6 +4,6 @@ For more help, try -help or -version. Found 1 semantic error compiling "files/cli/test2/Main.java": - 5. test1.Main.main(args); + 6. test1.Main.main(args); ^---^ *** Semantic Error: No accessible field named "test1" was found in type "test2.Main". diff --git a/test/files/cli/test2/Main.java b/test/files/cli/test2/Main.java index 808fdd7cda..f6797632bf 100644 --- a/test/files/cli/test2/Main.java +++ b/test/files/cli/test2/Main.java @@ -1,3 +1,4 @@ +// @info 1 dependency package test2; public class Main { public static void main(String args[]) { diff --git a/test/files/cli/test2/Main.scala b/test/files/cli/test2/Main.scala index 7c7f4fd86e..1d43759fdf 100644 --- a/test/files/cli/test2/Main.scala +++ b/test/files/cli/test2/Main.scala @@ -1,3 +1,4 @@ +// @info 1 dependency package test2 object Main { def main(args: Array[String]) = { diff --git a/test/files/cli/test3/Main.check.javac5 b/test/files/cli/test3/Main.check.javac5 index 2a5d233989..3a48fa000e 100644 --- a/test/files/cli/test3/Main.check.javac5 +++ b/test/files/cli/test3/Main.check.javac5 @@ -22,10 +22,10 @@ where possible options include: -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 +files/cli/test3/Main.java:6: package test1 does not exist test1.Main.main(args); ^ -files/cli/test3/Main.java:7: package test2 does not exist +files/cli/test3/Main.java:8: package test2 does not exist test2.Main.main(args); ^ 2 errors diff --git a/test/files/cli/test3/Main.check.jikes b/test/files/cli/test3/Main.check.jikes index d183a014d9..604333e81a 100644 --- a/test/files/cli/test3/Main.check.jikes +++ b/test/files/cli/test3/Main.check.jikes @@ -4,11 +4,11 @@ For more help, try -help or -version. Found 2 semantic errors compiling "files/cli/test3/Main.java": - 5. test1.Main.main(args); + 6. test1.Main.main(args); ^---^ *** Semantic Error: No accessible field named "test1" was found in type "test3.Main". - 7. test2.Main.main(args); + 8. test2.Main.main(args); ^---^ *** Semantic Error: No accessible field named "test2" was found in type "test3.Main". diff --git a/test/files/cli/test3/Main.java b/test/files/cli/test3/Main.java index 41cafefa55..89800b43d2 100644 --- a/test/files/cli/test3/Main.java +++ b/test/files/cli/test3/Main.java @@ -1,3 +1,4 @@ +// @info 2 dependency package test3; public class Main { public static void main(String args[]) { diff --git a/test/files/cli/test3/Main.scala b/test/files/cli/test3/Main.scala index 2d38e438f6..c97e18c249 100644 --- a/test/files/cli/test3/Main.scala +++ b/test/files/cli/test3/Main.scala @@ -1,3 +1,4 @@ +// @info 2 dependencies package test3 object Main { def main(args: Array[String]) = { |