summaryrefslogtreecommitdiff
path: root/test/files/buildmanager
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-02-05 00:46:58 +0100
committerHubert Plociniczak <hubert.plociniczak@gmail.com>2013-02-08 17:51:43 +0100
commite0068b908517768e900a3945e483e9c379d728d8 (patch)
tree680ac5fb751dc183c70a2db6f73670a041dd1c95 /test/files/buildmanager
parent8d25d05e9bf848d763e7b657d9c7e96ea5cb8daf (diff)
downloadscala-e0068b908517768e900a3945e483e9c379d728d8.tar.gz
scala-e0068b908517768e900a3945e483e9c379d728d8.tar.bz2
scala-e0068b908517768e900a3945e483e9c379d728d8.zip
SI-5675 Discard duplicate feature warnings at a position
When -feature has not been enabled, we were double counting identical feature warnings that were emitted at the same position. Normal error reporting only reports the first time a warning appears at a position; feature warning counter incrementing should behave the same way. @hubertp: Fixed .check files that were broken in the original commit.
Diffstat (limited to 'test/files/buildmanager')
-rw-r--r--test/files/buildmanager/t2650_1/t2650_1.check2
-rw-r--r--test/files/buildmanager/t2657/t2657.check2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/files/buildmanager/t2650_1/t2650_1.check b/test/files/buildmanager/t2650_1/t2650_1.check
index f1e4b1b8bc..2f9dd124af 100644
--- a/test/files/buildmanager/t2650_1/t2650_1.check
+++ b/test/files/buildmanager/t2650_1/t2650_1.check
@@ -1,6 +1,6 @@
builder > A.scala B.scala
compiling Set(A.scala, B.scala)
-warning: there were 1 feature warnings; re-run with -feature for details
+warning: there were 1 feature warning(s); re-run with -feature for details
Changes: Map()
builder > A.scala
compiling Set(A.scala)
diff --git a/test/files/buildmanager/t2657/t2657.check b/test/files/buildmanager/t2657/t2657.check
index 0d6709e58b..7bff078f56 100644
--- a/test/files/buildmanager/t2657/t2657.check
+++ b/test/files/buildmanager/t2657/t2657.check
@@ -1,6 +1,6 @@
builder > A.scala B.scala
compiling Set(A.scala, B.scala)
-warning: there were 1 feature warnings; re-run with -feature for details
+warning: there were 1 feature warning(s); re-run with -feature for details
Changes: Map()
builder > A.scala
compiling Set(A.scala)