summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2010-09-02 10:34:31 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2010-09-02 10:34:31 +0000
commit13387444da947f6a9fa3770ec2acb227333da6cf (patch)
tree6c6e078e5dd7f7e941ddaaccd5a82cc4c71c813b /test/files/neg
parent9f3ad9f11f7943d9dfe9fb664c7d58712a05f8e6 (diff)
downloadscala-13387444da947f6a9fa3770ec2acb227333da6cf.tar.gz
scala-13387444da947f6a9fa3770ec2acb227333da6cf.tar.bz2
scala-13387444da947f6a9fa3770ec2acb227333da6cf.zip
Merged revisions 22411,22544,22630,22698,22724,...
Merged revisions 22411,22544,22630,22698,22724,22791-22792 via svnmerge from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk ........ r22411 | michelou | 2010-06-28 19:39:18 +0200 (Mon, 28 Jun 2010) | 1 line fixed #3604 ........ r22544 | michelou | 2010-07-12 17:57:40 +0200 (Mon, 12 Jul 2010) | 2 lines removed generics warnings in actors ........ r22630 | michelou | 2010-07-26 16:27:41 +0200 (Mon, 26 Jul 2010) | 2 lines fixed case 2 (Android) in ticket #2464 (case 1 is ok with 2.8.0.final) ........ r22698 | michelou | 2010-08-07 11:25:42 +0200 (Sat, 07 Aug 2010) | 2 lines fixed t3738 ........ r22724 | odersky | 2010-08-10 17:57:43 +0200 (Tue, 10 Aug 2010) | 1 line Fixes #3728. No review. ........ r22791 | odersky | 2010-08-18 19:12:44 +0200 (Wed, 18 Aug 2010) | 1 line Closes #3756. No review. ........ r22792 | odersky | 2010-08-18 19:47:04 +0200 (Wed, 18 Aug 2010) | 1 line Closes #3763. No review. ........
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/t3604.check7
-rw-r--r--test/files/neg/t3604.scala6
2 files changed, 13 insertions, 0 deletions
diff --git a/test/files/neg/t3604.check b/test/files/neg/t3604.check
new file mode 100644
index 0000000000..b07c5c9c71
--- /dev/null
+++ b/test/files/neg/t3604.check
@@ -0,0 +1,7 @@
+t3604.scala:3: error: in XML literal: expected closing tag of abbr
+ <abbr></div>
+ ^
+t3604.scala:3: error: start tag was here: abbr>
+ <abbr></div>
+ ^
+two errors found
diff --git a/test/files/neg/t3604.scala b/test/files/neg/t3604.scala
new file mode 100644
index 0000000000..f890a58e58
--- /dev/null
+++ b/test/files/neg/t3604.scala
@@ -0,0 +1,6 @@
+object Main {
+ <div>
+ <abbr></div>
+ { "..." }
+ </div>
+}