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 | |
| 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
| -rw-r--r-- | build.xml | 2 | ||||
| -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 | ||||
| -rw-r--r-- | versions.properties | 2 |
7 files changed, 15 insertions, 3 deletions
@@ -535,6 +535,8 @@ TODO: <property name="scalac.args.quick" value="${scalac.args.all}"/> <property name="scalac.args.strap" value="${scalac.args.quick}"/> + <property name="partest.scalac_opts" value=""/> <!-- set default value, otherwise the property name will be passed to partest if undefined --> + <!-- This is the start time for the distribution --> <tstamp prefix="time"> <format property="human" pattern="d MMMM yyyy, HH:mm:ss" locale="en,US"/> 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 diff --git a/versions.properties b/versions.properties index 145881ab9b..a6e15c9bfe 100644 --- a/versions.properties +++ b/versions.properties @@ -36,7 +36,7 @@ jline.version=2.12.1 scala-asm.version=5.0.4-scala-3 # external modules, used internally (not shipped) -partest.version.number=1.0.11 +partest.version.number=1.0.12 scalacheck.version.number=1.11.6 # TODO: modularize the compiler |