diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-02-03 11:20:05 +0100 |
---|---|---|
committer | Stefan Zeiger <szeiger@novocode.com> | 2016-02-17 18:22:13 +0100 |
commit | e606e3054a2d872135b6409f43291d5746a48cf1 (patch) | |
tree | 3cc015dc4f3e82652bf0820ec4e7b3dcc9b309d2 /test/files/neg/choices.check | |
parent | fdbf59d345ca5141f935773e80bece6889f42401 (diff) | |
download | scala-e606e3054a2d872135b6409f43291d5746a48cf1.tar.gz scala-e606e3054a2d872135b6409f43291d5746a48cf1.tar.bz2 scala-e606e3054a2d872135b6409f43291d5746a48cf1.zip |
Update partest to 1.0.12, test case for reporting invalid flags
Conflicts:
test/files/pos/t3420.flags
versions.properties
Diffstat (limited to 'test/files/neg/choices.check')
-rw-r--r-- | test/files/neg/choices.check | 6 |
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 |