diff options
Diffstat (limited to 'testing')
-rw-r--r-- | testing/011/interface_integer.xml | 12 | ||||
-rw-r--r-- | testing/019/group__g1.xml | 2 | ||||
-rw-r--r-- | testing/019/group__g2.xml | 2 | ||||
-rw-r--r-- | testing/019/group__g3.xml | 2 | ||||
-rw-r--r-- | testing/021/indexpage.xml | 2 | ||||
-rw-r--r-- | testing/027/struct_car.xml | 24 | ||||
-rw-r--r-- | testing/027/struct_object.xml | 14 | ||||
-rw-r--r-- | testing/027/struct_truck.xml | 24 | ||||
-rw-r--r-- | testing/027/struct_vehicle.xml | 22 | ||||
-rw-r--r-- | testing/071/namespace_a_namespace_1_1_0d0.xml (renamed from testing/071/namespace_a_namespace_1_1_0D0.xml) | 2 | ||||
-rw-r--r-- | testing/071_enum_in_anon_ns.cpp | 2 | ||||
-rwxr-xr-x | testing/runtests.py | 5 |
12 files changed, 59 insertions, 54 deletions
diff --git a/testing/011/interface_integer.xml b/testing/011/interface_integer.xml index 863ec91..21d71fd 100644 --- a/testing/011/interface_integer.xml +++ b/testing/011/interface_integer.xml @@ -59,24 +59,24 @@ <para>An interface </para> </detaileddescription> <inheritancegraph> - <node id="1"> + <node id="2"> <label>Object</label> </node> - <node id="0"> + <node id="1"> <label>Integer</label> <link refid="interface_integer"/> - <childnode refid="1" relation="public-inheritance"> + <childnode refid="2" relation="public-inheritance"> </childnode> </node> </inheritancegraph> <collaborationgraph> - <node id="3"> + <node id="2"> <label>Object</label> </node> - <node id="2"> + <node id="1"> <label>Integer</label> <link refid="interface_integer"/> - <childnode refid="3" relation="public-inheritance"> + <childnode refid="2" relation="public-inheritance"> </childnode> </node> </collaborationgraph> diff --git a/testing/019/group__g1.xml b/testing/019/group__g1.xml index d9ea16d..d6807ca 100644 --- a/testing/019/group__g1.xml +++ b/testing/019/group__g1.xml @@ -20,9 +20,9 @@ </memberdef> </sectiondef> <briefdescription> + <para>Text for first group. </para> </briefdescription> <detaileddescription> - <para>Text for first group. </para> </detaileddescription> </compounddef> </doxygen> diff --git a/testing/019/group__g2.xml b/testing/019/group__g2.xml index 9b1fc83..3514d89 100644 --- a/testing/019/group__g2.xml +++ b/testing/019/group__g2.xml @@ -21,9 +21,9 @@ </memberdef> </sectiondef> <briefdescription> + <para>Text for second group. </para> </briefdescription> <detaileddescription> - <para>Text for second group. </para> </detaileddescription> </compounddef> </doxygen> diff --git a/testing/019/group__g3.xml b/testing/019/group__g3.xml index d9137b0..0f21232 100644 --- a/testing/019/group__g3.xml +++ b/testing/019/group__g3.xml @@ -34,9 +34,9 @@ </memberdef> </sectiondef> <briefdescription> + <para>Text for third group. </para> </briefdescription> <detaileddescription> - <para>Text for third group. </para> </detaileddescription> </compounddef> </doxygen> diff --git a/testing/021/indexpage.xml b/testing/021/indexpage.xml index 7c93a78..3ecbd0a 100644 --- a/testing/021/indexpage.xml +++ b/testing/021/indexpage.xml @@ -6,7 +6,7 @@ <briefdescription> </briefdescription> <detaileddescription> - <para> Our main function starts like this: <programlisting filename="example_test.cpp"><codeline><highlight class="normal">void<sp/>main()</highlight></codeline><codeline><highlight class="normal">{</highlight></codeline></programlisting> First we create a object <computeroutput>t</computeroutput> of the <ref refid="class_test" kindref="compound">Test</ref> class. <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/>Test<sp/>t;</highlight></codeline></programlisting> Then we call the example member function <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/>t.example();</highlight></codeline></programlisting> After that our little test routine ends. <programlisting filename="example_test.cpp"><codeline><highlight class="normal">}</highlight></codeline></programlisting> </para> + <para> Our main function starts like this: <programlisting filename="example_test.cpp"><codeline><highlight class="keywordtype">void</highlight><highlight class="normal"><sp/>main()</highlight></codeline><codeline><highlight class="normal">{</highlight></codeline></programlisting> First we create a object <computeroutput>t</computeroutput> of the <ref refid="class_test" kindref="compound">Test</ref> class. <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/><ref refid="class_test" kindref="compound">Test</ref><sp/>t;</highlight></codeline></programlisting> Then we call the example member function <programlisting filename="example_test.cpp"><codeline><highlight class="normal"><sp/><sp/>t.<ref refid="class_test_1a47b775f65718978f1ffcd96376f8ecfa" kindref="member">example</ref>();</highlight></codeline></programlisting> After that our little test routine ends. <programlisting filename="example_test.cpp"><codeline><highlight class="normal">}</highlight></codeline></programlisting> </para> </detaileddescription> </compounddef> </doxygen> diff --git a/testing/027/struct_car.xml b/testing/027/struct_car.xml index 61a8d16..b3d9894 100644 --- a/testing/027/struct_car.xml +++ b/testing/027/struct_car.xml @@ -27,43 +27,43 @@ <para><ref refid="struct_car" kindref="compound">Car</ref> class. </para> </detaileddescription> <inheritancegraph> - <node id="1"> + <node id="2"> <label>Vehicle</label> <link refid="struct_vehicle"/> - <childnode refid="2" relation="public-inheritance"> + <childnode refid="3" relation="public-inheritance"> </childnode> </node> - <node id="2"> + <node id="3"> <label>Object</label> <link refid="struct_object"/> </node> - <node id="0"> + <node id="1"> <label>Car</label> <link refid="struct_car"/> - <childnode refid="1" relation="public-inheritance"> + <childnode refid="2" relation="public-inheritance"> </childnode> </node> </inheritancegraph> <collaborationgraph> - <node id="4"> + <node id="2"> <label>Vehicle</label> <link refid="struct_vehicle"/> - <childnode refid="5" relation="public-inheritance"> + <childnode refid="3" relation="public-inheritance"> </childnode> - <childnode refid="5" relation="usage"> + <childnode refid="3" relation="usage"> <edgelabel>base</edgelabel> </childnode> </node> - <node id="5"> + <node id="3"> <label>Object</label> <link refid="struct_object"/> </node> - <node id="3"> + <node id="1"> <label>Car</label> <link refid="struct_car"/> - <childnode refid="4" relation="public-inheritance"> + <childnode refid="2" relation="public-inheritance"> </childnode> - <childnode refid="4" relation="usage"> + <childnode refid="2" relation="usage"> <edgelabel>base</edgelabel> </childnode> </node> diff --git a/testing/027/struct_object.xml b/testing/027/struct_object.xml index 18b34ef..754906e 100644 --- a/testing/027/struct_object.xml +++ b/testing/027/struct_object.xml @@ -63,26 +63,26 @@ <para>Base object class. </para> </detaileddescription> <inheritancegraph> - <node id="9"> + <node id="4"> <label>Truck</label> <link refid="struct_truck"/> - <childnode refid="7" relation="public-inheritance"> + <childnode refid="2" relation="public-inheritance"> </childnode> </node> - <node id="7"> + <node id="2"> <label>Vehicle</label> <link refid="struct_vehicle"/> - <childnode refid="6" relation="public-inheritance"> + <childnode refid="1" relation="public-inheritance"> </childnode> </node> - <node id="6"> + <node id="1"> <label>Object</label> <link refid="struct_object"/> </node> - <node id="8"> + <node id="3"> <label>Car</label> <link refid="struct_car"/> - <childnode refid="7" relation="public-inheritance"> + <childnode refid="2" relation="public-inheritance"> </childnode> </node> </inheritancegraph> diff --git a/testing/027/struct_truck.xml b/testing/027/struct_truck.xml index 92877e3..0da26dc 100644 --- a/testing/027/struct_truck.xml +++ b/testing/027/struct_truck.xml @@ -27,43 +27,43 @@ <para><ref refid="struct_truck" kindref="compound">Truck</ref> class. </para> </detaileddescription> <inheritancegraph> - <node id="11"> + <node id="1"> <label>Truck</label> <link refid="struct_truck"/> - <childnode refid="12" relation="public-inheritance"> + <childnode refid="2" relation="public-inheritance"> </childnode> </node> - <node id="12"> + <node id="2"> <label>Vehicle</label> <link refid="struct_vehicle"/> - <childnode refid="13" relation="public-inheritance"> + <childnode refid="3" relation="public-inheritance"> </childnode> </node> - <node id="13"> + <node id="3"> <label>Object</label> <link refid="struct_object"/> </node> </inheritancegraph> <collaborationgraph> - <node id="14"> + <node id="1"> <label>Truck</label> <link refid="struct_truck"/> - <childnode refid="15" relation="public-inheritance"> + <childnode refid="2" relation="public-inheritance"> </childnode> - <childnode refid="15" relation="usage"> + <childnode refid="2" relation="usage"> <edgelabel>base</edgelabel> </childnode> </node> - <node id="15"> + <node id="2"> <label>Vehicle</label> <link refid="struct_vehicle"/> - <childnode refid="16" relation="public-inheritance"> + <childnode refid="3" relation="public-inheritance"> </childnode> - <childnode refid="16" relation="usage"> + <childnode refid="3" relation="usage"> <edgelabel>base</edgelabel> </childnode> </node> - <node id="16"> + <node id="3"> <label>Object</label> <link refid="struct_object"/> </node> diff --git a/testing/027/struct_vehicle.xml b/testing/027/struct_vehicle.xml index 3fc2456..40c2be2 100644 --- a/testing/027/struct_vehicle.xml +++ b/testing/027/struct_vehicle.xml @@ -67,40 +67,40 @@ <para><ref refid="struct_vehicle" kindref="compound">Vehicle</ref> class. </para> </detaileddescription> <inheritancegraph> - <node id="20"> + <node id="4"> <label>Truck</label> <link refid="struct_truck"/> - <childnode refid="17" relation="public-inheritance"> + <childnode refid="1" relation="public-inheritance"> </childnode> </node> - <node id="17"> + <node id="1"> <label>Vehicle</label> <link refid="struct_vehicle"/> - <childnode refid="18" relation="public-inheritance"> + <childnode refid="2" relation="public-inheritance"> </childnode> </node> - <node id="18"> + <node id="2"> <label>Object</label> <link refid="struct_object"/> </node> - <node id="19"> + <node id="3"> <label>Car</label> <link refid="struct_car"/> - <childnode refid="17" relation="public-inheritance"> + <childnode refid="1" relation="public-inheritance"> </childnode> </node> </inheritancegraph> <collaborationgraph> - <node id="21"> + <node id="1"> <label>Vehicle</label> <link refid="struct_vehicle"/> - <childnode refid="22" relation="public-inheritance"> + <childnode refid="2" relation="public-inheritance"> </childnode> - <childnode refid="22" relation="usage"> + <childnode refid="2" relation="usage"> <edgelabel>base</edgelabel> </childnode> </node> - <node id="22"> + <node id="2"> <label>Object</label> <link refid="struct_object"/> </node> diff --git a/testing/071/namespace_a_namespace_1_1_0D0.xml b/testing/071/namespace_a_namespace_1_1_0d0.xml index 6e42714..14f5a51 100644 --- a/testing/071/namespace_a_namespace_1_1_0D0.xml +++ b/testing/071/namespace_a_namespace_1_1_0d0.xml @@ -1,6 +1,6 @@ <?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="namespace_a_namespace_1_1_0D0" kind="namespace" language="C++"> + <compounddef id="namespace_a_namespace_1_1_0d0" kind="namespace" language="C++"> <compoundname>ANamespace::@0</compoundname> <sectiondef kind="enum"> <memberdef kind="enum" id="071__enum__in__anon__ns_8cpp_1a96ab6574751fdf6a53ceec8a3896c45d" prot="public" static="no" strong="yes"> diff --git a/testing/071_enum_in_anon_ns.cpp b/testing/071_enum_in_anon_ns.cpp index a5b9ac8..8aab15f 100644 --- a/testing/071_enum_in_anon_ns.cpp +++ b/testing/071_enum_in_anon_ns.cpp @@ -1,5 +1,5 @@ // objective: test that enum values in anonymous namespaces produce no warning -// check: namespace_a_namespace_1_1_0D0.xml +// check: namespace_a_namespace_1_1_0d0.xml namespace ANamespace { namespace { diff --git a/testing/runtests.py b/testing/runtests.py index d132da5..fa3c186 100755 --- a/testing/runtests.py +++ b/testing/runtests.py @@ -116,6 +116,8 @@ class Tester: print('LATEX_OUTPUT=%s/latex' % self.test_out, file=f) if self.args.subdirs: print('CREATE_SUBDIRS=YES', file=f) + if (self.args.clang): + print('CLANG_ASSISTED_PARSING=YES', file=f) if (self.args.cfgs): for cfg in list(itertools.chain.from_iterable(self.args.cfgs)): if cfg.find('=') == -1: @@ -435,6 +437,9 @@ def main(): action="store_true") parser.add_argument('--subdirs',help='use the configuration parameter CREATE_SUBDIRS=YES', action="store_true") + parser.add_argument('--clang',help='use CLANG_ASSISTED_PARSING, works only when ' + 'doxygen has been compiled with "use_libclang"', + action="store_true") parser.add_argument('--keep',help='keep result directories', action="store_true") parser.add_argument('--cfg',nargs='+',dest='cfgs',action='append',help= |