[llvm-branch-commits] [cfe-branch] r168732 - in /cfe/branches/release_32: ./ test/Sema/warn-documentation.cpp

[Pawel Wodnicki]

Author: pawel
Date: Tue Nov 27 15:59:25 2012
New Revision: 168732

URL: http://llvm.org/viewvc/llvm-project?rev=168732&view=rev
Log:
Merging r168278: into 3.2 release branch.

clang/test/Sema/warn-documentation.cpp: Try to fix up the testcase in r168277.
-

Modified:
    cfe/branches/release_32/   (props changed)
    cfe/branches/release_32/test/Sema/warn-documentation.cpp

Propchange: cfe/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 27 15:59:25 2012
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:167749,167762,167780,167788,167790,167813-167814,167868,167884,167920,167925,167935,168024,168063,168124,168277,168297,168355,168379
+/cfe/trunk:167749,167762,167780,167788,167790,167813-167814,167868,167884,167920,167925,167935,168024,168063,168124,168277-168278,168297,168355,168379
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_32/test/Sema/warn-documentation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/test/Sema/warn-documentation.cpp?rev=168732&r1=168731&r2=168732&view=diff
==============================================================================
--- cfe/branches/release_32/test/Sema/warn-documentation.cpp (original)
+++ cfe/branches/release_32/test/Sema/warn-documentation.cpp Tue Nov 27 15:59:25 2012
@@ -513,7 +513,7 @@
 // FIXME: we give a bad diagnostic here because we throw away non-documentation
 // comments early.
 //
-// expected-warning at +2 {{'\endcode' command does not terminate a verbatim text block}}
+// expected-warning at +3 {{'\endcode' command does not terminate a verbatim text block}}
 /// \code
 //  foo
 /// \endcode