summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-04-25 11:25:42 +0000
committermichelou <michelou@epfl.ch>2006-04-25 11:25:42 +0000
commit63f4d5118174a0260316ed4a3be6a8fcc9b487c3 (patch)
tree4c90c790ce8c269b73ece8648e3c3251ba7c4b08 /test
parentbccf5e895879ca3f360e7ac203a9664ba844897b (diff)
downloadscala-63f4d5118174a0260316ed4a3be6a8fcc9b487c3.tar.gz
scala-63f4d5118174a0260316ed4a3be6a8fcc9b487c3.tar.bz2
scala-63f4d5118174a0260316ed4a3be6a8fcc9b487c3.zip
updated 2 check files for script test/clitest
Diffstat (limited to 'test')
-rw-r--r--test/files/cli/test1/Main.scala2
-rw-r--r--test/files/cli/test2/Main.check.scalac4
-rw-r--r--test/files/cli/test3/Main.check.scalac4
3 files changed, 1 insertions, 9 deletions
diff --git a/test/files/cli/test1/Main.scala b/test/files/cli/test1/Main.scala
index 9958d6a54c..885651e0ee 100644
--- a/test/files/cli/test1/Main.scala
+++ b/test/files/cli/test1/Main.scala
@@ -1,7 +1,7 @@
package test1
object Main {
def main(args: Array[String]) = {
- val arg = if (args.length > 0) args(0) else "?"
+ val arg = if (args != null && args.length > 0) args(0) else "?"
Console.println("1: test " + arg + " passed")
}
}
diff --git a/test/files/cli/test2/Main.check.scalac b/test/files/cli/test2/Main.check.scalac
index ab0b5c66da..3f3244da74 100644
--- a/test/files/cli/test2/Main.check.scalac
+++ b/test/files/cli/test2/Main.check.scalac
@@ -46,7 +46,3 @@ where possible options include:
-Xgenerics Use generic Java types
one error found
-files/cli/test2/Main.scala:5 error: not found: value test1
- test1.Main.main(args)
- ^
-one error found
diff --git a/test/files/cli/test3/Main.check.scalac b/test/files/cli/test3/Main.check.scalac
index ddddcb3d9a..3f3244da74 100644
--- a/test/files/cli/test3/Main.check.scalac
+++ b/test/files/cli/test3/Main.check.scalac
@@ -46,7 +46,3 @@ where possible options include:
-Xgenerics Use generic Java types
one error found
-files/cli/test3/Main.scala:5 error: not found: value test1
- test1.Main.main(args)
- ^
-one error found