summaryrefslogtreecommitdiff
path: root/test/files/neg/choices.check
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-03-21 22:25:40 +0000
committerPaul Phillips <paulp@improving.org>2011-03-21 22:25:40 +0000
commit455ee619fbfde17c8a9208d3e2ebf7d867cbd560 (patch)
tree686ccedbf5004eeb1507bbedc3b8c0d4b8d273fd /test/files/neg/choices.check
parent7946facede9482d8a363b6474b163c11ab3a662c (diff)
downloadscala-455ee619fbfde17c8a9208d3e2ebf7d867cbd560.tar.gz
scala-455ee619fbfde17c8a9208d3e2ebf7d867cbd560.tar.bz2
scala-455ee619fbfde17c8a9208d3e2ebf7d867cbd560.zip
[I'm laptop only so there's some chance this wi...
[I'm laptop only so there's some chance this will incur temporary breakage, but it needs committing.] Heading off gratuitous complications which haven't yet shipped, I eliminated the -jar startup option in favor of doing what we already do, figuring it out. So now all these things work. scala foo/bar.scala // if file is a script or has one main method scala foo.Bar // if it has a legal main method scala foo.jar // if it has a legal MainClass attribute Also changed "-savecompiled" to "-save" and given scala source called foo.scala, generate foo.jar rather than foo.scala.jar. Cleaned up a bunch of related code and further polished the scala startup message. And unbroke choice settings and improved that error too, which closes #3849. While trying to write a test for the choice setting, was reminded that partest just discards invalid flags files. Made it fail instead, which closes #3712. Fixed the new failures that revealed. No review.
Diffstat (limited to 'test/files/neg/choices.check')
-rw-r--r--test/files/neg/choices.check2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/files/neg/choices.check b/test/files/neg/choices.check
new file mode 100644
index 0000000000..3e63f9999d
--- /dev/null
+++ b/test/files/neg/choices.check
@@ -0,0 +1,2 @@
+partest error: bad flags: -Ylinearizer
+one error found