Author: gribozavr
Date: Thu Oct 18 09:33:01 2012
New Revision: 166179
URL: http://llvm.org/viewvc/llvm-project?rev=166179&view=rev
Log:
Un-XFAIL some tests for comment to XML conversion. This reverts r166151 and
fixes the tests for builds without libxml2.
Modified:
cfe/trunk/test/Index/annotate-comments-availability-attrs.cpp
cfe/trunk/test/Index/overriding-ftemplate-comments.cpp
cfe/trunk/test/Index/overriding-method-comments.mm
Modified: cfe/trunk/test/Index/annotate-comments-availability-attrs.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/annotate-comments-availability-attrs.cpp?rev=166179&r1=166178&r2=166179&view=diff
==============================================================================
--- cfe/trunk/test/Index/annotate-comments-availability-attrs.cpp (original)
+++ cfe/trunk/test/Index/annotate-comments-availability-attrs.cpp Thu Oct 18
09:33:01 2012
@@ -8,7 +8,6 @@
// Ensure that XML we generate is not invalid.
// RUN: FileCheck %s -check-prefix=WRONG < %t/out
// WRONG-NOT: CommentXMLInvalid
-// XFAIL: *
/// Aaa.
void attr_availability_1()
__attribute__((availability(macosx,obsoleted=10.0,introduced=8.0,deprecated=9.0,
message="use availability_test in <foo.h>")))
@@ -29,17 +28,17 @@
/// Aaa.
void attr_unavailable_2() __attribute__((unavailable("message 2 <foo.h>")));
-// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="13"
column="6"><Name>attr_availability_1</Name><USR>c:@F@attr_availability_1#</USR><Declaration>void
attr_availability_1()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Availability distribution="iOS"><DeprecationSummary>not
for iOS</DeprecationSummary><Unavailable/></Availability><Availability
distribution="OS
X"><IntroducedInVersion>8.0</IntroducedInVersion><DeprecatedInVersion>9.0</DeprecatedInVersion><RemovedAfterVersion>10.0</RemovedAfterVersion><DeprecationSummary>use
availability_test in
<foo.h></DeprecationSummary></Availability></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="13"
column="6"><Name>attr_availability_1</Name><USR>c:@F@attr_availability_1#</USR><Declaration>void
attr_availability_1()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Availability distribution="iOS"><DeprecationSummary>not
for iOS</DeprecationSummary><Unavailable/></Availability><Availability
distribution="OS
X"><IntroducedInVersion>8.0</IntroducedInVersion><DeprecatedInVersion>9.0</DeprecatedInVersion><RemovedAfterVersion>10.0</RemovedAfterVersion><DeprecationSummary>use
availability_test in
<foo.h></DeprecationSummary></Availability></Function>]
-// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="17"
column="6"><Name>attr_availability_2</Name><USR>c:@F@attr_availability_2#</USR><Declaration>void
attr_availability_2()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Availability distribution="OS
X"><IntroducedInVersion>8.0.1</IntroducedInVersion><DeprecatedInVersion>9.0.1</DeprecatedInVersion><RemovedAfterVersion>10.0.1</RemovedAfterVersion></Availability></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="17"
column="6"><Name>attr_availability_2</Name><USR>c:@F@attr_availability_2#</USR><Declaration>void
attr_availability_2()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Availability distribution="OS
X"><IntroducedInVersion>8.0.1</IntroducedInVersion><DeprecatedInVersion>9.0.1</DeprecatedInVersion><RemovedAfterVersion>10.0.1</RemovedAfterVersion></Availability></Function>]
-// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="20"
column="6"><Name>attr_deprecated_1</Name><USR>c:@F@attr_deprecated_1#</USR><Declaration>void
attr_deprecated_1()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Deprecated/></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="20"
column="6"><Name>attr_deprecated_1</Name><USR>c:@F@attr_deprecated_1#</USR><Declaration>void
attr_deprecated_1()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Deprecated/></Function>]
-// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="23"
column="6"><Name>attr_deprecated_2</Name><USR>c:@F@attr_deprecated_2#</USR><Declaration>void
attr_deprecated_2()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Deprecated>message 1
<foo.h></Deprecated></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="23"
column="6"><Name>attr_deprecated_2</Name><USR>c:@F@attr_deprecated_2#</USR><Declaration>void
attr_deprecated_2()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Deprecated>message 1
<foo.h></Deprecated></Function>]
-// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="26"
column="6"><Name>attr_unavailable_1</Name><USR>c:@F@attr_unavailable_1#</USR><Declaration>void
attr_unavailable_1()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Unavailable/></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="26"
column="6"><Name>attr_unavailable_1</Name><USR>c:@F@attr_unavailable_1#</USR><Declaration>void
attr_unavailable_1()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Unavailable/></Function>]
-// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="29"
column="6"><Name>attr_unavailable_2</Name><USR>c:@F@attr_unavailable_2#</USR><Declaration>void
attr_unavailable_2()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Unavailable>message 2
<foo.h></Unavailable></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}annotate-comments-availability-attrs.cpp" line="29"
column="6"><Name>attr_unavailable_2</Name><USR>c:@F@attr_unavailable_2#</USR><Declaration>void
attr_unavailable_2()</Declaration><Abstract><Para>
Aaa.</Para></Abstract><Unavailable>message 2
<foo.h></Unavailable></Function>]
Modified: cfe/trunk/test/Index/overriding-ftemplate-comments.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/overriding-ftemplate-comments.cpp?rev=166179&r1=166178&r2=166179&view=diff
==============================================================================
--- cfe/trunk/test/Index/overriding-ftemplate-comments.cpp (original)
+++ cfe/trunk/test/Index/overriding-ftemplate-comments.cpp Thu Oct 18 09:33:01
2012
@@ -7,7 +7,6 @@
// Ensure that XML we generate is not invalid.
// RUN: FileCheck %s -check-prefix=WRONG < %t/out
// WRONG-NOT: CommentXMLInvalid
-// XFAIL: *
/// \tparam
/// \param AAA Blah blah
@@ -58,23 +57,23 @@
template<class CCC1, template<class CCC2, template<class CCC3, class CCC4>
class QQQ> class PPP>
void comment_to_html_conversion_22();
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="14"
column="6"><Name>comment_to_html_conversion_17</Name><USR>c:@FT@>1#Tcomment_to_html_conversion_17#t0.0#</USR><Declaration>template
<typename T> void comment_to_html_conversion_17(T
AAA)</Declaration><Parameters><Parameter><Name>AAA</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> Blah
blah</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="14"
column="6"><Name>comment_to_html_conversion_17</Name><USR>c:@FT@>1#Tcomment_to_html_conversion_17#t0.0#</USR><Declaration>template
<typename T> void comment_to_html_conversion_17(T
AAA)</Declaration><Parameters><Parameter><Name>AAA</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> Blah
blah</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="17"
column="6"><Name>comment_to_html_conversion_17</Name><USR>c:@FT@>1#Tcomment_to_html_conversion_17#t0.0#</USR><Declaration>template
<typename T> void comment_to_html_conversion_17(T
PPP)</Declaration><Parameters><Parameter><Name>PPP</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> Blah
blah</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="17"
column="6"><Name>comment_to_html_conversion_17</Name><USR>c:@FT@>1#Tcomment_to_html_conversion_17#t0.0#</USR><Declaration>template
<typename T> void comment_to_html_conversion_17(T
PPP)</Declaration><Parameters><Parameter><Name>PPP</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> Blah
blah</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="22"
column="6"><Name>comment_to_html_conversion_19</Name><USR>c:@FT@>2#T#Tcomment_to_html_conversion_19#t0.0#t0.1#</USR><Declaration>template
<typename AAA, typename BBB> void comment_to_html_conversion_19(AAA aaa,
BBB
bbb)</Declaration><TemplateParameters><Parameter><Name>AAA</Name><Index>0</Index><Discussion><Para>
Aaa</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Index>1</Index><Discussion><Para>
Bbb </Para></Discussion></Parameter></TemplateParameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="22"
column="6"><Name>comment_to_html_conversion_19</Name><USR>c:@FT@>2#T#Tcomment_to_html_conversion_19#t0.0#t0.1#</USR><Declaration>template
<typename AAA, typename BBB> void comment_to_html_conversion_19(AAA aaa,
BBB
bbb)</Declaration><TemplateParameters><Parameter><Name>AAA</Name><Index>0</Index><Discussion><Para>
Aaa</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Index>1</Index><Discussion><Para>
Bbb </Para></Discussion></Parameter></TemplateParameters></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="25"
column="6"><Name>comment_to_html_conversion_19</Name><USR>c:@FT@>2#T#Tcomment_to_html_conversion_19#t0.0#t0.1#</USR><Declaration>template
<typename PPP, typename QQQ> void comment_to_html_conversion_19(PPP aaa,
QQQ
bbb)</Declaration><TemplateParameters><Parameter><Name>PPP</Name><Index>0</Index><Discussion><Para>
Aaa</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Index>1</Index><Discussion><Para>
Bbb </Para></Discussion></Parameter></TemplateParameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="25"
column="6"><Name>comment_to_html_conversion_19</Name><USR>c:@FT@>2#T#Tcomment_to_html_conversion_19#t0.0#t0.1#</USR><Declaration>template
<typename PPP, typename QQQ> void comment_to_html_conversion_19(PPP aaa,
QQQ
bbb)</Declaration><TemplateParameters><Parameter><Name>PPP</Name><Index>0</Index><Discussion><Para>
Aaa</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Index>1</Index><Discussion><Para>
Bbb </Para></Discussion></Parameter></TemplateParameters></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="32"
column="6"><Name>comment_to_html_conversion_20</Name><USR>c:@FT@>3#T#T#NIcomment_to_html_conversion_20#t0.0#t0.1#</USR><Declaration>template
<typename AAA, typename BBB, int CCC> void
comment_to_html_conversion_20(AAA aaa, BBB
bbb)</Declaration><TemplateParameters><Parameter><Name>AAA</Name><Index>0</Index><Discussion><Para>
Aaa</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Index>1</Index><Discussion><Para>
Bbb
</Para></Discussion></Parameter><Parameter><Name>CCC</Name><Index>2</Index><Discussion><Para>
Ccc
</Para></Discussion></Parameter><Parameter><Name>UUU</Name><Discussion><Para>
Zzz </Para></Discussion></Parameter></TemplateParameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="32"
column="6"><Name>comment_to_html_conversion_20</Name><USR>c:@FT@>3#T#T#NIcomment_to_html_conversion_20#t0.0#t0.1#</USR><Declaration>template
<typename AAA, typename BBB, int CCC> void
comment_to_html_conversion_20(AAA aaa, BBB
bbb)</Declaration><TemplateParameters><Parameter><Name>AAA</Name><Index>0</Index><Discussion><Para>
Aaa</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Index>1</Index><Discussion><Para>
Bbb
</Para></Discussion></Parameter><Parameter><Name>CCC</Name><Index>2</Index><Discussion><Para>
Ccc
</Para></Discussion></Parameter><Parameter><Name>UUU</Name><Discussion><Para>
Zzz </Para></Discussion></Parameter></TemplateParameters></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="35"
column="6"><Name>comment_to_html_conversion_20</Name><USR>c:@FT@>3#T#T#NIcomment_to_html_conversion_20#t0.0#t0.1#</USR><Declaration>template
<typename PPP, typename QQQ, int RRR> void
comment_to_html_conversion_20(PPP aaa, QQQ
bbb)</Declaration><TemplateParameters><Parameter><Name>PPP</Name><Index>0</Index><Discussion><Para>
Aaa</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Index>1</Index><Discussion><Para>
Bbb
</Para></Discussion></Parameter><Parameter><Name>RRR</Name><Index>2</Index><Discussion><Para>
Ccc
</Para></Discussion></Parameter><Parameter><Name>UUU</Name><Discussion><Para>
Zzz </Para></Discussion></Parameter></TemplateParameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="35"
column="6"><Name>comment_to_html_conversion_20</Name><USR>c:@FT@>3#T#T#NIcomment_to_html_conversion_20#t0.0#t0.1#</USR><Declaration>template
<typename PPP, typename QQQ, int RRR> void
comment_to_html_conversion_20(PPP aaa, QQQ
bbb)</Declaration><TemplateParameters><Parameter><Name>PPP</Name><Index>0</Index><Discussion><Para>
Aaa</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Index>1</Index><Discussion><Para>
Bbb
</Para></Discussion></Parameter><Parameter><Name>RRR</Name><Index>2</Index><Discussion><Para>
Ccc
</Para></Discussion></Parameter><Parameter><Name>UUU</Name><Discussion><Para>
Zzz </Para></Discussion></Parameter></TemplateParameters></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="42"
column="6"><Name>comment_to_html_conversion_21</Name><USR>c:@FT@>1#t>2#t>1#T#Tcomment_to_html_conversion_21#</USR><Declaration>template
<template <template <typename CCC> class DDD, class BBB> class
AAA> void
comment_to_html_conversion_21()</Declaration><TemplateParameters><Parameter><Name>AAA</Name><Index>0</Index><Discussion><Para>
Aaa
</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Discussion><Para>
Bbb
</Para></Discussion></Parameter><Parameter><Name>CCC</Name><Discussion><Para>
Ccc
</Para></Discussion></Parameter><Parameter><Name>DDD</Name><Discussion><Para>
Ddd</Para></Discussion></Parameter></TemplateParameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="42"
column="6"><Name>comment_to_html_conversion_21</Name><USR>c:@FT@>1#t>2#t>1#T#Tcomment_to_html_conversion_21#</USR><Declaration>template
<template <template <typename CCC> class DDD, class BBB> class
AAA> void
comment_to_html_conversion_21()</Declaration><TemplateParameters><Parameter><Name>AAA</Name><Index>0</Index><Discussion><Para>
Aaa
</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Discussion><Para>
Bbb
</Para></Discussion></Parameter><Parameter><Name>CCC</Name><Discussion><Para>
Ccc
</Para></Discussion></Parameter><Parameter><Name>DDD</Name><Discussion><Para>
Ddd</Para></Discussion></Parameter></TemplateParameters></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="45"
column="6"><Name>comment_to_html_conversion_21</Name><USR>c:@FT@>1#t>2#t>1#T#Tcomment_to_html_conversion_21#</USR><Declaration>template
<template <template <typename RRR> class SSS, class QQQ> class
PPP> void
comment_to_html_conversion_21()</Declaration><TemplateParameters><Parameter><Name>PPP</Name><Index>0</Index><Discussion><Para>
Aaa
</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Discussion><Para>
Bbb
</Para></Discussion></Parameter><Parameter><Name>RRR</Name><Discussion><Para>
Ccc
</Para></Discussion></Parameter><Parameter><Name>SSS</Name><Discussion><Para>
Ddd</Para></Discussion></Parameter></TemplateParameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="45"
column="6"><Name>comment_to_html_conversion_21</Name><USR>c:@FT@>1#t>2#t>1#T#Tcomment_to_html_conversion_21#</USR><Declaration>template
<template <template <typename RRR> class SSS, class QQQ> class
PPP> void
comment_to_html_conversion_21()</Declaration><TemplateParameters><Parameter><Name>PPP</Name><Index>0</Index><Discussion><Para>
Aaa
</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Discussion><Para>
Bbb
</Para></Discussion></Parameter><Parameter><Name>RRR</Name><Discussion><Para>
Ccc
</Para></Discussion></Parameter><Parameter><Name>SSS</Name><Discussion><Para>
Ddd</Para></Discussion></Parameter></TemplateParameters></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="54"
column="6"><Name>comment_to_html_conversion_22</Name><USR>c:@FT@>2#T#t>2#T#t>2#T#Tcomment_to_html_conversion_22#</USR><Declaration>template
<class C1, template <class C2, template <class C3, class C4> class
BBB> class AAA> void
comment_to_html_conversion_22()</Declaration><TemplateParameters><Parameter><Name>C1</Name><Index>0</Index><Discussion><Para>
Ccc 1
</Para></Discussion></Parameter><Parameter><Name>AAA</Name><Index>1</Index><Discussion><Para>
Zzz
</Para></Discussion></Parameter><Parameter><Name>C2</Name><Discussion><Para>
Ccc 2
</Para></Discussion></Parameter><Parameter><Name>C3</Name><Discussion><Para>
Ccc 3
</Para></Discussion></Parameter><Parameter><Name>C4</Name><Discussion><Para>
Ccc 4
</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Discussion><Para>
Bbb</Para></Discussion></Parameter></TemplateParameters
></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="54"
column="6"><Name>comment_to_html_conversion_22</Name><USR>c:@FT@>2#T#t>2#T#t>2#T#Tcomment_to_html_conversion_22#</USR><Declaration>template
<class C1, template <class C2, template <class C3, class C4> class
BBB> class AAA> void
comment_to_html_conversion_22()</Declaration><TemplateParameters><Parameter><Name>C1</Name><Index>0</Index><Discussion><Para>
Ccc 1
</Para></Discussion></Parameter><Parameter><Name>AAA</Name><Index>1</Index><Discussion><Para>
Zzz
</Para></Discussion></Parameter><Parameter><Name>C2</Name><Discussion><Para>
Ccc 2
</Para></Discussion></Parameter><Parameter><Name>C3</Name><Discussion><Para>
Ccc 3
</Para></Discussion></Parameter><Parameter><Name>C4</Name><Discussion><Para>
Ccc 4
</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Discussion><Para>
Bbb</Para></Discussion></Parameter></TemplateParameters
></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="58"
column="6"><Name>comment_to_html_conversion_22</Name><USR>c:@FT@>2#T#t>2#T#t>2#T#Tcomment_to_html_conversion_22#</USR><Declaration>template
<class CCC1, template <class CCC2, template <class CCC3, class
CCC4> class QQQ> class PPP> void
comment_to_html_conversion_22()</Declaration><TemplateParameters><Parameter><Name>CCC1</Name><Index>0</Index><Discussion><Para>
Ccc 1
</Para></Discussion></Parameter><Parameter><Name>PPP</Name><Index>1</Index><Discussion><Para>
Zzz
</Para></Discussion></Parameter><Parameter><Name>CCC2</Name><Discussion><Para>
Ccc 2
</Para></Discussion></Parameter><Parameter><Name>CCC3</Name><Discussion><Para>
Ccc 3
</Para></Discussion></Parameter><Parameter><Name>CCC4</Name><Discussion><Para>
Ccc 4
</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Discussion><Para>
Bbb</Para></Discussion></Parameter></Te
mplateParameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-ftemplate-comments.cpp" line="58"
column="6"><Name>comment_to_html_conversion_22</Name><USR>c:@FT@>2#T#t>2#T#t>2#T#Tcomment_to_html_conversion_22#</USR><Declaration>template
<class CCC1, template <class CCC2, template <class CCC3, class
CCC4> class QQQ> class PPP> void
comment_to_html_conversion_22()</Declaration><TemplateParameters><Parameter><Name>CCC1</Name><Index>0</Index><Discussion><Para>
Ccc 1
</Para></Discussion></Parameter><Parameter><Name>PPP</Name><Index>1</Index><Discussion><Para>
Zzz
</Para></Discussion></Parameter><Parameter><Name>CCC2</Name><Discussion><Para>
Ccc 2
</Para></Discussion></Parameter><Parameter><Name>CCC3</Name><Discussion><Para>
Ccc 3
</Para></Discussion></Parameter><Parameter><Name>CCC4</Name><Discussion><Para>
Ccc 4
</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Discussion><Para>
Bbb</Para></Discussion></Parameter></Te
mplateParameters></Function>]
Modified: cfe/trunk/test/Index/overriding-method-comments.mm
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/overriding-method-comments.mm?rev=166179&r1=166178&r2=166179&view=diff
==============================================================================
--- cfe/trunk/test/Index/overriding-method-comments.mm (original)
+++ cfe/trunk/test/Index/overriding-method-comments.mm Thu Oct 18 09:33:01 2012
@@ -7,7 +7,6 @@
// Ensure that XML we generate is not invalid.
// RUN: FileCheck %s -check-prefix=WRONG < %t/out
// WRONG-NOT: CommentXMLInvalid
-// XFAIL: *
@protocol P
- (void)METH:(id)PPP;
@@ -90,36 +89,36 @@
template<typename PPP, typename QQQ>
void foo(PPP, QQQ);
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="19"
column="1"><Name>METH:</Name><USR>c:objc(cs)Root(im)METH:</USR><Declaration>-
(void)
METH:(id)AAA</Declaration><Parameters><Parameter><Name>AAA</Name><Index>0</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> ZZZ
</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="19"
column="1"><Name>METH:</Name><USR>c:objc(cs)Root(im)METH:</USR><Declaration>-
(void)
METH:(id)AAA</Declaration><Parameters><Parameter><Name>AAA</Name><Index>0</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> ZZZ
</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="26"
column="1"><Name>METH:</Name><USR>c:objc(cs)Root(im)METH:</USR><Declaration>-
(void)
METH:(id)BBB</Declaration><Parameters><Parameter><Name>BBB</Name><Index>0</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> ZZZ
</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="26"
column="1"><Name>METH:</Name><USR>c:objc(cs)Root(im)METH:</USR><Declaration>-
(void)
METH:(id)BBB</Declaration><Parameters><Parameter><Name>BBB</Name><Index>0</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> ZZZ
</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="30"
column="1"><Name>METH:</Name><USR>c:objc(cs)Root(im)METH:</USR><Declaration>-
(void)
METH:(id)III</Declaration><Parameters><Parameter><Name>III</Name><Index>0</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> ZZZ
</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="30"
column="1"><Name>METH:</Name><USR>c:objc(cs)Root(im)METH:</USR><Declaration>-
(void)
METH:(id)III</Declaration><Parameters><Parameter><Name>III</Name><Index>0</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> ZZZ
</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="42"
column="1"><Name>EXT_METH:::</Name><USR>c:objc(cs)Redec(im)EXT_METH:::</USR><Declaration>-
(void) EXT_METH:(id)AAA :(double)BBB
:(int)CCC</Declaration><Parameters><Parameter><Name>AAA</Name><Index>0</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> input value
</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Index>1</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> 2nd input value is double
</Para></Discussion></Parameter><Parameter><Name>CCC</Name><Index>2</Index><Direction
isExplicit="1">out</Direction><Discussion><Para> output value is int
</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="42"
column="1"><Name>EXT_METH:::</Name><USR>c:objc(cs)Redec(im)EXT_METH:::</USR><Declaration>-
(void) EXT_METH:(id)AAA :(double)BBB
:(int)CCC</Declaration><Parameters><Parameter><Name>AAA</Name><Index>0</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> input value
</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Index>1</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> 2nd input value is double
</Para></Discussion></Parameter><Parameter><Name>CCC</Name><Index>2</Index><Direction
isExplicit="1">out</Direction><Discussion><Para> output value is int
</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="46"
column="1"><Name>EXT_METH:::</Name><USR>c:objc(cs)Redec(im)EXT_METH:::</USR><Declaration>-
(void) EXT_METH:(id)PPP :(double)QQQ
:(int)RRR</Declaration><Parameters><Parameter><Name>PPP</Name><Index>0</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> input value
</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Index>1</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> 2nd input value is double
</Para></Discussion></Parameter><Parameter><Name>RRR</Name><Index>2</Index><Direction
isExplicit="1">out</Direction><Discussion><Para> output value is int
</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="46"
column="1"><Name>EXT_METH:::</Name><USR>c:objc(cs)Redec(im)EXT_METH:::</USR><Declaration>-
(void) EXT_METH:(id)PPP :(double)QQQ
:(int)RRR</Declaration><Parameters><Parameter><Name>PPP</Name><Index>0</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> input value
</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Index>1</Index><Direction
isExplicit="1">in</Direction><Discussion><Para> 2nd input value is double
</Para></Discussion></Parameter><Parameter><Name>RRR</Name><Index>2</Index><Direction
isExplicit="1">out</Direction><Discussion><Para> output value is int
</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="52"
column="16"><Name>foo_pure</Name><USR>c:@S@Base@F@foo_pure#I#</USR><Declaration>virtual
void foo_pure(int AAA) = 0</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>AAA</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to
foo_pure.</Para></Discussion></Parameter></Parameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="52"
column="16"><Name>foo_pure</Name><USR>c:@S@Base@F@foo_pure#I#</USR><Declaration>virtual
void foo_pure(int AAA) = 0</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>AAA</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to
foo_pure.</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="56"
column="16"><Name>foo_inline</Name><USR>c:@S@Base@F@foo_inline#I#</USR><Declaration>virtual
void foo_inline(int BBB)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>BBB</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to defined
virtual.</Para></Discussion></Parameter></Parameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="56"
column="16"><Name>foo_inline</Name><USR>c:@S@Base@F@foo_inline#I#</USR><Declaration>virtual
void foo_inline(int BBB)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>BBB</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to defined
virtual.</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="60"
column="16"><Name>foo_outofline</Name><USR>c:@S@Base@F@foo_outofline#I#</USR><Declaration>virtual
void foo_outofline(int CCC)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>CCC</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to undefined
virtual.</Para></Discussion></Parameter></Parameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="60"
column="16"><Name>foo_outofline</Name><USR>c:@S@Base@F@foo_outofline#I#</USR><Declaration>virtual
void foo_outofline(int CCC)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>CCC</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to undefined
virtual.</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="63"
column="12"><Name>foo_outofline</Name><USR>c:@S@Base@F@foo_outofline#I#</USR><Declaration>void
foo_outofline(int RRR)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>RRR</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to undefined
virtual.</Para></Discussion></Parameter></Parameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="63"
column="12"><Name>foo_outofline</Name><USR>c:@S@Base@F@foo_outofline#I#</USR><Declaration>void
foo_outofline(int RRR)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>RRR</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to undefined
virtual.</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="66"
column="16"><Name>foo_pure</Name><USR>c:@S@Base@F@foo_pure#I#</USR><Declaration>virtual
void foo_pure(int PPP)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>PPP</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to
foo_pure.</Para></Discussion></Parameter></Parameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="66"
column="16"><Name>foo_pure</Name><USR>c:@S@Base@F@foo_pure#I#</USR><Declaration>virtual
void foo_pure(int PPP)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>PPP</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to
foo_pure.</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="68"
column="16"><Name>foo_inline</Name><USR>c:@S@Base@F@foo_inline#I#</USR><Declaration>virtual
void foo_inline(int QQQ)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>QQQ</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to defined
virtual.</Para></Discussion></Parameter></Parameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function isInstanceMethod="1"
file="{{[^"]+}}overriding-method-comments.mm" line="68"
column="16"><Name>foo_inline</Name><USR>c:@S@Base@F@foo_inline#I#</USR><Declaration>virtual
void foo_inline(int QQQ)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>QQQ</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to defined
virtual.</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}overriding-method-comments.mm" line="73"
column="6"><Name>foo</Name><USR>c:@F@foo#I#</USR><Declaration>void foo(int
DDD)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>DDD</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> a
value.</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}overriding-method-comments.mm" line="73"
column="6"><Name>foo</Name><USR>c:@F@foo#I#</USR><Declaration>void foo(int
DDD)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>DDD</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> a
value.</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}overriding-method-comments.mm" line="75"
column="6"><Name>foo</Name><USR>c:@F@foo#I#</USR><Declaration>void foo(int
SSS)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>SSS</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> a
value.</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}overriding-method-comments.mm" line="75"
column="6"><Name>foo</Name><USR>c:@F@foo#I#</USR><Declaration>void foo(int
SSS)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>SSS</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> a
value.</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}overriding-method-comments.mm" line="79"
column="6"><Name>foo1</Name><USR>c:@F@foo1#I#</USR><Declaration>void foo1(int
EEE)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>EEE</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to function decl.
</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}overriding-method-comments.mm" line="79"
column="6"><Name>foo1</Name><USR>c:@F@foo1#I#</USR><Declaration>void foo1(int
EEE)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>EEE</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to function decl.
</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}overriding-method-comments.mm" line="81"
column="6"><Name>foo1</Name><USR>c:@F@foo1#I#</USR><Declaration>void foo1(int
TTT)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>TTT</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to function decl.
</Para></Discussion></Parameter></Parameters></Function>] CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function
file="{{[^"]+}}overriding-method-comments.mm" line="81"
column="6"><Name>foo1</Name><USR>c:@F@foo1#I#</USR><Declaration>void foo1(int
TTT)</Declaration><Abstract><Para> Does something.
</Para></Abstract><Parameters><Parameter><Name>TTT</Name><Index>0</Index><Direction
isExplicit="0">in</Direction><Discussion><Para> argument to function decl.
</Para></Discussion></Parameter></Parameters></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-method-comments.mm" line="87"
column="6"><Name>foo</Name><USR>c:@FT@>2#T#Tfoo#t0.0#t0.1#</USR><Declaration>template
<typename AAA, typename BBB> void foo(AAA,
BBB)</Declaration><Abstract><Para> Documentation
</Para></Abstract><TemplateParameters><Parameter><Name>AAA</Name><Index>0</Index><Discussion><Para>
The type, silly as
well.</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Index>1</Index><Discussion><Para>
The type, silly.
</Para></Discussion></Parameter></TemplateParameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-method-comments.mm" line="87"
column="6"><Name>foo</Name><USR>c:@FT@>2#T#Tfoo#t0.0#t0.1#</USR><Declaration>template
<typename AAA, typename BBB> void foo(AAA,
BBB)</Declaration><Abstract><Para> Documentation
</Para></Abstract><TemplateParameters><Parameter><Name>AAA</Name><Index>0</Index><Discussion><Para>
The type, silly as
well.</Para></Discussion></Parameter><Parameter><Name>BBB</Name><Index>1</Index><Discussion><Para>
The type, silly.
</Para></Discussion></Parameter></TemplateParameters></Function>]
-// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-method-comments.mm" line="90"
column="6"><Name>foo</Name><USR>c:@FT@>2#T#Tfoo#t0.0#t0.1#</USR><Declaration>template
<typename PPP, typename QQQ> void foo(PPP,
QQQ)</Declaration><Abstract><Para> Documentation
</Para></Abstract><TemplateParameters><Parameter><Name>PPP</Name><Index>0</Index><Discussion><Para>
The type, silly as
well.</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Index>1</Index><Discussion><Para>
The type, silly.
</Para></Discussion></Parameter></TemplateParameters></Function>]
CommentXMLValid
+// CHECK: FullCommentAsXML=[<Function templateKind="template"
file="{{[^"]+}}overriding-method-comments.mm" line="90"
column="6"><Name>foo</Name><USR>c:@FT@>2#T#Tfoo#t0.0#t0.1#</USR><Declaration>template
<typename PPP, typename QQQ> void foo(PPP,
QQQ)</Declaration><Abstract><Para> Documentation
</Para></Abstract><TemplateParameters><Parameter><Name>PPP</Name><Index>0</Index><Discussion><Para>
The type, silly as
well.</Para></Discussion></Parameter><Parameter><Name>QQQ</Name><Index>1</Index><Discussion><Para>
The type, silly.
</Para></Discussion></Parameter></TemplateParameters></Function>]
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits