summaryrefslogtreecommitdiff
path: root/test/files/buildmanager
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-02-08 09:46:57 -0800
committerJames Iry <jamesiry@gmail.com>2013-02-08 09:46:57 -0800
commit6537d79e47def868e028815db6f70e2dc7d49bac (patch)
tree3031c4cee46718d6999e92877c896db6bc022997 /test/files/buildmanager
parent3b6300b14b8aaac4c6bb7c70b51ef1df3dc3c536 (diff)
parente0068b908517768e900a3945e483e9c379d728d8 (diff)
downloadscala-6537d79e47def868e028815db6f70e2dc7d49bac.tar.gz
scala-6537d79e47def868e028815db6f70e2dc7d49bac.tar.bz2
scala-6537d79e47def868e028815db6f70e2dc7d49bac.zip
Merge pull request #2095 from hubertp/ticket/5675
SI-5675 Discard duplicate feature warnings at a position
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)