summaryrefslogtreecommitdiff
path: root/test/files/neg/choices.check
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@gmail.com>2016-02-03 11:20:05 +0100
committerLukas Rytz <lukas.rytz@gmail.com>2016-02-03 17:32:00 +0100
commit3d7ff96bd9f637d37e9ce2922cb5140feedc8ae3 (patch)
tree525df2573ace344ede435282cd89fae1a7243af1 /test/files/neg/choices.check
parent6ecb997fa8eb305bf547ec8a6106ba2fd777a594 (diff)
downloadscala-3d7ff96bd9f637d37e9ce2922cb5140feedc8ae3.tar.gz
scala-3d7ff96bd9f637d37e9ce2922cb5140feedc8ae3.tar.bz2
scala-3d7ff96bd9f637d37e9ce2922cb5140feedc8ae3.zip
Update partest to 1.0.12, test case for reporting invalid flags
Diffstat (limited to 'test/files/neg/choices.check')
-rw-r--r--test/files/neg/choices.check6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/files/neg/choices.check b/test/files/neg/choices.check
index b114394e96..df4f23461f 100644
--- a/test/files/neg/choices.check
+++ b/test/files/neg/choices.check
@@ -1,2 +1,6 @@
+error: Usage: -Yresolve-term-conflict:<strategy>
+ where <strategy> choices are package, object, error (default: error)
+error: bad option: '-Yresolve-term-conflict'
error: bad options: -Yresolve-term-conflict
-one error found
+error: flags file may only contain compiler options, found: -Yresolve-term-conflict
+four errors found