diff options
Diffstat (limited to 'testing')
| -rwxr-xr-x[-rw-r--r--] | testing/031/indexpage.xml | 69 | ||||
| -rw-r--r-- | testing/031_image.dox | 61 | ||||
| -rwxr-xr-x[-rw-r--r--] | testing/066/class_class1.xml | 103 | ||||
| -rw-r--r-- | testing/066_property_initializer.cs | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | testing/074/namespacens.xml | 162 | ||||
| -rwxr-xr-x[-rw-r--r--] | testing/074/struct_foo.xml | 577 | ||||
| -rw-r--r-- | testing/074_ref.cpp | 3 | ||||
| -rwxr-xr-x | testing/runtests.py | 9 |
8 files changed, 544 insertions, 446 deletions
diff --git a/testing/031/indexpage.xml b/testing/031/indexpage.xml index 2c1dfd7..7e368f3 100644..100755 --- a/testing/031/indexpage.xml +++ b/testing/031/indexpage.xml @@ -1,15 +1,54 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version=""> - <compounddef id="indexpage" kind="page"> - <compoundname>index</compoundname> - <title>My Project</title> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>Some text. <image type="html" name="sample.png"/> - <image type="latex" name="sample.png" width="5cm">Doxygen logo</image> - <image type="docbook" name="sample.png"/> - More text. </para> - </detaileddescription> - </compounddef> -</doxygen> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+ <compounddef id="indexpage" kind="page">
+ <compoundname>index</compoundname>
+ <title>My Project</title>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>Some text. <image type="html" name="sample.png"/>
+ <image type="latex" name="sample.png" width="5cm">Doxygen logo</image>
+ <image type="docbook" name="sample.png"/>
+ More text.</para>
+ <para>SVG image with caption:<linebreak/>
+<image type="html" name="license-MIT-brightgreen.svg">A caption</image>
+</para>
+ <para>PNG image with caption:<linebreak/>
+<image type="html" name="license-MIT-brightgreen.png">A caption</image>
+</para>
+ <para>SVG image without caption:<linebreak/>
+<image type="html" name="license-MIT-brightgreen.svg"/>
+</para>
+ <para>PNG image without caption:<linebreak/>
+<image type="html" name="license-MIT-brightgreen.png"/>
+</para>
+ <para>Inline SVG image with caption:<linebreak/>
+This image is inline <image type="html" name="license-MIT-brightgreen.svg" inline="yes">MIT license</image>
+ within the text.</para>
+ <para>Inline PNG image with caption:<linebreak/>
+This image is inline <image type="html" name="license-MIT-brightgreen.png" inline="yes">MIT license</image>
+ within the text.</para>
+ <para>Markdown style linked SVG image:<linebreak/>
+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.svg" inline="yes"/></ulink></para>
+ <para>Markdown style linked PNG image:<linebreak/>
+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.png" inline="yes"/></ulink></para>
+ <para>HTML style linked SVG image:<linebreak/>
+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.svg" inline="yes"/></ulink></para>
+ <para>HTML style linked PNG image:<linebreak/>
+<ulink url="http://opensource.org/licenses/MIT"><image type="html" name="license-MIT-brightgreen.png" inline="yes"/></ulink></para>
+ <para>HTML style unlinked SVG image:<linebreak/>
+<image type="html" name="license-MIT-brightgreen.svg" inline="yes"/>
+</para>
+ <para>HTML style unlinked PNG image:<linebreak/>
+<image type="html" name="license-MIT-brightgreen.png" inline="yes"/>
+</para>
+ <para>Some markdown image tests<linebreak/>
+<image type="html" name="docs-Doxygen-blue.svg?foo&bar" inline="yes"/>
+ <ulink url="http://www.doxygen.nl?foo&bar">Some normal link</ulink></para>
+ <para>
+ <image type="html" name="docs-Doxygen-blue.svg?foo&bar" inline="yes"/>
+ <ulink url="http://www.doxygen.nl?foo&bar">Some normal link</ulink>
+ </para>
+ </detaileddescription>
+ </compounddef>
+</doxygen>
diff --git a/testing/031_image.dox b/testing/031_image.dox index 8ba47b7..e451592 100644 --- a/testing/031_image.dox +++ b/testing/031_image.dox @@ -2,9 +2,58 @@ // check: indexpage.xml // config: IMAGE_PATH = $INPUTDIR /** \mainpage - * Some text. - * \image html sample.png - * \image latex sample.png "Doxygen logo" width=5cm - * \image docbook sample.png - * More text. - */ +Some text. +\image html sample.png +\image latex sample.png "Doxygen logo" width=5cm +\image docbook sample.png +More text. + +SVG image with caption:\n +\image html http://img.shields.io/badge/license-MIT-brightgreen.svg "A caption" + +PNG image with caption:\n +\image html http://img.shields.io/badge/license-MIT-brightgreen.png "A caption" + +SVG image without caption:\n +\image html http://img.shields.io/badge/license-MIT-brightgreen.svg + +PNG image without caption:\n +\image html http://img.shields.io/badge/license-MIT-brightgreen.png + +Inline SVG image with caption:\n +This image is inline \image{inline} html http://img.shields.io/badge/license-MIT-brightgreen.svg "MIT license" within the text. + +Inline PNG image with caption:\n +This image is inline +\image{inline} html http://img.shields.io/badge/license-MIT-brightgreen.png "MIT license" +within the text. + +Markdown style linked SVG image:\n +[](http://opensource.org/licenses/MIT) + +Markdown style linked PNG image:\n +[](http://opensource.org/licenses/MIT) + +HTML style linked SVG image:\n +<a href="http://opensource.org/licenses/MIT"> +<img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT license"> +</a> + +HTML style linked PNG image:\n +<a href="http://opensource.org/licenses/MIT"> +<img src="http://img.shields.io/badge/license-MIT-brightgreen.png" alt="MIT license"> +</a> + +HTML style unlinked SVG image:\n +<img src="http://img.shields.io/badge/license-MIT-brightgreen.svg" alt="MIT license"/> + +HTML style unlinked PNG image:\n +<img src="http://img.shields.io/badge/license-MIT-brightgreen.png" alt="MIT license"/> + +Some markdown image tests\n + +[Some normal link](http://www.doxygen.nl?foo&bar) + + +[Some normal link](http://www.doxygen.nl?foo&bar) +*/ diff --git a/testing/066/class_class1.xml b/testing/066/class_class1.xml index 008bcc6..34335a7 100644..100755 --- a/testing/066/class_class1.xml +++ b/testing/066/class_class1.xml @@ -1,50 +1,53 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version=""> - <compounddef id="class_class1" kind="class" language="C#" prot="public"> - <compoundname>Class1</compoundname> - <sectiondef kind="property"> - <memberdef kind="property" id="class_class1_1a6b0b2ab73516e37adb38b8ff33f97c40" prot="public" static="no" readable="no" writable="no" gettable="yes" privategettable="no" protectedgettable="no" settable="no" privatesettable="no" protectedsettable="no"> - <type>int</type> - <definition>int Class1.Property1</definition> - <argsstring/> - <name>Property1</name> - <initializer>= 1</initializer> - <briefdescription> - </briefdescription> - <detaileddescription> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="066_property_initializer.cs" line="5" column="1" bodyfile="066_property_initializer.cs" bodystart="5" bodyend="5"/> - </memberdef> - <memberdef kind="property" id="class_class1_1a0d5b843d48ebc2c078e003d6ff3a1610" prot="public" static="no" readable="no" writable="no" gettable="yes" privategettable="no" protectedgettable="no" settable="yes" privatesettable="no" protectedsettable="no"> - <type>string</type> - <definition>string Class1.Property2</definition> - <argsstring/> - <name>Property2</name> - <briefdescription> - </briefdescription> - <detaileddescription> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="066_property_initializer.cs" line="6" column="1" bodyfile="066_property_initializer.cs" bodystart="6" bodyend="6"/> - </memberdef> - </sectiondef> - <briefdescription> - </briefdescription> - <detaileddescription> - </detaileddescription> - <location file="066_property_initializer.cs" line="4" column="1" bodyfile="066_property_initializer.cs" bodystart="3" bodyend="7"/> - <listofallmembers> - <member refid="class_class1_1a6b0b2ab73516e37adb38b8ff33f97c40" prot="public" virt="non-virtual"> - <scope>Class1</scope> - <name>Property1</name> - </member> - <member refid="class_class1_1a0d5b843d48ebc2c078e003d6ff3a1610" prot="public" virt="non-virtual"> - <scope>Class1</scope> - <name>Property2</name> - </member> - </listofallmembers> - </compounddef> -</doxygen> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+ <compounddef id="class_class1" kind="class" language="C#" prot="public">
+ <compoundname>Class1</compoundname>
+ <sectiondef kind="property">
+ <memberdef kind="property" id="class_class1_1a6b0b2ab73516e37adb38b8ff33f97c40" prot="public" static="no" readable="no" writable="no" gettable="yes" privategettable="no" protectedgettable="no" settable="no" privatesettable="no" protectedsettable="no">
+ <type>int</type>
+ <definition>int Class1.Property1</definition>
+ <argsstring/>
+ <name>Property1</name>
+ <initializer>= 1</initializer>
+ <briefdescription>
+ <para>Documentation of first property. </para>
+ </briefdescription>
+ <detaileddescription>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="066_property_initializer.cs" line="7" column="1" bodyfile="066_property_initializer.cs" bodystart="7" bodyend="7"/>
+ </memberdef>
+ <memberdef kind="property" id="class_class1_1a0d5b843d48ebc2c078e003d6ff3a1610" prot="public" static="no" readable="no" writable="no" gettable="yes" privategettable="no" protectedgettable="no" settable="yes" privatesettable="no" protectedsettable="no">
+ <type>string</type>
+ <definition>string Class1.Property2</definition>
+ <argsstring/>
+ <name>Property2</name>
+ <briefdescription>
+ <para>Documentation of second property. </para>
+ </briefdescription>
+ <detaileddescription>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="066_property_initializer.cs" line="8" column="1" bodyfile="066_property_initializer.cs" bodystart="8" bodyend="8"/>
+ </memberdef>
+ </sectiondef>
+ <briefdescription>
+ <para>Documentation of the class. </para>
+ </briefdescription>
+ <detaileddescription>
+ </detaileddescription>
+ <location file="066_property_initializer.cs" line="6" column="1" bodyfile="066_property_initializer.cs" bodystart="5" bodyend="9"/>
+ <listofallmembers>
+ <member refid="class_class1_1a6b0b2ab73516e37adb38b8ff33f97c40" prot="public" virt="non-virtual">
+ <scope>Class1</scope>
+ <name>Property1</name>
+ </member>
+ <member refid="class_class1_1a0d5b843d48ebc2c078e003d6ff3a1610" prot="public" virt="non-virtual">
+ <scope>Class1</scope>
+ <name>Property2</name>
+ </member>
+ </listofallmembers>
+ </compounddef>
+</doxygen>
diff --git a/testing/066_property_initializer.cs b/testing/066_property_initializer.cs index d5b5c59..57aeb5b 100644 --- a/testing/066_property_initializer.cs +++ b/testing/066_property_initializer.cs @@ -1,7 +1,9 @@ // objective: C# property initializer // check: class_class1.xml +/// +/// Documentation of the class class Class1 { - public int Property1 { get; } = 1; - public string Property2 { get; set; } + public int Property1 { get; } = 1; ///< Documentation of first property + public string Property2 { get; set; } ///< Documentation of second property } diff --git a/testing/074/namespacens.xml b/testing/074/namespacens.xml index 495e550..4eccf88 100644..100755 --- a/testing/074/namespacens.xml +++ b/testing/074/namespacens.xml @@ -1,81 +1,81 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version=""> - <compounddef id="namespacens" kind="namespace" language="C++"> - <compoundname>ns</compoundname> - <sectiondef kind="func"> - <memberdef kind="function" id="namespacens_1afd2e8a8437eff630f52a452ea6dc6e82" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> - <type>int</type> - <definition>int ns::operator""_op</definition> - <argsstring>(unsigned long long)</argsstring> - <name>operator""_op</name> - <param> - <type>unsigned long long</type> - </param> - <briefdescription> - <para>An operator. </para> - </briefdescription> - <detaileddescription> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="66" column="1"/> - </memberdef> - <memberdef kind="function" id="namespacens_1a47f70e51e66b81b8383a4e2da66f1e09" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> - <type>int</type> - <definition>int ns::operator""_oq</definition> - <argsstring>(unsigned long long)</argsstring> - <name>operator""_oq</name> - <param> - <type>unsigned long long</type> - </param> - <briefdescription> - <para>Another operator. </para> - </briefdescription> - <detaileddescription> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="69" column="1"/> - </memberdef> - <memberdef kind="function" id="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> - <type>void</type> - <definition>void ns::foo</definition> - <argsstring>(std::initializer_list< int * >)</argsstring> - <name>foo</name> - <param> - <type>std::initializer_list< int * ></type> - </param> - <briefdescription> - <para>Function. </para> - </briefdescription> - <detaileddescription> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="72" column="1"/> - </memberdef> - </sectiondef> - <briefdescription> -<para>A namespace. </para> - </briefdescription> - <detaileddescription> - <para> - <itemizedlist> - <listitem> - <para>Link to an UDL w/o spaces: <ref refid="namespacens_1afd2e8a8437eff630f52a452ea6dc6e82" kindref="member">operator""_op</ref></para> - </listitem> - <listitem> - <para>Link to an UDL with spaces: <ref refid="namespacens_1a47f70e51e66b81b8383a4e2da66f1e09" kindref="member">operator""_oq</ref></para> - </listitem> - <listitem> - <para>Link to a function with spaces: <ref refid="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" kindref="member">foo(std::initializer_list< int* >)</ref></para> - </listitem> - <listitem> - <para>Link to a function w/o spaces: <ref refid="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" kindref="member">foo(std::initializer_list<int*>)</ref> </para> - </listitem> - </itemizedlist> - </para> - </detaileddescription> - <location file="074_ref.cpp" line="63" column="1"/> - </compounddef> -</doxygen> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+ <compounddef id="namespacens" kind="namespace" language="C++">
+ <compoundname>ns</compoundname>
+ <sectiondef kind="func">
+ <memberdef kind="function" id="namespacens_1afd2e8a8437eff630f52a452ea6dc6e82" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+ <type>int</type>
+ <definition>int ns::operator""_op</definition>
+ <argsstring>(unsigned long long)</argsstring>
+ <name>operator""_op</name>
+ <param>
+ <type>unsigned long long</type>
+ </param>
+ <briefdescription>
+ <para>An operator. </para>
+ </briefdescription>
+ <detaileddescription>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="67" column="1"/>
+ </memberdef>
+ <memberdef kind="function" id="namespacens_1a47f70e51e66b81b8383a4e2da66f1e09" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+ <type>int</type>
+ <definition>int ns::operator""_oq</definition>
+ <argsstring>(unsigned long long)</argsstring>
+ <name>operator""_oq</name>
+ <param>
+ <type>unsigned long long</type>
+ </param>
+ <briefdescription>
+ <para>Another operator. </para>
+ </briefdescription>
+ <detaileddescription>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="70" column="1"/>
+ </memberdef>
+ <memberdef kind="function" id="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+ <type>void</type>
+ <definition>void ns::foo</definition>
+ <argsstring>(std::initializer_list< int * >)</argsstring>
+ <name>foo</name>
+ <param>
+ <type>std::initializer_list< int * ></type>
+ </param>
+ <briefdescription>
+ <para>Function. </para>
+ </briefdescription>
+ <detaileddescription>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="73" column="1"/>
+ </memberdef>
+ </sectiondef>
+ <briefdescription>
+ <para>A namespace. </para>
+ </briefdescription>
+ <detaileddescription>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>Link to an UDL w/o spaces: <ref refid="namespacens_1afd2e8a8437eff630f52a452ea6dc6e82" kindref="member">operator""_op</ref></para>
+ </listitem>
+ <listitem>
+ <para>Link to an UDL with spaces: <ref refid="namespacens_1a47f70e51e66b81b8383a4e2da66f1e09" kindref="member">operator""_oq</ref></para>
+ </listitem>
+ <listitem>
+ <para>Link to a function with spaces: <ref refid="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" kindref="member">foo(std::initializer_list< int* >)</ref></para>
+ </listitem>
+ <listitem>
+ <para>Link to a function w/o spaces: <ref refid="namespacens_1aaa9eb8a7b40d4ed0edbe5e163b4e6e8d" kindref="member">foo(std::initializer_list<int*>)</ref> </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </detaileddescription>
+ <location file="074_ref.cpp" line="64" column="1"/>
+ </compounddef>
+</doxygen>
diff --git a/testing/074/struct_foo.xml b/testing/074/struct_foo.xml index c49fbaa..7096238 100644..100755 --- a/testing/074/struct_foo.xml +++ b/testing/074/struct_foo.xml @@ -1,287 +1,290 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version=""> - <compounddef id="struct_foo" kind="struct" language="C++" prot="public"> - <compoundname>Foo</compoundname> - <sectiondef kind="public-func"> - <memberdef kind="function" id="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> - <type/> - <definition>Foo::Foo</definition> - <argsstring>()</argsstring> - <name>Foo</name> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>Constructor </para> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="20" column="1"/> - </memberdef> - <memberdef kind="function" id="struct_foo_1a279debd94d894223fa8468933e2d6188" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> - <type><ref refid="struct_foo" kindref="compound">Foo</ref> &</type> - <definition>Foo& Foo::operator<<</definition> - <argsstring>(int i)</argsstring> - <name>operator<<</name> - <param> - <type>int</type> - <declname>i</declname> - </param> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>overloaded less than operator </para> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="31" column="1"/> - </memberdef> - <memberdef kind="function" id="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual"> - <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &</type> - <definition>const Foo& Foo::operator<<</definition> - <argsstring>(int i) const</argsstring> - <name>operator<<</name> - <param> - <type>int</type> - <declname>i</declname> - </param> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>overloaded const less than operator </para> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="34" column="1"/> - </memberdef> - <memberdef kind="function" id="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> - <type>int</type> - <definition>int Foo::operator()</definition> - <argsstring>(int i)</argsstring> - <name>operator()</name> - <param> - <type>int</type> - <declname>i</declname> - </param> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>overloaded call operator </para> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="37" column="1"/> - </memberdef> - <memberdef kind="function" id="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual"> - <type>int</type> - <definition>int Foo::operator()</definition> - <argsstring>(int i) const</argsstring> - <name>operator()</name> - <param> - <type>int</type> - <declname>i</declname> - </param> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>overloaded call operator </para> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="40" column="1"/> - </memberdef> - <memberdef kind="function" id="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> - <type><ref refid="struct_foo" kindref="compound">Foo</ref> &</type> - <definition>Foo& Foo::operator&=</definition> - <argsstring>(const Foo &rhs)</argsstring> - <name>operator&=</name> - <param> - <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &</type> - <declname>rhs</declname> - </param> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>and equal operator </para> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="43" column="1"/> - </memberdef> - <memberdef kind="function" id="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> - <type><ref refid="struct_foo" kindref="compound">Foo</ref> &</type> - <definition>Foo& Foo::operator&=</definition> - <argsstring>(const Foo &rhs)</argsstring> - <name>operator&=</name> - <param> - <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &</type> - <declname>rhs</declname> - </param> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>and equal operator </para> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="46" column="1"/> - </memberdef> - <memberdef kind="function" id="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual"> - <type>int *</type> - <definition>int* Foo::operator->*</definition> - <argsstring>(int *p)</argsstring> - <name>operator->*</name> - <param> - <type>int *</type> - <declname>p</declname> - </param> - <briefdescription> - </briefdescription> - <detaileddescription> - <para>Member pointer operator </para> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="49" column="1"/> - </memberdef> - <memberdef kind="function" id="struct_foo_1a978acd73e910ce56cc169ebec8736669" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual"> - <type> - <ref refid="struct_foo" kindref="compound">Foo</ref> - </type> - <definition>Foo Foo::fun</definition> - <argsstring>() const</argsstring> - <name>fun</name> - <briefdescription> - <para>Fun with itself. </para> - </briefdescription> - <detaileddescription> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="52" column="1"/> - </memberdef> - </sectiondef> - <sectiondef kind="public-static-func"> - <memberdef kind="function" id="struct_foo_1abdf64a71706807b0f946265902c530ee" prot="public" static="yes" const="no" explicit="no" inline="no" virt="non-virtual"> - <type> - <ref refid="struct_foo" kindref="compound">Foo</ref> - </type> - <definition>static Foo Foo::fun</definition> - <argsstring>(Foo a, Foo b)</argsstring> - <name>fun</name> - <param> - <type> - <ref refid="struct_foo" kindref="compound">Foo</ref> - </type> - <declname>a</declname> - </param> - <param> - <type> - <ref refid="struct_foo" kindref="compound">Foo</ref> - </type> - <declname>b</declname> - </param> - <briefdescription> - <para>Fun of two. </para> - </briefdescription> - <detaileddescription> - <para> - <itemizedlist> - <listitem> - <para> - <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">fun() const</ref> - </para> - </listitem> - <listitem> - <para> - <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">fun() const</ref> - </para> - </listitem> - <listitem> - <para> - <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">title</ref> - </para> - </listitem> - </itemizedlist> - </para> - </detaileddescription> - <inbodydescription> - </inbodydescription> - <location file="074_ref.cpp" line="28" column="1"/> - </memberdef> - </sectiondef> - <briefdescription> - <para><ref refid="struct_foo" kindref="compound">Foo</ref> class. </para> - </briefdescription> - <detaileddescription> - <para> - <simplesect kind="see"> - <para><ref refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" kindref="member">Foo::Foo()</ref> constructor for details. </para> - </simplesect> - <simplesect kind="see"> - <para><ref refid="struct_foo" kindref="compound">Foo</ref> constant. </para> - </simplesect> - <simplesect kind="see"> - <para><ref refid="struct_foo_1a279debd94d894223fa8468933e2d6188" kindref="member">less than operator</ref>. </para> - </simplesect> - <simplesect kind="see"> - <para><ref refid="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" kindref="member">const less than operator</ref>. </para> - </simplesect> - <simplesect kind="see"> - <para><ref refid="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" kindref="member">call operator</ref>. </para> - </simplesect> - <simplesect kind="see"> - <para><ref refid="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" kindref="member">const call operator</ref>. </para> - </simplesect> - <simplesect kind="see"> - <para><ref refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" kindref="member">and equal operator</ref>. </para> - </simplesect> - <simplesect kind="see"> - <para><ref refid="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" kindref="member">member pointer operator</ref>. </para> - </simplesect> - </para> - </detaileddescription> - <location file="074_ref.cpp" line="18" column="1" bodyfile="074_ref.cpp" bodystart="18" bodyend="53"/> - <listofallmembers> - <member refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" virt="non-virtual"> - <scope>Foo</scope> - <name>Foo</name> - </member> - <member refid="struct_foo_1abdf64a71706807b0f946265902c530ee" prot="public" virt="non-virtual"> - <scope>Foo</scope> - <name>fun</name> - </member> - <member refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" prot="public" virt="non-virtual"> - <scope>Foo</scope> - <name>fun</name> - </member> - <member refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" virt="non-virtual"> - <scope>Foo</scope> - <name>operator&=</name> - </member> - <member refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" virt="non-virtual"> - <scope>Foo</scope> - <name>operator&=</name> - </member> - <member refid="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" prot="public" virt="non-virtual"> - <scope>Foo</scope> - <name>operator()</name> - </member> - <member refid="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" prot="public" virt="non-virtual"> - <scope>Foo</scope> - <name>operator()</name> - </member> - <member refid="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" prot="public" virt="non-virtual"> - <scope>Foo</scope> - <name>operator->*</name> - </member> - <member refid="struct_foo_1a279debd94d894223fa8468933e2d6188" prot="public" virt="non-virtual"> - <scope>Foo</scope> - <name>operator<<</name> - </member> - <member refid="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" prot="public" virt="non-virtual"> - <scope>Foo</scope> - <name>operator<<</name> - </member> - </listofallmembers> - </compounddef> -</doxygen> +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
+ <compounddef id="struct_foo" kind="struct" language="C++" prot="public">
+ <compoundname>Foo</compoundname>
+ <sectiondef kind="public-func">
+ <memberdef kind="function" id="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+ <type/>
+ <definition>Foo::Foo</definition>
+ <argsstring>()</argsstring>
+ <name>Foo</name>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>Constructor </para>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="21" column="1"/>
+ </memberdef>
+ <memberdef kind="function" id="struct_foo_1a279debd94d894223fa8468933e2d6188" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+ <type><ref refid="struct_foo" kindref="compound">Foo</ref> &</type>
+ <definition>Foo& Foo::operator<<</definition>
+ <argsstring>(int i)</argsstring>
+ <name>operator<<</name>
+ <param>
+ <type>int</type>
+ <declname>i</declname>
+ </param>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>overloaded less than operator </para>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="32" column="1"/>
+ </memberdef>
+ <memberdef kind="function" id="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
+ <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &</type>
+ <definition>const Foo& Foo::operator<<</definition>
+ <argsstring>(int i) const</argsstring>
+ <name>operator<<</name>
+ <param>
+ <type>int</type>
+ <declname>i</declname>
+ </param>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>overloaded const less than operator </para>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="35" column="1"/>
+ </memberdef>
+ <memberdef kind="function" id="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+ <type>int</type>
+ <definition>int Foo::operator()</definition>
+ <argsstring>(int i)</argsstring>
+ <name>operator()</name>
+ <param>
+ <type>int</type>
+ <declname>i</declname>
+ </param>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>overloaded call operator </para>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="38" column="1"/>
+ </memberdef>
+ <memberdef kind="function" id="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
+ <type>int</type>
+ <definition>int Foo::operator()</definition>
+ <argsstring>(int i) const</argsstring>
+ <name>operator()</name>
+ <param>
+ <type>int</type>
+ <declname>i</declname>
+ </param>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>overloaded call operator </para>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="41" column="1"/>
+ </memberdef>
+ <memberdef kind="function" id="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+ <type><ref refid="struct_foo" kindref="compound">Foo</ref> &</type>
+ <definition>Foo& Foo::operator&=</definition>
+ <argsstring>(const Foo &rhs)</argsstring>
+ <name>operator&=</name>
+ <param>
+ <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &</type>
+ <declname>rhs</declname>
+ </param>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>and equal operator </para>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="44" column="1"/>
+ </memberdef>
+ <memberdef kind="function" id="struct_foo_1ab1a2a53ad5b2a0f97422630330c151fe" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
+ <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &</type>
+ <definition>const Foo& Foo::operator&=</definition>
+ <argsstring>(const Foo &rhs) const</argsstring>
+ <name>operator&=</name>
+ <param>
+ <type>const <ref refid="struct_foo" kindref="compound">Foo</ref> &</type>
+ <declname>rhs</declname>
+ </param>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>and equal operator </para>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="47" column="1"/>
+ </memberdef>
+ <memberdef kind="function" id="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" prot="public" static="no" const="no" explicit="no" inline="no" virt="non-virtual">
+ <type>int *</type>
+ <definition>int* Foo::operator->*</definition>
+ <argsstring>(int *p)</argsstring>
+ <name>operator->*</name>
+ <param>
+ <type>int *</type>
+ <declname>p</declname>
+ </param>
+ <briefdescription>
+ </briefdescription>
+ <detaileddescription>
+ <para>Member pointer operator </para>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="50" column="1"/>
+ </memberdef>
+ <memberdef kind="function" id="struct_foo_1a978acd73e910ce56cc169ebec8736669" prot="public" static="no" const="yes" explicit="no" inline="no" virt="non-virtual">
+ <type>
+ <ref refid="struct_foo" kindref="compound">Foo</ref>
+ </type>
+ <definition>Foo Foo::fun</definition>
+ <argsstring>() const</argsstring>
+ <name>fun</name>
+ <briefdescription>
+ <para>Fun with itself. </para>
+ </briefdescription>
+ <detaileddescription>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="53" column="1"/>
+ </memberdef>
+ </sectiondef>
+ <sectiondef kind="public-static-func">
+ <memberdef kind="function" id="struct_foo_1abdf64a71706807b0f946265902c530ee" prot="public" static="yes" const="no" explicit="no" inline="no" virt="non-virtual">
+ <type>
+ <ref refid="struct_foo" kindref="compound">Foo</ref>
+ </type>
+ <definition>static Foo Foo::fun</definition>
+ <argsstring>(Foo a, Foo b)</argsstring>
+ <name>fun</name>
+ <param>
+ <type>
+ <ref refid="struct_foo" kindref="compound">Foo</ref>
+ </type>
+ <declname>a</declname>
+ </param>
+ <param>
+ <type>
+ <ref refid="struct_foo" kindref="compound">Foo</ref>
+ </type>
+ <declname>b</declname>
+ </param>
+ <briefdescription>
+ <para>Fun of two. </para>
+ </briefdescription>
+ <detaileddescription>
+ <para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">fun() const</ref>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">fun() const</ref>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <ref refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" kindref="member">title</ref>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </para>
+ </detaileddescription>
+ <inbodydescription>
+ </inbodydescription>
+ <location file="074_ref.cpp" line="29" column="1"/>
+ </memberdef>
+ </sectiondef>
+ <briefdescription>
+ <para><ref refid="struct_foo" kindref="compound">Foo</ref> class. </para>
+ </briefdescription>
+ <detaileddescription>
+ <para>
+ <simplesect kind="see">
+ <para><ref refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" kindref="member">Foo::Foo()</ref> constructor for details. </para>
+ </simplesect>
+ <simplesect kind="see">
+ <para><ref refid="struct_foo" kindref="compound">Foo</ref> constant. </para>
+ </simplesect>
+ <simplesect kind="see">
+ <para><ref refid="struct_foo_1a279debd94d894223fa8468933e2d6188" kindref="member">less than operator</ref>. </para>
+ </simplesect>
+ <simplesect kind="see">
+ <para><ref refid="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" kindref="member">const less than operator</ref>. </para>
+ </simplesect>
+ <simplesect kind="see">
+ <para><ref refid="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" kindref="member">call operator</ref>. </para>
+ </simplesect>
+ <simplesect kind="see">
+ <para><ref refid="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" kindref="member">const call operator</ref>. </para>
+ </simplesect>
+ <simplesect kind="see">
+ <para><ref refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" kindref="member">and equal operator</ref>. </para>
+ </simplesect>
+ <simplesect kind="see">
+ <para><ref refid="struct_foo_1ab1a2a53ad5b2a0f97422630330c151fe" kindref="member">const and equal operator</ref>. </para>
+ </simplesect>
+ <simplesect kind="see">
+ <para><ref refid="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" kindref="member">member pointer operator</ref>. </para>
+ </simplesect>
+ </para>
+ </detaileddescription>
+ <location file="074_ref.cpp" line="19" column="1" bodyfile="074_ref.cpp" bodystart="19" bodyend="54"/>
+ <listofallmembers>
+ <member refid="struct_foo_1a5c036d1b3561a0e1beffe8c6799a4276" prot="public" virt="non-virtual">
+ <scope>Foo</scope>
+ <name>Foo</name>
+ </member>
+ <member refid="struct_foo_1abdf64a71706807b0f946265902c530ee" prot="public" virt="non-virtual">
+ <scope>Foo</scope>
+ <name>fun</name>
+ </member>
+ <member refid="struct_foo_1a978acd73e910ce56cc169ebec8736669" prot="public" virt="non-virtual">
+ <scope>Foo</scope>
+ <name>fun</name>
+ </member>
+ <member refid="struct_foo_1aa20bd44b1bb87a652ac65170ddfa1a5a" prot="public" virt="non-virtual">
+ <scope>Foo</scope>
+ <name>operator&=</name>
+ </member>
+ <member refid="struct_foo_1ab1a2a53ad5b2a0f97422630330c151fe" prot="public" virt="non-virtual">
+ <scope>Foo</scope>
+ <name>operator&=</name>
+ </member>
+ <member refid="struct_foo_1a3a41dcf8c53f777d50676ea28400a640" prot="public" virt="non-virtual">
+ <scope>Foo</scope>
+ <name>operator()</name>
+ </member>
+ <member refid="struct_foo_1ae3c9c1f33cdb8b932c6eb104660a262b" prot="public" virt="non-virtual">
+ <scope>Foo</scope>
+ <name>operator()</name>
+ </member>
+ <member refid="struct_foo_1a0514e1f5b30cbf77e1c39d7aba308656" prot="public" virt="non-virtual">
+ <scope>Foo</scope>
+ <name>operator->*</name>
+ </member>
+ <member refid="struct_foo_1a279debd94d894223fa8468933e2d6188" prot="public" virt="non-virtual">
+ <scope>Foo</scope>
+ <name>operator<<</name>
+ </member>
+ <member refid="struct_foo_1a48bcc3de9b2f1ad09a3518a0c9f0da61" prot="public" virt="non-virtual">
+ <scope>Foo</scope>
+ <name>operator<<</name>
+ </member>
+ </listofallmembers>
+ </compounddef>
+</doxygen>
diff --git a/testing/074_ref.cpp b/testing/074_ref.cpp index d283907..cc9cf4a 100644 --- a/testing/074_ref.cpp +++ b/testing/074_ref.cpp @@ -13,6 +13,7 @@ * @see @ref operator()(int) "call operator". * @see @ref operator()(int) const "const call operator". * @see @ref operator&=(const Foo&) "and equal operator". + * @see @ref operator&=(const Foo&) const "const and equal operator". * @see @ref operator->*(int *) "member pointer operator". */ struct Foo { @@ -43,7 +44,7 @@ struct Foo { Foo& operator&=(const Foo& rhs); /** and equal operator */ - Foo& operator&=(const Foo& rhs); + const Foo& operator&=(const Foo& rhs) const; /** Member pointer operator */ int* operator->*(int *p); diff --git a/testing/runtests.py b/testing/runtests.py index 452c36e..358fb91 100755 --- a/testing/runtests.py +++ b/testing/runtests.py @@ -331,13 +331,14 @@ class TestManager: tester = Tester(self.args,test) tester.run(self) res=self.result() - if self.args.xhtml and not res and not self.args.keep: + if self.args.xhtml and self.args.inputdir!='.' and not res and not self.args.keep: shutil.rmtree("dtd",ignore_errors=True) return 0 if self.args.updateref else res def prepare_dtd(self): - shutil.rmtree("dtd",ignore_errors=True) - shutil.copytree(self.args.inputdir+"/dtd", "dtd") + if self.args.inputdir!='.': + shutil.rmtree("dtd",ignore_errors=True) + shutil.copytree(self.args.inputdir+"/dtd", "dtd") def main(): # argument handling @@ -411,7 +412,7 @@ def main(): tests.append(glob.glob('0%s_*'%id)) tests.append(glob.glob('00%s_*'%id)) if (not args.ids and not args.start_id): # find all tests - tests = glob.glob('[0-9][0-9][0-9]_*') + tests = sorted(glob.glob('[0-9][0-9][0-9]_*')) else: tests = list(itertools.chain.from_iterable(tests)) os.chdir(starting_directory) |