diff options
| author | Seth Tisue <seth@tisue.net> | 2016-02-23 17:49:04 -0500 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2016-02-23 17:49:04 -0500 |
| commit | f69d1e071578baafa5748a70c5f799756ae1c9fa (patch) | |
| tree | 767f3acb2b5d64e8f44012cd05faf15981fa8931 /test | |
| parent | a5ef35cc7ee6a2c5c8468c010f1308409dff81c2 (diff) | |
| parent | 3effcd232f0e3be32a8ee8f7b9eda832639e4f21 (diff) | |
| download | scala-f69d1e071578baafa5748a70c5f799756ae1c9fa.tar.gz scala-f69d1e071578baafa5748a70c5f799756ae1c9fa.tar.bz2 scala-f69d1e071578baafa5748a70c5f799756ae1c9fa.zip | |
Merge pull request #4975 from szeiger/wip/backport-partest-0.13-to-2.11.x
[nomerge] Backport partest 1.0.13 support to 2.11.x
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 | ||||
| -rw-r--r-- | test/files/pos/t3420.flags | 2 |
5 files changed, 12 insertions, 2 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 diff --git a/test/files/pos/t3420.flags b/test/files/pos/t3420.flags index ea03113c66..d37e817882 100644 --- a/test/files/pos/t3420.flags +++ b/test/files/pos/t3420.flags @@ -1 +1 @@ --optimise -Xfatal-warnings
\ No newline at end of file +-optimise -Xfatal-warnings |