diff options
| author | Seth Tisue <seth@tisue.net> | 2016-02-03 14:16:55 -0500 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2016-02-03 14:16:55 -0500 |
| commit | 333187a7c020b7d51d68c5435852305e70d89d41 (patch) | |
| tree | 19674ba3a79944ececba71bfa119981a089dc3c0 /test | |
| parent | b1981c0358ada039578dc857bb24c6c81db37bf7 (diff) | |
| parent | 3d7ff96bd9f637d37e9ce2922cb5140feedc8ae3 (diff) | |
| download | scala-333187a7c020b7d51d68c5435852305e70d89d41.tar.gz scala-333187a7c020b7d51d68c5435852305e70d89d41.tar.bz2 scala-333187a7c020b7d51d68c5435852305e70d89d41.zip | |
Merge pull request #4940 from lrytz/partestUpgrade
Update partest to 1.0.12, test case for reporting invalid flags
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/choices.check | 6 | ||||
| -rw-r--r-- | test/files/neg/partestInvalidFlag.check | 4 | ||||
| -rw-r--r-- | test/files/neg/partestInvalidFlag.flags | 1 | ||||
| -rw-r--r-- | test/files/neg/partestInvalidFlag.scala | 1 |
4 files changed, 11 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 diff --git a/test/files/neg/partestInvalidFlag.check b/test/files/neg/partestInvalidFlag.check new file mode 100644 index 0000000000..812191dc22 --- /dev/null +++ b/test/files/neg/partestInvalidFlag.check @@ -0,0 +1,4 @@ +error: bad option: '-badCompilerFlag' +error: bad options: -badCompilerFlag notAFlag -Yopt:badChoice +error: flags file may only contain compiler options, found: -badCompilerFlag notAFlag -Yopt:badChoice +three errors found diff --git a/test/files/neg/partestInvalidFlag.flags b/test/files/neg/partestInvalidFlag.flags new file mode 100644 index 0000000000..68884532b9 --- /dev/null +++ b/test/files/neg/partestInvalidFlag.flags @@ -0,0 +1 @@ +-badCompilerFlag notAFlag -Yopt:badChoice diff --git a/test/files/neg/partestInvalidFlag.scala b/test/files/neg/partestInvalidFlag.scala new file mode 100644 index 0000000000..826a1a5bc2 --- /dev/null +++ b/test/files/neg/partestInvalidFlag.scala @@ -0,0 +1 @@ +class C |