From c6aaf0a4c35db27f968a7a6d0b9fa25b5b311bc3 Mon Sep 17 00:00:00 2001 From: wtschueller Date: Sat, 12 Jul 2014 20:35:31 +0200 Subject: Tcl: test 057 additionally tests mutual Xrefs for two files --- testing/057/057__caller__graphs_8tcl.xml | 38 ++++++++++++++++++++++---- testing/057/__057__caller__graphs_8tcl.xml | 28 +++++++++++++++++++ testing/057/namespace1.xml | 30 ++++++++++---------- testing/057/namespace1_1_11.xml | 4 +-- testing/057/namespace1_1_11_1_11.xml | 4 +-- testing/057/namespace2.xml | 8 +++--- testing/057/namespace2_1_12.xml | 6 ++-- testing/057/namespace2_1_12_1_12.xml | 6 ++-- testing/057/namespace2_1_12_1_12_1_12.xml | 6 ++-- testing/057/namespace2_1_12_1_12_1_12_1_12.xml | 8 +++--- testing/057/namespacebar.xml | 18 ++++++------ testing/057/namespacefoo.xml | 6 ++-- testing/057_caller_graphs.tcl | 17 ++++++++++++ 13 files changed, 126 insertions(+), 53 deletions(-) create mode 100644 testing/057/__057__caller__graphs_8tcl.xml diff --git a/testing/057/057__caller__graphs_8tcl.xml b/testing/057/057__caller__graphs_8tcl.xml index d2e3d84..4c54e1c 100644 --- a/testing/057/057__caller__graphs_8tcl.xml +++ b/testing/057/057__caller__graphs_8tcl.xml @@ -24,7 +24,7 @@ - + @@ -37,8 +37,8 @@ - - 1::test3 + + 1::test3 @@ -51,8 +51,36 @@ - - 2::next + + 2::next + + + + master + args + master + + + + + + + + inFileB + + + + inFileA + args + inFileA + + + + + + + + inFileB diff --git a/testing/057/__057__caller__graphs_8tcl.xml b/testing/057/__057__caller__graphs_8tcl.xml new file mode 100644 index 0000000..2fdcf6a --- /dev/null +++ b/testing/057/__057__caller__graphs_8tcl.xml @@ -0,0 +1,28 @@ + + + + _057_caller_graphs.tcl + + + + inFileB + args + inFileB + + + + + + + + inFileA + master + + + + + + + + + diff --git a/testing/057/namespace1.xml b/testing/057/namespace1.xml index e40300d..e74d8fe 100644 --- a/testing/057/namespace1.xml +++ b/testing/057/namespace1.xml @@ -15,9 +15,9 @@ - - test1 - test5 + + test1 + test5 @@ -30,8 +30,8 @@ - - test2 + + test2 @@ -44,8 +44,8 @@ - - baz + + baz @@ -58,8 +58,8 @@ - - bar + + bar @@ -72,8 +72,8 @@ - - bar + + bar @@ -86,8 +86,8 @@ - - 1::1::bar + + 1::1::bar @@ -100,8 +100,8 @@ - - baz + + baz diff --git a/testing/057/namespace1_1_11.xml b/testing/057/namespace1_1_11.xml index 157ab5e..e5c5596 100644 --- a/testing/057/namespace1_1_11.xml +++ b/testing/057/namespace1_1_11.xml @@ -15,8 +15,8 @@ - - 1::test4 + + 1::test4 diff --git a/testing/057/namespace1_1_11_1_11.xml b/testing/057/namespace1_1_11_1_11.xml index 2f5a685..caccbe4 100644 --- a/testing/057/namespace1_1_11_1_11.xml +++ b/testing/057/namespace1_1_11_1_11.xml @@ -14,13 +14,13 @@ - + - + diff --git a/testing/057/namespace2.xml b/testing/057/namespace2.xml index 47a9fcf..6ea122c 100644 --- a/testing/057/namespace2.xml +++ b/testing/057/namespace2.xml @@ -15,10 +15,10 @@ - - 2::2::next - next - 2::2::2::2::2::next + + 2::2::next + next + 2::2::2::2::2::next diff --git a/testing/057/namespace2_1_12.xml b/testing/057/namespace2_1_12.xml index 3338473..d2a589a 100644 --- a/testing/057/namespace2_1_12.xml +++ b/testing/057/namespace2_1_12.xml @@ -15,9 +15,9 @@ - - 2::2::2::next - 2::next + + 2::2::2::next + 2::next diff --git a/testing/057/namespace2_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12.xml index 259ef25..d04a73c 100644 --- a/testing/057/namespace2_1_12_1_12.xml +++ b/testing/057/namespace2_1_12_1_12.xml @@ -15,9 +15,9 @@ - - 2::2::2::2::next - 2::2::next + + 2::2::2::2::next + 2::2::next diff --git a/testing/057/namespace2_1_12_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12_1_12.xml index cea3062..980906d 100644 --- a/testing/057/namespace2_1_12_1_12_1_12.xml +++ b/testing/057/namespace2_1_12_1_12_1_12.xml @@ -15,9 +15,9 @@ - - 2::2::2::2::2::next - 2::2::2::next + + 2::2::2::2::2::next + 2::2::2::next diff --git a/testing/057/namespace2_1_12_1_12_1_12_1_12.xml b/testing/057/namespace2_1_12_1_12_1_12_1_12.xml index 65bfa00..0c6957b 100644 --- a/testing/057/namespace2_1_12_1_12_1_12_1_12.xml +++ b/testing/057/namespace2_1_12_1_12_1_12_1_12.xml @@ -14,15 +14,15 @@ - - 2::next - 2::2::2::2::next + + 2::next + 2::2::2::2::next - + diff --git a/testing/057/namespacebar.xml b/testing/057/namespacebar.xml index 642986b..3c0f6e9 100644 --- a/testing/057/namespacebar.xml +++ b/testing/057/namespacebar.xml @@ -14,9 +14,9 @@ - - baz - foo::master + + baz + foo::master @@ -29,9 +29,9 @@ - - bazbaz - slave + + bazbaz + slave @@ -44,14 +44,14 @@ - - baz + + baz - + diff --git a/testing/057/namespacefoo.xml b/testing/057/namespacefoo.xml index 11f8053..2aae8ea 100644 --- a/testing/057/namespacefoo.xml +++ b/testing/057/namespacefoo.xml @@ -14,14 +14,14 @@ - - bar::slave + + bar::slave - + diff --git a/testing/057_caller_graphs.tcl b/testing/057_caller_graphs.tcl index 25bf1e7..f6e0e77 100644 --- a/testing/057_caller_graphs.tcl +++ b/testing/057_caller_graphs.tcl @@ -1,5 +1,6 @@ #// objective: test for completeness and correctness of references/referencedby relations #// check: 057__caller__graphs_8tcl.xml +#// check: __057__caller__graphs_8tcl.xml #// check: namespacebar.xml #// check: namespacefoo.xml #// check: namespace1.xml @@ -14,6 +15,7 @@ #// config: INLINE_SOURCES = no #// config: REFERENCED_BY_RELATION = yes #// config: REFERENCES_RELATION = yes +#// config: INPUT = 057_caller_graphs.tcl _057_caller_graphs.tcl # config: HAVE_DOT = yes # config: CALLER_GRAPH = yes # config: CALL_GRAPH = yes @@ -126,6 +128,20 @@ proc ::2::2::2::2::2::next args { array set info [info frame 0]; puts $info(proc) 2::next } +# +# cross check with two files +# If doxygen did not do two passes, then xrefs would depend on file order +# and would be incomplete. +source _057_caller_graphs.tcl +proc master args { + array set info [info frame 0]; puts -nonewline ->$info(proc) + inFileB + return +} +proc inFileA args { + array set info [info frame 0]; puts -nonewline ->$info(proc) + return +} # now, check with tcl what is called foo::master puts "" @@ -134,5 +150,6 @@ foreach proc [lsort [info procs ::1::test?]] { puts "" } ::next +master exit -- cgit v0.12