avkonst 10 роки тому
батько
коміт
5b302d0f8d
100 змінених файлів з 6528 додано та 6544 видалено
  1. 1 1
      mainline/ext/std/code/member.ini
  2. 1 1
      mainline/mpp/internal/py2xml.py
  3. 3 0
      mainline/tests/common.py
  4. 14 14
      mainline/tests/general/test_basic/test_help_--help_default_stdout.gold.txt
  5. 117 136
      mainline/tests/general/test_basic/test_help_collect_default_stdout.gold.txt
  6. 18 18
      mainline/tests/general/test_basic/test_help_export_default_stdout.gold.txt
  7. 18 18
      mainline/tests/general/test_basic/test_help_info_default_stdout.gold.txt
  8. 48 48
      mainline/tests/general/test_basic/test_help_limit_default_stdout.gold.txt
  9. 36 36
      mainline/tests/general/test_basic/test_help_view_default_stdout.gold.txt
  10. 16 16
      mainline/tests/general/test_basic/test_std_code_magic_view_default_stdout.gold.txt
  11. 96 96
      mainline/tests/general/test_basic/test_std_code_magic_view_nest_per_file_stdout.gold.txt
  12. 94 94
      mainline/tests/general/test_basic/test_std_code_magic_view_nozeros_nest_per_file_stdout.gold.txt
  13. 14 14
      mainline/tests/general/test_basic/test_std_code_magic_view_nozeros_stdout.gold.txt
  14. 16 16
      mainline/tests/general/test_basic/test_std_complexity_maxindent_view_default_stdout.gold.txt
  15. 95 95
      mainline/tests/general/test_basic/test_std_complexity_maxindent_view_nest_per_file_stdout.gold.txt
  16. 120 120
      mainline/tests/general/test_basic/test_std_filelines_metrics_view_nest_per_file_stdout.gold.txt
  17. 44 44
      mainline/tests/general/test_basic/test_std_filelines_metrics_view_txt_stdout.gold.txt
  18. 108 108
      mainline/tests/general/test_basic/test_std_general_metrics_view_nest_per_file_stdout.gold.txt
  19. 32 32
      mainline/tests/general/test_basic/test_std_general_metrics_view_txt_stdout.gold.txt
  20. 173 173
      mainline/tests/general/test_basic/test_std_lines_metrics_view_nest_per_file_stdout.gold.txt
  21. 59 59
      mainline/tests/general/test_basic/test_std_lines_metrics_view_txt_stdout.gold.txt
  22. 115 115
      mainline/tests/general/test_basic/test_view_format_view_nest_per_file_stdout.gold.txt
  23. 27 27
      mainline/tests/general/test_basic/test_view_format_view_nest_stdout.gold.txt
  24. 1 1
      mainline/tests/general/test_basic/test_view_format_view_python_stdout.gold.txt
  25. 16 16
      mainline/tests/general/test_basic/test_view_format_view_txt_stdout.gold.txt
  26. 24 24
      mainline/tests/general/test_basic/test_view_format_view_xml_stdout.gold.txt
  27. 6 6
      mainline/tests/general/test_basic/test_workflow_collect_default_stderr.gold.txt
  28. 5 5
      mainline/tests/general/test_basic/test_workflow_collect_second_stderr.gold.txt
  29. 3 3
      mainline/tests/general/test_basic/test_workflow_export_default_stderr.gold.txt
  30. 19 19
      mainline/tests/general/test_basic/test_workflow_export_default_stdout.gold.txt
  31. 3 3
      mainline/tests/general/test_basic/test_workflow_export_second_stderr.gold.txt
  32. 18 18
      mainline/tests/general/test_basic/test_workflow_export_second_stdout.gold.txt
  33. 3 3
      mainline/tests/general/test_basic/test_workflow_info_default_stderr.gold.txt
  34. 31 31
      mainline/tests/general/test_basic/test_workflow_info_default_stdout.gold.txt
  35. 3 3
      mainline/tests/general/test_basic/test_workflow_info_second_stderr.gold.txt
  36. 31 31
      mainline/tests/general/test_basic/test_workflow_info_second_stdout.gold.txt
  37. 4 4
      mainline/tests/general/test_basic/test_workflow_limit_default_stderr.gold.txt
  38. 72 72
      mainline/tests/general/test_basic/test_workflow_limit_default_stdout.gold.txt
  39. 4 4
      mainline/tests/general/test_basic/test_workflow_limit_second_stderr.gold.txt
  40. 54 54
      mainline/tests/general/test_basic/test_workflow_limit_second_stdout.gold.txt
  41. 4 4
      mainline/tests/general/test_basic/test_workflow_limit_second_warn_all_stderr.gold.txt
  42. 54 54
      mainline/tests/general/test_basic/test_workflow_limit_second_warn_all_stdout.gold.txt
  43. 5 5
      mainline/tests/general/test_basic/test_workflow_limit_second_warn_new_stderr.gold.txt
  44. 18 18
      mainline/tests/general/test_basic/test_workflow_limit_second_warn_new_stdout.gold.txt
  45. 5 5
      mainline/tests/general/test_basic/test_workflow_limit_second_warn_touched_stderr.gold.txt
  46. 36 36
      mainline/tests/general/test_basic/test_workflow_limit_second_warn_touched_stdout.gold.txt
  47. 5 5
      mainline/tests/general/test_basic/test_workflow_limit_second_warn_trend_stderr.gold.txt
  48. 27 27
      mainline/tests/general/test_basic/test_workflow_limit_second_warn_trend_stdout.gold.txt
  49. 3 3
      mainline/tests/general/test_basic/test_workflow_view_default_stderr.gold.txt
  50. 76 76
      mainline/tests/general/test_basic/test_workflow_view_default_stdout.gold.txt
  51. 3 3
      mainline/tests/general/test_basic/test_workflow_view_second_per_file_stderr.gold.txt
  52. 184 184
      mainline/tests/general/test_basic/test_workflow_view_second_per_file_stdout.gold.txt
  53. 3 3
      mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_all_stderr.gold.txt
  54. 214 214
      mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_all_stdout.gold.txt
  55. 4 4
      mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_new_stderr.gold.txt
  56. 200 200
      mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_new_stdout.gold.txt
  57. 4 4
      mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_touched_stderr.gold.txt
  58. 209 209
      mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_touched_stdout.gold.txt
  59. 3 3
      mainline/tests/general/test_basic/test_workflow_view_second_stderr.gold.txt
  60. 87 87
      mainline/tests/general/test_basic/test_workflow_view_second_stdout.gold.txt
  61. 3 3
      mainline/tests/general/test_basic/test_workflow_view_second_txt_all_stderr.gold.txt
  62. 90 90
      mainline/tests/general/test_basic/test_workflow_view_second_txt_all_stdout.gold.txt
  63. 5 5
      mainline/tests/general/test_basic/test_workflow_view_second_txt_new_stderr.gold.txt
  64. 83 83
      mainline/tests/general/test_basic/test_workflow_view_second_txt_new_stdout.gold.txt
  65. 6 6
      mainline/tests/general/test_basic/test_workflow_view_second_txt_touched_stderr.gold.txt
  66. 89 89
      mainline/tests/general/test_basic/test_workflow_view_second_txt_touched_stdout.gold.txt
  67. 6 6
      mainline/tests/general/test_std_code_cpp/test_parser_collect_default_stdout.gold.txt
  68. 108 108
      mainline/tests/general/test_std_code_cpp/test_parser_limit_default_stdout.gold.txt
  69. 27 27
      mainline/tests/general/test_std_code_cpp/test_parser_view_default_stdout.gold.txt
  70. 889 889
      mainline/tests/general/test_std_code_cpp/test_parser_view_files_stdout.gold.txt
  71. 144 144
      mainline/tests/general/test_std_code_cs/test_parser_limit_default_stdout.gold.txt
  72. 29 29
      mainline/tests/general/test_std_code_cs/test_parser_view_default_stdout.gold.txt
  73. 461 461
      mainline/tests/general/test_std_code_cs/test_parser_view_files_stdout.gold.txt
  74. 54 54
      mainline/tests/general/test_std_code_java/test_parser_limit_default_stdout.gold.txt
  75. 29 29
      mainline/tests/general/test_std_code_java/test_parser_view_default_stdout.gold.txt
  76. 1077 1077
      mainline/tests/general/test_std_code_java/test_parser_view_files_stdout.gold.txt
  77. 57 57
      mainline/tests/general/test_std_code_todo/test_comments_view_files_stdout.gold.txt
  78. 56 56
      mainline/tests/general/test_std_code_todo/test_strings_view_files_stdout.gold.txt
  79. 6 6
      mainline/tests/general/test_std_code_todo/test_tags_collect_badtag_stderr.gold.txt
  80. 23 23
      mainline/tests/general/test_std_code_todo/test_tags_view_default_stdout.gold.txt
  81. 28 28
      mainline/tests/general/test_std_suppress/test_basic_collect_default_stdout.gold.txt
  82. 9 9
      mainline/tests/general/test_std_suppress/test_basic_limit_1_stdout.gold.txt
  83. 72 72
      mainline/tests/general/test_std_suppress/test_basic_limit_2_stdout.gold.txt
  84. 63 63
      mainline/tests/general/test_std_suppress/test_basic_limit_3_stdout.gold.txt
  85. 234 234
      mainline/tests/general/test_std_suppress/test_basic_limit_4_stdout.gold.txt
  86. 72 72
      mainline/tests/general/test_std_suppress/test_basic_limit_5_stdout.gold.txt
  87. 9 9
      mainline/tests/general/test_std_suppress/test_basic_limit_size_nosup_stdout.gold.txt
  88. 66 66
      mainline/tests/general/test_std_suppress/test_basic_view_default_stdout.gold.txt
  89. 3 3
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step0_stderr.gold.txt
  90. 3 3
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step1_stderr.gold.txt
  91. 1 1
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step1_stdout.gold.txt
  92. 3 3
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step2_stderr.gold.txt
  93. 1 1
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step2_stdout.gold.txt
  94. 3 3
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step3_stderr.gold.txt
  95. 1 1
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step3_stdout.gold.txt
  96. 3 3
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step4_stderr.gold.txt
  97. 3 3
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step5_stderr.gold.txt
  98. 3 3
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step6_stderr.gold.txt
  99. 3 3
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step7_stderr.gold.txt
  100. 0 0
      mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step8_stderr.gold.txt

+ 1 - 1
mainline/ext/std/code/member.ini

@@ -24,4 +24,4 @@ module:  member
 class:   Plugin
 depends: None
 actions: collect
-enabled: True
+enabled: False

+ 1 - 1
mainline/mpp/internal/py2xml.py

@@ -90,7 +90,7 @@ class Py2XML():
             return childStr
 
         # create XML string for attributes
-        for k, v in attributes.items():
+        for k, v in sorted(attributes.items()):
             attrStr += " %s=\"%s\"" % ( k, v )
 
         # let's assemble our tag string

+ 3 - 0
mainline/tests/common.py

@@ -143,6 +143,9 @@ class ToolRunner(object):
             for each in lines:
                 gold_to_compare += "".join(gold_lines[each[0] : each[1]])
                 text_to_compare += "".join(text_lines[each[0] : each[1]])
+        
+        gold_to_compare = gold_to_compare.replace('\r', '')
+        text_to_compare = text_to_compare.replace('\r', '')
             
         result = (gold_to_compare == text_to_compare)
         

+ 14 - 14
mainline/tests/general/test_basic/test_help_--help_default_stdout.gold.txt

@@ -1,14 +1,14 @@
-Usage: python metrix++.py --help
-       python metrix++.py <action> --help
-       python metrix++.py <action> [options] -- [path 1] ... [path N]
-
-Actions: 
-  collect
-  export
-  info
-  limit
-  test
-  view
-
-Options:
-  -h, --help  show this help message and exit
+Usage: python metrix++.py --help
+       python metrix++.py <action> --help
+       python metrix++.py <action> [options] -- [path 1] ... [path N]
+
+Actions: 
+  collect
+  export
+  info
+  limit
+  test
+  view
+
+Options:
+  -h, --help  show this help message and exit

+ 117 - 136
mainline/tests/general/test_basic/test_help_collect_default_stdout.gold.txt

@@ -1,136 +1,117 @@
-Usage: python metrix++.py --help
-       python metrix++.py collect --help
-       python metrix++.py collect [options] -- [path 1] ... [path N]
-
-Options:
-  -h, --help            show this help message and exit
-  --db-file=DB_FILE, --dbf=DB_FILE
-                        Path to a database file to create and write [default:
-                        ./metrixpp.db].
-  --db-file-prev=DB_FILE_PREV, --dbfp=DB_FILE_PREV
-                        Path to database file with data collected for the
-                        past/previous code revision. If it is set, the tool
-                        will do an incremental/iterative collection. It may
-                        reduce the time of processing significantly [default:
-                        none].
-  --log-level=LOG_LEVEL, --ll=LOG_LEVEL
-                        Defines log level. Possible values are
-                        'DEBUG','INFO','WARNING' or 'ERROR'. Default value is
-                        inherited from environment variable
-                        'METRIXPLUSPLUS_LOG_LEVEL' if set. [default: INFO]
-  --std.code.cs.files=STD.CODE.CS.FILES
-                        Enumerates filename extensions to match C# files
-                        [default: *.cs]
-  --std.code.complexity.cyclomatic, --sccc
-                        Enables collection of cyclomatic complexity metric
-                        (McCabe) [default: False]
-  --std.code.complexity.maxindent, --sccmi
-                        Enables collection of maximum indent level metric
-                        [default: False]
-  --std.code.lines.code, --sclc
-                        Enables collection of lines of code metric (per region
-                        detalization) - number of non-empty lines of code,
-                        excluding comments [default: False]
-  --std.code.lines.preprocessor, --sclp
-                        Enables collection of lines of preprocessor code
-                        metric (per region detalization) - number of non-empty
-                        lines of preprocessor code [default: False]
-  --std.code.lines.comments, --sclcom
-                        Enables collection of lines of comments metric (per
-                        region detalization) - number of non-empty lines of
-                        comments [default: False]
-  --std.code.lines.total, --sclt
-                        Enables collection of total lines metric (per region
-                        detalization) - number of any type of lines (blank,
-                        code, comments, etc.)[default: False]
-  --std.code.maintindex.simple, --scmis
-                        Enables collection of simple maintainability index
-                        metric. It uses std.code.line:code,
-                        std.code.complexity:cyclomatic metrics to rank level
-                        of maintainability. Lower value of this metric
-                        indicates better maintainability. [default: False]
-  --std.code.filelines.code, --scflc
-                        Enables collection of lines of code metric (per file
-                        detalization) - number of non-empty lines of code,
-                        excluding comments [default: False]
-  --std.code.filelines.preprocessor, --scflp
-                        Enables collection of lines of preprocessor code
-                        metric (per file detalization) - number of non-empty
-                        lines of preprocessor code [default: False]
-  --std.code.filelines.comments, --scflcom
-                        Enables collection of lines of comments metric (per
-                        file detalization) - number of non-empty lines of
-                        comments [default: False]
-  --std.code.filelines.total, --scflt
-                        Enables collection of total lines metric (per file
-                        detalization) - number of any type of lines (blank,
-                        code, comments, etc.)[default: False]
-  --std.code.length.total, --sclent
-                        Enables collection of size metric (in number of
-                        symbols per region) [default: False]
-  --std.code.member.fields, --scmf
-                        Enables collection of number of data members / fields
-                        per classes, structs and interfaces [default: False]
-  --std.code.member.globals, --scmg
-                        Enables collection of number of global variables /
-                        fields per global regions and namespaces [default:
-                        False]
-  --std.code.member.classes, --scmc
-                        Enables collection of number of classes defined per
-                        any region [default: False]
-  --std.code.member.structs, --scms
-                        Enables collection of number of structs defined per
-                        any region [default: False]
-  --std.code.member.interfaces, --scmi
-                        Enables collection of number of interfaces defined per
-                        any region [default: False]
-  --std.code.member.methods, --scmm
-                        Enables collection of number of methods (functions)
-                        defined per any region [default: False]
-  --std.code.cpp.files=STD.CODE.CPP.FILES
-                        Enumerates filename extensions to match C/C++ files
-                        [default: *.c,*.h,*.cpp,*.hpp,*.cc,*.hh,*.cxx,*.hxx]
-  --std.code.java.files=STD.CODE.JAVA.FILES
-                        Enumerates filename extensions to match Java files
-                        [default: *.java]
-  --std.code.todo.comments, --sctc
-                        Enables collection of number of todo/fixme/etc markers
-                        in comments [default: False]
-  --std.code.todo.strings, --scts
-                        Enables collection of number of todo/fixme/etc markers
-                        in strings [default: False]
-  --std.code.todo.tags=STD.CODE.TODO.TAGS, --sctt=STD.CODE.TODO.TAGS
-                        A list of typical todo markers to search, separated by
-                        comma [default: TODO,ToDo,FIXME,FixMe,TBD,HACK,XXX]
-  --std.code.magic.numbers, --scmn
-                        Enables collection of magic numbers metric [default:
-                        False]
-  --std.code.magic.numbers.simplier, --scmns
-                        Is set, 0, -1 and 1 numbers are not counted in
-                        'std.code.magic.numbers' metric [default: False]
-  --std.suppress, --ss  If set (True), suppression markers are collected from
-                        comments in code. Suppressions are used by post-
-                        processing tools, like limit, to remove false-positive
-                        warnings. Suppressions should be in the first comment
-                        block of a region (function/class/interface). Format
-                        of suppressions: 'metrix++: suppress metric-name'. For
-                        example: 'metrix++: suppress
-                        std.code.complexity:cyclomatic'.  [default: False]
-  --std.general.proctime, --sgpt
-                        If the option is set (True), the tool measures
-                        processing time per file [default: False]
-  --std.general.procerrors, --sgpe
-                        If the option is set (True), the tool counts number of
-                        processing/parsing errors per file [default: False]
-  --std.general.size, --sgs
-                        If the option is set (True), the tool collects file
-                        size metric (in bytes) [default: False]
-  --include-files=INCLUDE_FILES, --if=INCLUDE_FILES
-                        Defines the regular expression pattern to include
-                        files in processing [default: .*]
-  --exclude-files=EXCLUDE_FILES, --ef=EXCLUDE_FILES
-                        Defines the regular expression pattern to exclude
-                        files from processing [default: ^[.]]
-  --non-recursively, --nr
-                        If the option is set (True), sub-directories are not
-                        processed [default: False]
+Usage: python metrix++.py --help
+       python metrix++.py collect --help
+       python metrix++.py collect [options] -- [path 1] ... [path N]
+
+Options:
+  -h, --help            show this help message and exit
+  --db-file=DB_FILE, --dbf=DB_FILE
+                        Path to a database file to create and write [default:
+                        ./metrixpp.db].
+  --db-file-prev=DB_FILE_PREV, --dbfp=DB_FILE_PREV
+                        Path to database file with data collected for the
+                        past/previous code revision. If it is set, the tool
+                        will do an incremental/iterative collection. It may
+                        reduce the time of processing significantly [default:
+                        none].
+  --log-level=LOG_LEVEL, --ll=LOG_LEVEL
+                        Defines log level. Possible values are
+                        'DEBUG','INFO','WARNING' or 'ERROR'. Default value is
+                        inherited from environment variable
+                        'METRIXPLUSPLUS_LOG_LEVEL' if set. [default: INFO]
+  --std.code.complexity.cyclomatic, --sccc
+                        Enables collection of cyclomatic complexity metric
+                        (McCabe) [default: False]
+  --std.code.complexity.maxindent, --sccmi
+                        Enables collection of maximum indent level metric
+                        [default: False]
+  --std.code.cpp.files=STD.CODE.CPP.FILES
+                        Enumerates filename extensions to match C/C++ files
+                        [default: *.c,*.h,*.cpp,*.hpp,*.cc,*.hh,*.cxx,*.hxx]
+  --std.code.cs.files=STD.CODE.CS.FILES
+                        Enumerates filename extensions to match C# files
+                        [default: *.cs]
+  --std.code.filelines.code, --scflc
+                        Enables collection of lines of code metric (per file
+                        detalization) - number of non-empty lines of code,
+                        excluding comments [default: False]
+  --std.code.filelines.preprocessor, --scflp
+                        Enables collection of lines of preprocessor code
+                        metric (per file detalization) - number of non-empty
+                        lines of preprocessor code [default: False]
+  --std.code.filelines.comments, --scflcom
+                        Enables collection of lines of comments metric (per
+                        file detalization) - number of non-empty lines of
+                        comments [default: False]
+  --std.code.filelines.total, --scflt
+                        Enables collection of total lines metric (per file
+                        detalization) - number of any type of lines (blank,
+                        code, comments, etc.)[default: False]
+  --std.code.java.files=STD.CODE.JAVA.FILES
+                        Enumerates filename extensions to match Java files
+                        [default: *.java]
+  --std.code.length.total, --sclent
+                        Enables collection of size metric (in number of
+                        symbols per region) [default: False]
+  --std.code.lines.code, --sclc
+                        Enables collection of lines of code metric (per region
+                        detalization) - number of non-empty lines of code,
+                        excluding comments [default: False]
+  --std.code.lines.preprocessor, --sclp
+                        Enables collection of lines of preprocessor code
+                        metric (per region detalization) - number of non-empty
+                        lines of preprocessor code [default: False]
+  --std.code.lines.comments, --sclcom
+                        Enables collection of lines of comments metric (per
+                        region detalization) - number of non-empty lines of
+                        comments [default: False]
+  --std.code.lines.total, --sclt
+                        Enables collection of total lines metric (per region
+                        detalization) - number of any type of lines (blank,
+                        code, comments, etc.)[default: False]
+  --std.code.magic.numbers, --scmn
+                        Enables collection of magic numbers metric [default:
+                        False]
+  --std.code.magic.numbers.simplier, --scmns
+                        Is set, 0, -1 and 1 numbers are not counted in
+                        'std.code.magic.numbers' metric [default: False]
+  --std.code.maintindex.simple, --scmis
+                        Enables collection of simple maintainability index
+                        metric. It uses std.code.line:code,
+                        std.code.complexity:cyclomatic metrics to rank level
+                        of maintainability. Lower value of this metric
+                        indicates better maintainability. [default: False]
+  --std.code.todo.comments, --sctc
+                        Enables collection of number of todo/fixme/etc markers
+                        in comments [default: False]
+  --std.code.todo.strings, --scts
+                        Enables collection of number of todo/fixme/etc markers
+                        in strings [default: False]
+  --std.code.todo.tags=STD.CODE.TODO.TAGS, --sctt=STD.CODE.TODO.TAGS
+                        A list of typical todo markers to search, separated by
+                        comma [default: TODO,ToDo,FIXME,FixMe,TBD,HACK,XXX]
+  --std.suppress, --ss  If set (True), suppression markers are collected from
+                        comments in code. Suppressions are used by post-
+                        processing tools, like limit, to remove false-positive
+                        warnings. Suppressions should be in the first comment
+                        block of a region (function/class/interface). Format
+                        of suppressions: 'metrix++: suppress metric-name'. For
+                        example: 'metrix++: suppress
+                        std.code.complexity:cyclomatic'.  [default: False]
+  --std.general.proctime, --sgpt
+                        If the option is set (True), the tool measures
+                        processing time per file [default: False]
+  --std.general.procerrors, --sgpe
+                        If the option is set (True), the tool counts number of
+                        processing/parsing errors per file [default: False]
+  --std.general.size, --sgs
+                        If the option is set (True), the tool collects file
+                        size metric (in bytes) [default: False]
+  --include-files=INCLUDE_FILES, --if=INCLUDE_FILES
+                        Defines the regular expression pattern to include
+                        files in processing [default: .*]
+  --exclude-files=EXCLUDE_FILES, --ef=EXCLUDE_FILES
+                        Defines the regular expression pattern to exclude
+                        files from processing [default: ^[.]]
+  --non-recursively, --nr
+                        If the option is set (True), sub-directories are not
+                        processed [default: False]

+ 18 - 18
mainline/tests/general/test_basic/test_help_export_default_stdout.gold.txt

@@ -1,18 +1,18 @@
-Usage: python metrix++.py --help
-       python metrix++.py export --help
-       python metrix++.py export [options] -- [path 1] ... [path N]
-
-Options:
-  -h, --help            show this help message and exit
-  --db-file=DB_FILE, --dbf=DB_FILE
-                        Path to a database file to read and process [default:
-                        ./metrixpp.db].
-  --db-file-prev=DB_FILE_PREV, --dbfp=DB_FILE_PREV
-                        Path to database file with data collected for the
-                        past/previous code revision. It is used to identify
-                        and evaluate/analyze change trends. [default: none].
-  --log-level=LOG_LEVEL, --ll=LOG_LEVEL
-                        Defines log level. Possible values are
-                        'DEBUG','INFO','WARNING' or 'ERROR'. Default value is
-                        inherited from environment variable
-                        'METRIXPLUSPLUS_LOG_LEVEL' if set. [default: INFO]
+Usage: python metrix++.py --help
+       python metrix++.py export --help
+       python metrix++.py export [options] -- [path 1] ... [path N]
+
+Options:
+  -h, --help            show this help message and exit
+  --db-file=DB_FILE, --dbf=DB_FILE
+                        Path to a database file to read and process [default:
+                        ./metrixpp.db].
+  --db-file-prev=DB_FILE_PREV, --dbfp=DB_FILE_PREV
+                        Path to database file with data collected for the
+                        past/previous code revision. It is used to identify
+                        and evaluate/analyze change trends. [default: none].
+  --log-level=LOG_LEVEL, --ll=LOG_LEVEL
+                        Defines log level. Possible values are
+                        'DEBUG','INFO','WARNING' or 'ERROR'. Default value is
+                        inherited from environment variable
+                        'METRIXPLUSPLUS_LOG_LEVEL' if set. [default: INFO]

+ 18 - 18
mainline/tests/general/test_basic/test_help_info_default_stdout.gold.txt

@@ -1,18 +1,18 @@
-Usage: python metrix++.py --help
-       python metrix++.py info --help
-       python metrix++.py info [options] -- [path 1] ... [path N]
-
-Options:
-  -h, --help            show this help message and exit
-  --db-file=DB_FILE, --dbf=DB_FILE
-                        Path to a database file to read and process [default:
-                        ./metrixpp.db].
-  --db-file-prev=DB_FILE_PREV, --dbfp=DB_FILE_PREV
-                        Path to database file with data collected for the
-                        past/previous code revision. It is used to identify
-                        and evaluate/analyze change trends. [default: none].
-  --log-level=LOG_LEVEL, --ll=LOG_LEVEL
-                        Defines log level. Possible values are
-                        'DEBUG','INFO','WARNING' or 'ERROR'. Default value is
-                        inherited from environment variable
-                        'METRIXPLUSPLUS_LOG_LEVEL' if set. [default: INFO]
+Usage: python metrix++.py --help
+       python metrix++.py info --help
+       python metrix++.py info [options] -- [path 1] ... [path N]
+
+Options:
+  -h, --help            show this help message and exit
+  --db-file=DB_FILE, --dbf=DB_FILE
+                        Path to a database file to read and process [default:
+                        ./metrixpp.db].
+  --db-file-prev=DB_FILE_PREV, --dbfp=DB_FILE_PREV
+                        Path to database file with data collected for the
+                        past/previous code revision. It is used to identify
+                        and evaluate/analyze change trends. [default: none].
+  --log-level=LOG_LEVEL, --ll=LOG_LEVEL
+                        Defines log level. Possible values are
+                        'DEBUG','INFO','WARNING' or 'ERROR'. Default value is
+                        inherited from environment variable
+                        'METRIXPLUSPLUS_LOG_LEVEL' if set. [default: INFO]

+ 48 - 48
mainline/tests/general/test_basic/test_help_limit_default_stdout.gold.txt

@@ -1,48 +1,48 @@
-Usage: python metrix++.py --help
-       python metrix++.py limit --help
-       python metrix++.py limit [options] -- [path 1] ... [path N]
-
-Options:
-  -h, --help            show this help message and exit
-  --db-file=DB_FILE, --dbf=DB_FILE
-                        Path to a database file to read and process [default:
-                        ./metrixpp.db].
-  --db-file-prev=DB_FILE_PREV, --dbfp=DB_FILE_PREV
-                        Path to database file with data collected for the
-                        past/previous code revision. It is used to identify
-                        and evaluate/analyze change trends. [default: none].
-  --log-level=LOG_LEVEL, --ll=LOG_LEVEL
-                        Defines log level. Possible values are
-                        'DEBUG','INFO','WARNING' or 'ERROR'. Default value is
-                        inherited from environment variable
-                        'METRIXPLUSPLUS_LOG_LEVEL' if set. [default: INFO]
-  --hotspots=HOTSPOTS, --hs=HOTSPOTS
-                        If not set (none), all exceeded limits are printed. If
-                        set, exceeded limits are sorted (the worst is the
-                        first) and only first HOTSPOTS limits are printed.
-                        [default: none]
-  --disable-suppressions, --ds
-                        If not set (none), all suppressions are ignored and
-                        associated warnings are printed. [default: False]
-  --warn-mode=WARN_MODE, --wm=WARN_MODE
-                        Defines the warnings mode. 'all' - all warnings
-                        active, 'new' - warnings for new regions/files only,
-                        'trend' - warnings for new regions/files and for bad
-                        trend of modified regions/files, 'touched' - warnings
-                        for new and modified regions/files [default: all]
-  --min-limit=MIN_LIMIT, --min=MIN_LIMIT
-                        A threshold per 'namespace:field' metric in order to
-                        select regions, which have got metric value less than
-                        the specified limit. This option can be specified
-                        multiple times, if it is necessary to apply several
-                        limits. Should be in the format: <namespace>:<field
-                        >:<limit-value>, for example:
-                        'std.code.lines:comments:1'.
-  --max-limit=MAX_LIMIT, --max=MAX_LIMIT
-                        A threshold per 'namespace:field' metric in order to
-                        select regions, which have got metric value more than
-                        the specified limit. This option can be specified
-                        multiple times, if it is necessary to apply several
-                        limits. Should be in the format: <namespace>:<field
-                        >:<limit-value>, for example:
-                        'std.code.complexity:cyclomatic:7'.
+Usage: python metrix++.py --help
+       python metrix++.py limit --help
+       python metrix++.py limit [options] -- [path 1] ... [path N]
+
+Options:
+  -h, --help            show this help message and exit
+  --db-file=DB_FILE, --dbf=DB_FILE
+                        Path to a database file to read and process [default:
+                        ./metrixpp.db].
+  --db-file-prev=DB_FILE_PREV, --dbfp=DB_FILE_PREV
+                        Path to database file with data collected for the
+                        past/previous code revision. It is used to identify
+                        and evaluate/analyze change trends. [default: none].
+  --log-level=LOG_LEVEL, --ll=LOG_LEVEL
+                        Defines log level. Possible values are
+                        'DEBUG','INFO','WARNING' or 'ERROR'. Default value is
+                        inherited from environment variable
+                        'METRIXPLUSPLUS_LOG_LEVEL' if set. [default: INFO]
+  --hotspots=HOTSPOTS, --hs=HOTSPOTS
+                        If not set (none), all exceeded limits are printed. If
+                        set, exceeded limits are sorted (the worst is the
+                        first) and only first HOTSPOTS limits are printed.
+                        [default: none]
+  --disable-suppressions, --ds
+                        If not set (none), all suppressions are ignored and
+                        associated warnings are printed. [default: False]
+  --warn-mode=WARN_MODE, --wm=WARN_MODE
+                        Defines the warnings mode. 'all' - all warnings
+                        active, 'new' - warnings for new regions/files only,
+                        'trend' - warnings for new regions/files and for bad
+                        trend of modified regions/files, 'touched' - warnings
+                        for new and modified regions/files [default: all]
+  --min-limit=MIN_LIMIT, --min=MIN_LIMIT
+                        A threshold per 'namespace:field' metric in order to
+                        select regions, which have got metric value less than
+                        the specified limit. This option can be specified
+                        multiple times, if it is necessary to apply several
+                        limits. Should be in the format: <namespace>:<field
+                        >:<limit-value>, for example:
+                        'std.code.lines:comments:1'.
+  --max-limit=MAX_LIMIT, --max=MAX_LIMIT
+                        A threshold per 'namespace:field' metric in order to
+                        select regions, which have got metric value more than
+                        the specified limit. This option can be specified
+                        multiple times, if it is necessary to apply several
+                        limits. Should be in the format: <namespace>:<field
+                        >:<limit-value>, for example:
+                        'std.code.complexity:cyclomatic:7'.

+ 36 - 36
mainline/tests/general/test_basic/test_help_view_default_stdout.gold.txt

@@ -1,36 +1,36 @@
-Usage: python metrix++.py --help
-       python metrix++.py view --help
-       python metrix++.py view [options] -- [path 1] ... [path N]
-
-Options:
-  -h, --help            show this help message and exit
-  --db-file=DB_FILE, --dbf=DB_FILE
-                        Path to a database file to read and process [default:
-                        ./metrixpp.db].
-  --db-file-prev=DB_FILE_PREV, --dbfp=DB_FILE_PREV
-                        Path to database file with data collected for the
-                        past/previous code revision. It is used to identify
-                        and evaluate/analyze change trends. [default: none].
-  --log-level=LOG_LEVEL, --ll=LOG_LEVEL
-                        Defines log level. Possible values are
-                        'DEBUG','INFO','WARNING' or 'ERROR'. Default value is
-                        inherited from environment variable
-                        'METRIXPLUSPLUS_LOG_LEVEL' if set. [default: INFO]
-  --format=FORMAT, --ft=FORMAT
-                        Format of the output data. Possible values are 'xml',
-                        'txt' or 'python' [default: txt]
-  --nest-regions, --nr  If the option is set (True), data for regions is
-                        exported in the form of a tree. Otherwise, all regions
-                        are exported in plain list. [default: False]
-  --max-distribution-rows=MAX_DISTRIBUTION_ROWS, --mdr=MAX_DISTRIBUTION_ROWS
-                        Maximum number of rows in distribution tables. If it
-                        is set to 0, the tool does not optimize the size of
-                        distribution tables [default: 20]
-  --scope-mode=SCOPE_MODE, --sm=SCOPE_MODE
-                        Defines the analysis scope mode. 'all' - all available
-                        regions and files are taken into account, 'new' - only
-                        new regions and files are taken into account,
-                        'touched' - only new and modified regions and files
-                        are taken into account. Modes 'new' and 'touched' may
-                        require more time for processing than mode 'all'
-                        [default: all]
+Usage: python metrix++.py --help
+       python metrix++.py view --help
+       python metrix++.py view [options] -- [path 1] ... [path N]
+
+Options:
+  -h, --help            show this help message and exit
+  --db-file=DB_FILE, --dbf=DB_FILE
+                        Path to a database file to read and process [default:
+                        ./metrixpp.db].
+  --db-file-prev=DB_FILE_PREV, --dbfp=DB_FILE_PREV
+                        Path to database file with data collected for the
+                        past/previous code revision. It is used to identify
+                        and evaluate/analyze change trends. [default: none].
+  --log-level=LOG_LEVEL, --ll=LOG_LEVEL
+                        Defines log level. Possible values are
+                        'DEBUG','INFO','WARNING' or 'ERROR'. Default value is
+                        inherited from environment variable
+                        'METRIXPLUSPLUS_LOG_LEVEL' if set. [default: INFO]
+  --format=FORMAT, --ft=FORMAT
+                        Format of the output data. Possible values are 'xml',
+                        'txt' or 'python' [default: txt]
+  --nest-regions, --nr  If the option is set (True), data for regions is
+                        exported in the form of a tree. Otherwise, all regions
+                        are exported in plain list. [default: False]
+  --max-distribution-rows=MAX_DISTRIBUTION_ROWS, --mdr=MAX_DISTRIBUTION_ROWS
+                        Maximum number of rows in distribution tables. If it
+                        is set to 0, the tool does not optimize the size of
+                        distribution tables [default: 20]
+  --scope-mode=SCOPE_MODE, --sm=SCOPE_MODE
+                        Defines the analysis scope mode. 'all' - all available
+                        regions and files are taken into account, 'new' - only
+                        new regions and files are taken into account,
+                        'touched' - only new and modified regions and files
+                        are taken into account. Modes 'new' and 'touched' may
+                        require more time for processing than mode 'all'
+                        [default: all]

+ 16 - 16
mainline/tests/general/test_basic/test_std_code_magic_view_default_stdout.gold.txt

@@ -1,16 +1,16 @@
-./:: info: Overall metrics for 'std.code.magic:numbers' metric
-	Average        : 1.55555555556 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 4
-	Total          : 14.0
-	Distribution   : 9 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.667 : 0.667 : 6	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.222 : 0.889 : 2	||||||||||||||||||||||
-	             4 : 0.111 : 1.000 : 1	|||||||||||
-
-./:: info: Directory content:
-	File           : file_deleted_in_new_sources.cpp
-	File           : simple.cpp
-
-
+./:: info: Overall metrics for 'std.code.magic:numbers' metric
+	Average        : 1.55555555556 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 4
+	Total          : 14.0
+	Distribution   : 9 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.667 : 0.667 : 6	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.222 : 0.889 : 2	||||||||||||||||||||||
+	             4 : 0.111 : 1.000 : 1	|||||||||||
+
+./:: info: Directory content:
+	File           : file_deleted_in_new_sources.cpp
+	File           : simple.cpp
+
+

+ 96 - 96
mainline/tests/general/test_basic/test_std_code_magic_view_nest_per_file_stdout.gold.txt

@@ -1,96 +1,96 @@
-./simple.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
-	Modified       : None
-
-.   ./simple.cpp:4: info: Metrics per 'hmm' region
-    	Region name    : hmm
-    	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
-    	Modified       : None
-
-.   .   ./simple.cpp:9: info: Metrics per 'A' region
-        	Region name    : A
-        	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
-        	Modified       : None
-        	std.code.magic:numbers: 1
-
-.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
-            	Region name    : A
-            	Region type    : function
-            	Offsets        : 106-252
-            	Line numbers   : 12-23
-            	Modified       : None
-            	std.code.magic:numbers: 4
-
-.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
-            	Region name    : func
-            	Region type    : function
-            	Offsets        : 256-405
-            	Line numbers   : 26-40
-            	Modified       : None
-            	std.code.magic:numbers: 1
-
-.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 285-391
-                	Line numbers   : 28-38
-                	Modified       : None
-
-.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 306-387
-                    	Line numbers   : 30-37
-                    	Modified       : None
-                    	std.code.magic:numbers: 1
-
-.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
-            	Region name    : func_to_be_removed_in_new_sources
-            	Region type    : function
-            	Offsets        : 408-596
-            	Line numbers   : 42-56
-            	Modified       : None
-            	std.code.magic:numbers: 1
-
-.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 466-577
-                	Line numbers   : 44-54
-                	Modified       : None
-
-.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 487-573
-                    	Line numbers   : 46-53
-                    	Modified       : None
-                    	std.code.magic:numbers: 1
-
-.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
-            	Region name    : never
-            	Region type    : function
-            	Offsets        : 599-669
-            	Line numbers   : 58-65
-            	Modified       : None
-            	std.code.magic:numbers: 2
-
-./simple.cpp:: info: Overall metrics for 'std.code.magic:numbers' metric
-	Average        : 1.57142857143 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 4
-	Total          : 11.0
-	Distribution   : 7 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.714 : 0.714 : 5	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.143 : 0.857 : 1	||||||||||||||
-	             4 : 0.143 : 1.000 : 1	||||||||||||||
-
-
+./simple.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-697
+	Line numbers   : 1-71
+	Modified       : None
+
+.   ./simple.cpp:4: info: Metrics per 'hmm' region
+    	Region name    : hmm
+    	Region type    : namespace
+    	Offsets        : 2-696
+    	Line numbers   : 3-70
+    	Modified       : None
+
+.   .   ./simple.cpp:9: info: Metrics per 'A' region
+        	Region name    : A
+        	Region type    : class
+        	Offsets        : 94-692
+        	Line numbers   : 9-68
+        	Modified       : None
+        	std.code.magic:numbers: 1
+
+.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
+            	Region name    : A
+            	Region type    : function
+            	Offsets        : 106-252
+            	Line numbers   : 12-23
+            	Modified       : None
+            	std.code.magic:numbers: 4
+
+.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
+            	Region name    : func
+            	Region type    : function
+            	Offsets        : 256-405
+            	Line numbers   : 26-40
+            	Modified       : None
+            	std.code.magic:numbers: 1
+
+.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 285-391
+                	Line numbers   : 28-38
+                	Modified       : None
+
+.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 306-387
+                    	Line numbers   : 30-37
+                    	Modified       : None
+                    	std.code.magic:numbers: 1
+
+.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
+            	Region name    : func_to_be_removed_in_new_sources
+            	Region type    : function
+            	Offsets        : 408-596
+            	Line numbers   : 42-56
+            	Modified       : None
+            	std.code.magic:numbers: 1
+
+.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 466-577
+                	Line numbers   : 44-54
+                	Modified       : None
+
+.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 487-573
+                    	Line numbers   : 46-53
+                    	Modified       : None
+                    	std.code.magic:numbers: 1
+
+.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
+            	Region name    : never
+            	Region type    : function
+            	Offsets        : 599-669
+            	Line numbers   : 58-65
+            	Modified       : None
+            	std.code.magic:numbers: 2
+
+./simple.cpp:: info: Overall metrics for 'std.code.magic:numbers' metric
+	Average        : 1.57142857143 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 4
+	Total          : 11.0
+	Distribution   : 7 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.714 : 0.714 : 5	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.143 : 0.857 : 1	||||||||||||||
+	             4 : 0.143 : 1.000 : 1	||||||||||||||
+
+

+ 94 - 94
mainline/tests/general/test_basic/test_std_code_magic_view_nozeros_nest_per_file_stdout.gold.txt

@@ -1,94 +1,94 @@
-./simple.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
-	Modified       : None
-
-.   ./simple.cpp:4: info: Metrics per 'hmm' region
-    	Region name    : hmm
-    	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
-    	Modified       : None
-
-.   .   ./simple.cpp:9: info: Metrics per 'A' region
-        	Region name    : A
-        	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
-        	Modified       : None
-        	std.code.magic:numbers: 1
-
-.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
-            	Region name    : A
-            	Region type    : function
-            	Offsets        : 106-252
-            	Line numbers   : 12-23
-            	Modified       : None
-            	std.code.magic:numbers: 1
-
-.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
-            	Region name    : func
-            	Region type    : function
-            	Offsets        : 256-405
-            	Line numbers   : 26-40
-            	Modified       : None
-            	std.code.magic:numbers: 1
-
-.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 285-391
-                	Line numbers   : 28-38
-                	Modified       : None
-
-.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 306-387
-                    	Line numbers   : 30-37
-                    	Modified       : None
-                    	std.code.magic:numbers: 1
-
-.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
-            	Region name    : func_to_be_removed_in_new_sources
-            	Region type    : function
-            	Offsets        : 408-596
-            	Line numbers   : 42-56
-            	Modified       : None
-            	std.code.magic:numbers: 1
-
-.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 466-577
-                	Line numbers   : 44-54
-                	Modified       : None
-
-.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 487-573
-                    	Line numbers   : 46-53
-                    	Modified       : None
-                    	std.code.magic:numbers: 1
-
-.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
-            	Region name    : never
-            	Region type    : function
-            	Offsets        : 599-669
-            	Line numbers   : 58-65
-            	Modified       : None
-            	std.code.magic:numbers: 1
-
-./simple.cpp:: info: Overall metrics for 'std.code.magic:numbers' metric
-	Average        : 1.0 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 1
-	Total          : 7.0
-	Distribution   : 7 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 7	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-
+./simple.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-697
+	Line numbers   : 1-71
+	Modified       : None
+
+.   ./simple.cpp:4: info: Metrics per 'hmm' region
+    	Region name    : hmm
+    	Region type    : namespace
+    	Offsets        : 2-696
+    	Line numbers   : 3-70
+    	Modified       : None
+
+.   .   ./simple.cpp:9: info: Metrics per 'A' region
+        	Region name    : A
+        	Region type    : class
+        	Offsets        : 94-692
+        	Line numbers   : 9-68
+        	Modified       : None
+        	std.code.magic:numbers: 1
+
+.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
+            	Region name    : A
+            	Region type    : function
+            	Offsets        : 106-252
+            	Line numbers   : 12-23
+            	Modified       : None
+            	std.code.magic:numbers: 1
+
+.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
+            	Region name    : func
+            	Region type    : function
+            	Offsets        : 256-405
+            	Line numbers   : 26-40
+            	Modified       : None
+            	std.code.magic:numbers: 1
+
+.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 285-391
+                	Line numbers   : 28-38
+                	Modified       : None
+
+.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 306-387
+                    	Line numbers   : 30-37
+                    	Modified       : None
+                    	std.code.magic:numbers: 1
+
+.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
+            	Region name    : func_to_be_removed_in_new_sources
+            	Region type    : function
+            	Offsets        : 408-596
+            	Line numbers   : 42-56
+            	Modified       : None
+            	std.code.magic:numbers: 1
+
+.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 466-577
+                	Line numbers   : 44-54
+                	Modified       : None
+
+.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 487-573
+                    	Line numbers   : 46-53
+                    	Modified       : None
+                    	std.code.magic:numbers: 1
+
+.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
+            	Region name    : never
+            	Region type    : function
+            	Offsets        : 599-669
+            	Line numbers   : 58-65
+            	Modified       : None
+            	std.code.magic:numbers: 1
+
+./simple.cpp:: info: Overall metrics for 'std.code.magic:numbers' metric
+	Average        : 1.0 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 1
+	Total          : 7.0
+	Distribution   : 7 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 7	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+

+ 14 - 14
mainline/tests/general/test_basic/test_std_code_magic_view_nozeros_stdout.gold.txt

@@ -1,14 +1,14 @@
-./:: info: Overall metrics for 'std.code.magic:numbers' metric
-	Average        : 1.0 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 1
-	Total          : 9.0
-	Distribution   : 9 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 9	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Directory content:
-	File           : file_deleted_in_new_sources.cpp
-	File           : simple.cpp
-
-
+./:: info: Overall metrics for 'std.code.magic:numbers' metric
+	Average        : 1.0 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 1
+	Total          : 9.0
+	Distribution   : 9 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 9	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Directory content:
+	File           : file_deleted_in_new_sources.cpp
+	File           : simple.cpp
+
+

+ 16 - 16
mainline/tests/general/test_basic/test_std_complexity_maxindent_view_default_stdout.gold.txt

@@ -1,16 +1,16 @@
-./:: info: Overall metrics for 'std.code.complexity:maxindent' metric
-	Average        : 1.875
-	Minimum        : 1
-	Maximum        : 3
-	Total          : 15.0
-	Distribution   : 8 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.250 : 0.250 : 2	|||||||||||||||||||||||||
-	             2 : 0.625 : 0.875 : 5	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             3 : 0.125 : 1.000 : 1	|||||||||||||
-
-./:: info: Directory content:
-	File           : file_deleted_in_new_sources.cpp
-	File           : simple.cpp
-
-
+./:: info: Overall metrics for 'std.code.complexity:maxindent' metric
+	Average        : 1.875
+	Minimum        : 1
+	Maximum        : 3
+	Total          : 15.0
+	Distribution   : 8 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.250 : 0.250 : 2	|||||||||||||||||||||||||
+	             2 : 0.625 : 0.875 : 5	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             3 : 0.125 : 1.000 : 1	|||||||||||||
+
+./:: info: Directory content:
+	File           : file_deleted_in_new_sources.cpp
+	File           : simple.cpp
+
+

+ 95 - 95
mainline/tests/general/test_basic/test_std_complexity_maxindent_view_nest_per_file_stdout.gold.txt

@@ -1,95 +1,95 @@
-./simple.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
-	Modified       : None
-
-.   ./simple.cpp:4: info: Metrics per 'hmm' region
-    	Region name    : hmm
-    	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
-    	Modified       : None
-
-.   .   ./simple.cpp:9: info: Metrics per 'A' region
-        	Region name    : A
-        	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
-        	Modified       : None
-
-.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
-            	Region name    : A
-            	Region type    : function
-            	Offsets        : 106-252
-            	Line numbers   : 12-23
-            	Modified       : None
-            	std.code.complexity:maxindent: 3
-
-.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
-            	Region name    : func
-            	Region type    : function
-            	Offsets        : 256-405
-            	Line numbers   : 26-40
-            	Modified       : None
-            	std.code.complexity:maxindent: 1
-
-.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 285-391
-                	Line numbers   : 28-38
-                	Modified       : None
-
-.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 306-387
-                    	Line numbers   : 30-37
-                    	Modified       : None
-                    	std.code.complexity:maxindent: 2
-
-.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
-            	Region name    : func_to_be_removed_in_new_sources
-            	Region type    : function
-            	Offsets        : 408-596
-            	Line numbers   : 42-56
-            	Modified       : None
-            	std.code.complexity:maxindent: 1
-
-.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 466-577
-                	Line numbers   : 44-54
-                	Modified       : None
-
-.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 487-573
-                    	Line numbers   : 46-53
-                    	Modified       : None
-                    	std.code.complexity:maxindent: 2
-
-.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
-            	Region name    : never
-            	Region type    : function
-            	Offsets        : 599-669
-            	Line numbers   : 58-65
-            	Modified       : None
-            	std.code.complexity:maxindent: 2
-
-./simple.cpp:: info: Overall metrics for 'std.code.complexity:maxindent' metric
-	Average        : 1.83333333333
-	Minimum        : 1
-	Maximum        : 3
-	Total          : 11.0
-	Distribution   : 6 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.333 : 0.333 : 2	|||||||||||||||||||||||||||||||||
-	             2 : 0.500 : 0.833 : 3	||||||||||||||||||||||||||||||||||||||||||||||||||
-	             3 : 0.167 : 1.000 : 1	|||||||||||||||||
-
-
+./simple.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-697
+	Line numbers   : 1-71
+	Modified       : None
+
+.   ./simple.cpp:4: info: Metrics per 'hmm' region
+    	Region name    : hmm
+    	Region type    : namespace
+    	Offsets        : 2-696
+    	Line numbers   : 3-70
+    	Modified       : None
+
+.   .   ./simple.cpp:9: info: Metrics per 'A' region
+        	Region name    : A
+        	Region type    : class
+        	Offsets        : 94-692
+        	Line numbers   : 9-68
+        	Modified       : None
+
+.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
+            	Region name    : A
+            	Region type    : function
+            	Offsets        : 106-252
+            	Line numbers   : 12-23
+            	Modified       : None
+            	std.code.complexity:maxindent: 3
+
+.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
+            	Region name    : func
+            	Region type    : function
+            	Offsets        : 256-405
+            	Line numbers   : 26-40
+            	Modified       : None
+            	std.code.complexity:maxindent: 1
+
+.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 285-391
+                	Line numbers   : 28-38
+                	Modified       : None
+
+.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 306-387
+                    	Line numbers   : 30-37
+                    	Modified       : None
+                    	std.code.complexity:maxindent: 2
+
+.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
+            	Region name    : func_to_be_removed_in_new_sources
+            	Region type    : function
+            	Offsets        : 408-596
+            	Line numbers   : 42-56
+            	Modified       : None
+            	std.code.complexity:maxindent: 1
+
+.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 466-577
+                	Line numbers   : 44-54
+                	Modified       : None
+
+.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 487-573
+                    	Line numbers   : 46-53
+                    	Modified       : None
+                    	std.code.complexity:maxindent: 2
+
+.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
+            	Region name    : never
+            	Region type    : function
+            	Offsets        : 599-669
+            	Line numbers   : 58-65
+            	Modified       : None
+            	std.code.complexity:maxindent: 2
+
+./simple.cpp:: info: Overall metrics for 'std.code.complexity:maxindent' metric
+	Average        : 1.83333333333
+	Minimum        : 1
+	Maximum        : 3
+	Total          : 11.0
+	Distribution   : 6 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.333 : 0.333 : 2	|||||||||||||||||||||||||||||||||
+	             2 : 0.500 : 0.833 : 3	||||||||||||||||||||||||||||||||||||||||||||||||||
+	             3 : 0.167 : 1.000 : 1	|||||||||||||||||
+
+

+ 120 - 120
mainline/tests/general/test_basic/test_std_filelines_metrics_view_nest_per_file_stdout.gold.txt

@@ -1,120 +1,120 @@
-./simple.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
-	Modified       : None
-
-.   ./simple.cpp:4: info: Metrics per 'hmm' region
-    	Region name    : hmm
-    	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
-    	Modified       : None
-
-.   .   ./simple.cpp:9: info: Metrics per 'A' region
-        	Region name    : A
-        	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
-        	Modified       : None
-
-.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
-            	Region name    : A
-            	Region type    : function
-            	Offsets        : 106-252
-            	Line numbers   : 12-23
-            	Modified       : None
-
-.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
-            	Region name    : func
-            	Region type    : function
-            	Offsets        : 256-405
-            	Line numbers   : 26-40
-            	Modified       : None
-
-.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 285-391
-                	Line numbers   : 28-38
-                	Modified       : None
-
-.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 306-387
-                    	Line numbers   : 30-37
-                    	Modified       : None
-
-.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
-            	Region name    : func_to_be_removed_in_new_sources
-            	Region type    : function
-            	Offsets        : 408-596
-            	Line numbers   : 42-56
-            	Modified       : None
-
-.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 466-577
-                	Line numbers   : 44-54
-                	Modified       : None
-
-.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 487-573
-                    	Line numbers   : 46-53
-                    	Modified       : None
-
-.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
-            	Region name    : never
-            	Region type    : function
-            	Offsets        : 599-669
-            	Line numbers   : 58-65
-            	Modified       : None
-
-./simple.cpp:0: info: Metrics per file
-	std.code.filelines:code: 53
-	std.code.filelines:total: 58
-	std.code.filelines:preprocessor: 1
-	std.code.filelines:comments: 5
-
-./simple.cpp:: info: Overall metrics for 'std.code.filelines:total' metric
-	Average        : 58.0
-	Minimum        : 58
-	Maximum        : 58
-	Total          : 58.0
-	Distribution   : 1 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	            58 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.filelines:code' metric
-	Average        : 53.0
-	Minimum        : 53
-	Maximum        : 53
-	Total          : 53.0
-	Distribution   : 1 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	            53 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.filelines:preprocessor' metric
-	Average        : 1.0
-	Minimum        : 1
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 1 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.filelines:comments' metric
-	Average        : 5.0
-	Minimum        : 5
-	Maximum        : 5
-	Total          : 5.0
-	Distribution   : 1 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	             5 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-
+./simple.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-697
+	Line numbers   : 1-71
+	Modified       : None
+
+.   ./simple.cpp:4: info: Metrics per 'hmm' region
+    	Region name    : hmm
+    	Region type    : namespace
+    	Offsets        : 2-696
+    	Line numbers   : 3-70
+    	Modified       : None
+
+.   .   ./simple.cpp:9: info: Metrics per 'A' region
+        	Region name    : A
+        	Region type    : class
+        	Offsets        : 94-692
+        	Line numbers   : 9-68
+        	Modified       : None
+
+.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
+            	Region name    : A
+            	Region type    : function
+            	Offsets        : 106-252
+            	Line numbers   : 12-23
+            	Modified       : None
+
+.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
+            	Region name    : func
+            	Region type    : function
+            	Offsets        : 256-405
+            	Line numbers   : 26-40
+            	Modified       : None
+
+.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 285-391
+                	Line numbers   : 28-38
+                	Modified       : None
+
+.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 306-387
+                    	Line numbers   : 30-37
+                    	Modified       : None
+
+.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
+            	Region name    : func_to_be_removed_in_new_sources
+            	Region type    : function
+            	Offsets        : 408-596
+            	Line numbers   : 42-56
+            	Modified       : None
+
+.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 466-577
+                	Line numbers   : 44-54
+                	Modified       : None
+
+.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 487-573
+                    	Line numbers   : 46-53
+                    	Modified       : None
+
+.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
+            	Region name    : never
+            	Region type    : function
+            	Offsets        : 599-669
+            	Line numbers   : 58-65
+            	Modified       : None
+
+./simple.cpp:0: info: Metrics per file
+	std.code.filelines:code: 53
+	std.code.filelines:total: 58
+	std.code.filelines:preprocessor: 1
+	std.code.filelines:comments: 5
+
+./simple.cpp:: info: Overall metrics for 'std.code.filelines:total' metric
+	Average        : 58.0
+	Minimum        : 58
+	Maximum        : 58
+	Total          : 58.0
+	Distribution   : 1 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	            58 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.filelines:code' metric
+	Average        : 53.0
+	Minimum        : 53
+	Maximum        : 53
+	Total          : 53.0
+	Distribution   : 1 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	            53 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.filelines:preprocessor' metric
+	Average        : 1.0
+	Minimum        : 1
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 1 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.filelines:comments' metric
+	Average        : 5.0
+	Minimum        : 5
+	Maximum        : 5
+	Total          : 5.0
+	Distribution   : 1 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	             5 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+

+ 44 - 44
mainline/tests/general/test_basic/test_std_filelines_metrics_view_txt_stdout.gold.txt

@@ -1,44 +1,44 @@
-./:: info: Overall metrics for 'std.code.filelines:total' metric
-	Average        : 41.5
-	Minimum        : 25
-	Maximum        : 58
-	Total          : 83.0
-	Distribution   : 2 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	            25 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-	            58 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.code.filelines:code' metric
-	Average        : 37.0
-	Minimum        : 21
-	Maximum        : 53
-	Total          : 74.0
-	Distribution   : 2 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	            21 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-	            53 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.code.filelines:preprocessor' metric
-	Average        : 0.5
-	Minimum        : 0
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 2 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	             0 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.code.filelines:comments' metric
-	Average        : 5.0
-	Minimum        : 5
-	Maximum        : 5
-	Total          : 10.0
-	Distribution   : 2 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	             5 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Directory content:
-	File           : file_deleted_in_new_sources.cpp
-	File           : simple.cpp
-
-
+./:: info: Overall metrics for 'std.code.filelines:total' metric
+	Average        : 41.5
+	Minimum        : 25
+	Maximum        : 58
+	Total          : 83.0
+	Distribution   : 2 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	            25 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+	            58 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.code.filelines:code' metric
+	Average        : 37.0
+	Minimum        : 21
+	Maximum        : 53
+	Total          : 74.0
+	Distribution   : 2 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	            21 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+	            53 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.code.filelines:preprocessor' metric
+	Average        : 0.5
+	Minimum        : 0
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 2 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	             0 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.code.filelines:comments' metric
+	Average        : 5.0
+	Minimum        : 5
+	Maximum        : 5
+	Total          : 10.0
+	Distribution   : 2 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	             5 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Directory content:
+	File           : file_deleted_in_new_sources.cpp
+	File           : simple.cpp
+
+

+ 108 - 108
mainline/tests/general/test_basic/test_std_general_metrics_view_nest_per_file_stdout.gold.txt

@@ -1,108 +1,108 @@
-./simple.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
-	Modified       : None
-
-.   ./simple.cpp:4: info: Metrics per 'hmm' region
-    	Region name    : hmm
-    	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
-    	Modified       : None
-
-.   .   ./simple.cpp:9: info: Metrics per 'A' region
-        	Region name    : A
-        	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
-        	Modified       : None
-
-.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
-            	Region name    : A
-            	Region type    : function
-            	Offsets        : 106-252
-            	Line numbers   : 12-23
-            	Modified       : None
-
-.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
-            	Region name    : func
-            	Region type    : function
-            	Offsets        : 256-405
-            	Line numbers   : 26-40
-            	Modified       : None
-
-.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 285-391
-                	Line numbers   : 28-38
-                	Modified       : None
-
-.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 306-387
-                    	Line numbers   : 30-37
-                    	Modified       : None
-
-.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
-            	Region name    : func_to_be_removed_in_new_sources
-            	Region type    : function
-            	Offsets        : 408-596
-            	Line numbers   : 42-56
-            	Modified       : None
-
-.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 466-577
-                	Line numbers   : 44-54
-                	Modified       : None
-
-.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 487-573
-                    	Line numbers   : 46-53
-                    	Modified       : None
-
-.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
-            	Region name    : never
-            	Region type    : function
-            	Offsets        : 599-669
-            	Line numbers   : 58-65
-            	Modified       : None
-
-./simple.cpp:0: info: Metrics per file
-	std.general:proctime: 0.01
-	std.general:size: 697
-
-./simple.cpp:: info: Overall metrics for 'std.general:procerrors' metric
-	Average        : None
-	Minimum        : None
-	Maximum        : None
-	Total          : 0.0
-	Distribution   : 0 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-
-./simple.cpp:: info: Overall metrics for 'std.general:proctime' metric
-	Average        : 0.01
-	Minimum        : 0.01
-	Maximum        : 0.01
-	Total          : 0.01
-	Distribution   : 1 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	        0.0100 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.general:size' metric
-	Average        : 697.0
-	Minimum        : 697
-	Maximum        : 697
-	Total          : 697.0
-	Distribution   : 1 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	           697 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-
+./simple.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-697
+	Line numbers   : 1-71
+	Modified       : None
+
+.   ./simple.cpp:4: info: Metrics per 'hmm' region
+    	Region name    : hmm
+    	Region type    : namespace
+    	Offsets        : 2-696
+    	Line numbers   : 3-70
+    	Modified       : None
+
+.   .   ./simple.cpp:9: info: Metrics per 'A' region
+        	Region name    : A
+        	Region type    : class
+        	Offsets        : 94-692
+        	Line numbers   : 9-68
+        	Modified       : None
+
+.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
+            	Region name    : A
+            	Region type    : function
+            	Offsets        : 106-252
+            	Line numbers   : 12-23
+            	Modified       : None
+
+.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
+            	Region name    : func
+            	Region type    : function
+            	Offsets        : 256-405
+            	Line numbers   : 26-40
+            	Modified       : None
+
+.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 285-391
+                	Line numbers   : 28-38
+                	Modified       : None
+
+.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 306-387
+                    	Line numbers   : 30-37
+                    	Modified       : None
+
+.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
+            	Region name    : func_to_be_removed_in_new_sources
+            	Region type    : function
+            	Offsets        : 408-596
+            	Line numbers   : 42-56
+            	Modified       : None
+
+.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 466-577
+                	Line numbers   : 44-54
+                	Modified       : None
+
+.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 487-573
+                    	Line numbers   : 46-53
+                    	Modified       : None
+
+.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
+            	Region name    : never
+            	Region type    : function
+            	Offsets        : 599-669
+            	Line numbers   : 58-65
+            	Modified       : None
+
+./simple.cpp:0: info: Metrics per file
+	std.general:proctime: 0.01
+	std.general:size: 697
+
+./simple.cpp:: info: Overall metrics for 'std.general:procerrors' metric
+	Average        : None
+	Minimum        : None
+	Maximum        : None
+	Total          : 0.0
+	Distribution   : 0 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+
+./simple.cpp:: info: Overall metrics for 'std.general:proctime' metric
+	Average        : 0.01
+	Minimum        : 0.01
+	Maximum        : 0.01
+	Total          : 0.01
+	Distribution   : 1 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	        0.0100 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.general:size' metric
+	Average        : 697.0
+	Minimum        : 697
+	Maximum        : 697
+	Total          : 697.0
+	Distribution   : 1 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	           697 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+

+ 32 - 32
mainline/tests/general/test_basic/test_std_general_metrics_view_txt_stdout.gold.txt

@@ -1,32 +1,32 @@
-./:: info: Overall metrics for 'std.general:procerrors' metric
-	Average        : None
-	Minimum        : None
-	Maximum        : None
-	Total          : 0.0
-	Distribution   : 0 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-
-./:: info: Overall metrics for 'std.general:proctime' metric
-	Average        : 0.01
-	Minimum        : 0.01
-	Maximum        : 0.01
-	Total          : 0.02
-	Distribution   : 2 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	        0.0100 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.general:size' metric
-	Average        : 488.0
-	Minimum        : 279
-	Maximum        : 697
-	Total          : 976.0
-	Distribution   : 2 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	           279 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-	           697 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Directory content:
-	File           : file_deleted_in_new_sources.cpp
-	File           : simple.cpp
-
-
+./:: info: Overall metrics for 'std.general:procerrors' metric
+	Average        : None
+	Minimum        : None
+	Maximum        : None
+	Total          : 0.0
+	Distribution   : 0 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+
+./:: info: Overall metrics for 'std.general:proctime' metric
+	Average        : 0.01
+	Minimum        : 0.01
+	Maximum        : 0.01
+	Total          : 0.02
+	Distribution   : 2 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	        0.0100 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.general:size' metric
+	Average        : 488.0
+	Minimum        : 279
+	Maximum        : 697
+	Total          : 976.0
+	Distribution   : 2 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	           279 : 0.500 : 0.500 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+	           697 : 0.500 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Directory content:
+	File           : file_deleted_in_new_sources.cpp
+	File           : simple.cpp
+
+

+ 173 - 173
mainline/tests/general/test_basic/test_std_lines_metrics_view_nest_per_file_stdout.gold.txt

@@ -1,173 +1,173 @@
-./simple.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-697
-	Line numbers   : 1-71
-	Modified       : None
-	std.code.lines:code: 0
-	std.code.lines:total: 0
-	std.code.lines:preprocessor: 0
-	std.code.lines:comments: 0
-
-.   ./simple.cpp:4: info: Metrics per 'hmm' region
-    	Region name    : hmm
-    	Region type    : namespace
-    	Offsets        : 2-696
-    	Line numbers   : 3-70
-    	Modified       : None
-    	std.code.lines:code: 4
-    	std.code.lines:total: 6
-    	std.code.lines:preprocessor: 1
-    	std.code.lines:comments: 1
-
-.   .   ./simple.cpp:9: info: Metrics per 'A' region
-        	Region name    : A
-        	Region type    : class
-        	Offsets        : 94-692
-        	Line numbers   : 9-68
-        	Modified       : None
-        	std.code.lines:code: 4
-        	std.code.lines:total: 4
-        	std.code.lines:preprocessor: 0
-        	std.code.lines:comments: 0
-
-.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
-            	Region name    : A
-            	Region type    : function
-            	Offsets        : 106-252
-            	Line numbers   : 12-23
-            	Modified       : None
-            	std.code.lines:code: 11
-            	std.code.lines:total: 12
-            	std.code.lines:preprocessor: 0
-            	std.code.lines:comments: 2
-
-.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
-            	Region name    : func
-            	Region type    : function
-            	Offsets        : 256-405
-            	Line numbers   : 26-40
-            	Modified       : None
-            	std.code.lines:code: 5
-            	std.code.lines:total: 5
-            	std.code.lines:preprocessor: 0
-            	std.code.lines:comments: 0
-
-.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 285-391
-                	Line numbers   : 28-38
-                	Modified       : None
-                	std.code.lines:code: 3
-                	std.code.lines:total: 3
-                	std.code.lines:preprocessor: 0
-                	std.code.lines:comments: 0
-
-.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 306-387
-                    	Line numbers   : 30-37
-                    	Modified       : None
-                    	std.code.lines:code: 7
-                    	std.code.lines:total: 8
-                    	std.code.lines:preprocessor: 0
-                    	std.code.lines:comments: 1
-
-.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
-            	Region name    : func_to_be_removed_in_new_sources
-            	Region type    : function
-            	Offsets        : 408-596
-            	Line numbers   : 42-56
-            	Modified       : None
-            	std.code.lines:code: 5
-            	std.code.lines:total: 5
-            	std.code.lines:preprocessor: 0
-            	std.code.lines:comments: 0
-
-.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
-                	Region name    : embeded
-                	Region type    : class
-                	Offsets        : 466-577
-                	Line numbers   : 44-54
-                	Modified       : None
-                	std.code.lines:code: 3
-                	std.code.lines:total: 3
-                	std.code.lines:preprocessor: 0
-                	std.code.lines:comments: 0
-
-.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
-                    	Region name    : embeded
-                    	Region type    : function
-                    	Offsets        : 487-573
-                    	Line numbers   : 46-53
-                    	Modified       : None
-                    	std.code.lines:code: 7
-                    	std.code.lines:total: 8
-                    	std.code.lines:preprocessor: 0
-                    	std.code.lines:comments: 1
-
-.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
-            	Region name    : never
-            	Region type    : function
-            	Offsets        : 599-669
-            	Line numbers   : 58-65
-            	Modified       : None
-            	std.code.lines:code: 7
-            	std.code.lines:total: 7
-            	std.code.lines:preprocessor: 0
-            	std.code.lines:comments: 0
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.54545454545
-	Minimum        : 0
-	Maximum        : 12
-	Total          : 61.0
-	Distribution   : 11 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.091 : 0.091 :  1	|||||||||
-	             3 : 0.182 : 0.273 :  2	||||||||||||||||||
-	             4 : 0.091 : 0.364 :  1	|||||||||
-	             5 : 0.182 : 0.545 :  2	||||||||||||||||||
-	             6 : 0.091 : 0.636 :  1	|||||||||
-	             7 : 0.091 : 0.727 :  1	|||||||||
-	             8 : 0.182 : 0.909 :  2	||||||||||||||||||
-	            12 : 0.091 : 1.000 :  1	|||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.09090909091
-	Minimum        : 0
-	Maximum        : 11
-	Total          : 56.0
-	Distribution   : 11 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.091 : 0.091 :  1	|||||||||
-	             3 : 0.182 : 0.273 :  2	||||||||||||||||||
-	             4 : 0.182 : 0.455 :  2	||||||||||||||||||
-	             5 : 0.182 : 0.636 :  2	||||||||||||||||||
-	             7 : 0.273 : 0.909 :  3	|||||||||||||||||||||||||||
-	            11 : 0.091 : 1.000 :  1	|||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.0909090909091
-	Minimum        : 0
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 11 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.909 : 0.909 : 10	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.091 : 1.000 :  1	|||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.454545454545
-	Minimum        : 0
-	Maximum        : 2
-	Total          : 5.0
-	Distribution   : 11 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.636 : 0.636 :  7	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.273 : 0.909 :  3	|||||||||||||||||||||||||||
-	             2 : 0.091 : 1.000 :  1	|||||||||
-
-
+./simple.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-697
+	Line numbers   : 1-71
+	Modified       : None
+	std.code.lines:code: 0
+	std.code.lines:total: 0
+	std.code.lines:preprocessor: 0
+	std.code.lines:comments: 0
+
+.   ./simple.cpp:4: info: Metrics per 'hmm' region
+    	Region name    : hmm
+    	Region type    : namespace
+    	Offsets        : 2-696
+    	Line numbers   : 3-70
+    	Modified       : None
+    	std.code.lines:code: 4
+    	std.code.lines:total: 6
+    	std.code.lines:preprocessor: 1
+    	std.code.lines:comments: 1
+
+.   .   ./simple.cpp:9: info: Metrics per 'A' region
+        	Region name    : A
+        	Region type    : class
+        	Offsets        : 94-692
+        	Line numbers   : 9-68
+        	Modified       : None
+        	std.code.lines:code: 4
+        	std.code.lines:total: 4
+        	std.code.lines:preprocessor: 0
+        	std.code.lines:comments: 0
+
+.   .   .   ./simple.cpp:12: info: Metrics per 'A' region
+            	Region name    : A
+            	Region type    : function
+            	Offsets        : 106-252
+            	Line numbers   : 12-23
+            	Modified       : None
+            	std.code.lines:code: 11
+            	std.code.lines:total: 12
+            	std.code.lines:preprocessor: 0
+            	std.code.lines:comments: 2
+
+.   .   .   ./simple.cpp:26: info: Metrics per 'func' region
+            	Region name    : func
+            	Region type    : function
+            	Offsets        : 256-405
+            	Line numbers   : 26-40
+            	Modified       : None
+            	std.code.lines:code: 5
+            	std.code.lines:total: 5
+            	std.code.lines:preprocessor: 0
+            	std.code.lines:comments: 0
+
+.   .   .   .   ./simple.cpp:28: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 285-391
+                	Line numbers   : 28-38
+                	Modified       : None
+                	std.code.lines:code: 3
+                	std.code.lines:total: 3
+                	std.code.lines:preprocessor: 0
+                	std.code.lines:comments: 0
+
+.   .   .   .   .   ./simple.cpp:30: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 306-387
+                    	Line numbers   : 30-37
+                    	Modified       : None
+                    	std.code.lines:code: 7
+                    	std.code.lines:total: 8
+                    	std.code.lines:preprocessor: 0
+                    	std.code.lines:comments: 1
+
+.   .   .   ./simple.cpp:42: info: Metrics per 'func_to_be_removed_in_new_sources' region
+            	Region name    : func_to_be_removed_in_new_sources
+            	Region type    : function
+            	Offsets        : 408-596
+            	Line numbers   : 42-56
+            	Modified       : None
+            	std.code.lines:code: 5
+            	std.code.lines:total: 5
+            	std.code.lines:preprocessor: 0
+            	std.code.lines:comments: 0
+
+.   .   .   .   ./simple.cpp:44: info: Metrics per 'embeded' region
+                	Region name    : embeded
+                	Region type    : class
+                	Offsets        : 466-577
+                	Line numbers   : 44-54
+                	Modified       : None
+                	std.code.lines:code: 3
+                	std.code.lines:total: 3
+                	std.code.lines:preprocessor: 0
+                	std.code.lines:comments: 0
+
+.   .   .   .   .   ./simple.cpp:46: info: Metrics per 'embeded' region
+                    	Region name    : embeded
+                    	Region type    : function
+                    	Offsets        : 487-573
+                    	Line numbers   : 46-53
+                    	Modified       : None
+                    	std.code.lines:code: 7
+                    	std.code.lines:total: 8
+                    	std.code.lines:preprocessor: 0
+                    	std.code.lines:comments: 1
+
+.   .   .   ./simple.cpp:58: info: Metrics per 'never' region
+            	Region name    : never
+            	Region type    : function
+            	Offsets        : 599-669
+            	Line numbers   : 58-65
+            	Modified       : None
+            	std.code.lines:code: 7
+            	std.code.lines:total: 7
+            	std.code.lines:preprocessor: 0
+            	std.code.lines:comments: 0
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
+	Average        : 5.54545454545
+	Minimum        : 0
+	Maximum        : 12
+	Total          : 61.0
+	Distribution   : 11 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.091 : 0.091 :  1	|||||||||
+	             3 : 0.182 : 0.273 :  2	||||||||||||||||||
+	             4 : 0.091 : 0.364 :  1	|||||||||
+	             5 : 0.182 : 0.545 :  2	||||||||||||||||||
+	             6 : 0.091 : 0.636 :  1	|||||||||
+	             7 : 0.091 : 0.727 :  1	|||||||||
+	             8 : 0.182 : 0.909 :  2	||||||||||||||||||
+	            12 : 0.091 : 1.000 :  1	|||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
+	Average        : 5.09090909091
+	Minimum        : 0
+	Maximum        : 11
+	Total          : 56.0
+	Distribution   : 11 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.091 : 0.091 :  1	|||||||||
+	             3 : 0.182 : 0.273 :  2	||||||||||||||||||
+	             4 : 0.182 : 0.455 :  2	||||||||||||||||||
+	             5 : 0.182 : 0.636 :  2	||||||||||||||||||
+	             7 : 0.273 : 0.909 :  3	|||||||||||||||||||||||||||
+	            11 : 0.091 : 1.000 :  1	|||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.0909090909091
+	Minimum        : 0
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 11 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.909 : 0.909 : 10	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.091 : 1.000 :  1	|||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.454545454545
+	Minimum        : 0
+	Maximum        : 2
+	Total          : 5.0
+	Distribution   : 11 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.636 : 0.636 :  7	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.273 : 0.909 :  3	|||||||||||||||||||||||||||
+	             2 : 0.091 : 1.000 :  1	|||||||||
+
+

+ 59 - 59
mainline/tests/general/test_basic/test_std_lines_metrics_view_txt_stdout.gold.txt

@@ -1,59 +1,59 @@
-./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.4375
-	Minimum        : 0
-	Maximum        : 12
-	Total          : 87.0
-	Distribution   : 16 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.125 : 0.125 :  2	|||||||||||||
-	             3 : 0.188 : 0.312 :  3	|||||||||||||||||||
-	             4 : 0.062 : 0.375 :  1	||||||
-	             5 : 0.125 : 0.500 :  2	|||||||||||||
-	             6 : 0.062 : 0.562 :  1	||||||
-	             7 : 0.188 : 0.750 :  3	|||||||||||||||||||
-	             8 : 0.125 : 0.875 :  2	|||||||||||||
-	             9 : 0.062 : 0.938 :  1	||||||
-	            12 : 0.062 : 1.000 :  1	||||||
-
-./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 4.875
-	Minimum        : 0
-	Maximum        : 11
-	Total          : 78.0
-	Distribution   : 16 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.125 : 0.125 :  2	|||||||||||||
-	             3 : 0.188 : 0.312 :  3	|||||||||||||||||||
-	             4 : 0.188 : 0.500 :  3	|||||||||||||||||||
-	             5 : 0.125 : 0.625 :  2	|||||||||||||
-	             7 : 0.250 : 0.875 :  4	|||||||||||||||||||||||||
-	             8 : 0.062 : 0.938 :  1	||||||
-	            11 : 0.062 : 1.000 :  1	||||||
-
-./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.0625
-	Minimum        : 0
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 16 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.938 : 0.938 : 15	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.062 : 1.000 :  1	||||||
-
-./:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.625
-	Minimum        : 0
-	Maximum        : 3
-	Total          : 10.0
-	Distribution   : 16 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.625 : 0.625 : 10	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.188 : 0.812 :  3	|||||||||||||||||||
-	             2 : 0.125 : 0.938 :  2	|||||||||||||
-	             3 : 0.062 : 1.000 :  1	||||||
-
-./:: info: Directory content:
-	File           : file_deleted_in_new_sources.cpp
-	File           : simple.cpp
-
-
+./:: info: Overall metrics for 'std.code.lines:total' metric
+	Average        : 5.4375
+	Minimum        : 0
+	Maximum        : 12
+	Total          : 87.0
+	Distribution   : 16 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.125 : 0.125 :  2	|||||||||||||
+	             3 : 0.188 : 0.312 :  3	|||||||||||||||||||
+	             4 : 0.062 : 0.375 :  1	||||||
+	             5 : 0.125 : 0.500 :  2	|||||||||||||
+	             6 : 0.062 : 0.562 :  1	||||||
+	             7 : 0.188 : 0.750 :  3	|||||||||||||||||||
+	             8 : 0.125 : 0.875 :  2	|||||||||||||
+	             9 : 0.062 : 0.938 :  1	||||||
+	            12 : 0.062 : 1.000 :  1	||||||
+
+./:: info: Overall metrics for 'std.code.lines:code' metric
+	Average        : 4.875
+	Minimum        : 0
+	Maximum        : 11
+	Total          : 78.0
+	Distribution   : 16 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.125 : 0.125 :  2	|||||||||||||
+	             3 : 0.188 : 0.312 :  3	|||||||||||||||||||
+	             4 : 0.188 : 0.500 :  3	|||||||||||||||||||
+	             5 : 0.125 : 0.625 :  2	|||||||||||||
+	             7 : 0.250 : 0.875 :  4	|||||||||||||||||||||||||
+	             8 : 0.062 : 0.938 :  1	||||||
+	            11 : 0.062 : 1.000 :  1	||||||
+
+./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.0625
+	Minimum        : 0
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 16 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.938 : 0.938 : 15	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.062 : 1.000 :  1	||||||
+
+./:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.625
+	Minimum        : 0
+	Maximum        : 3
+	Total          : 10.0
+	Distribution   : 16 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.625 : 0.625 : 10	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.188 : 0.812 :  3	|||||||||||||||||||
+	             2 : 0.125 : 0.938 :  2	|||||||||||||
+	             3 : 0.062 : 1.000 :  1	||||||
+
+./:: info: Directory content:
+	File           : file_deleted_in_new_sources.cpp
+	File           : simple.cpp
+
+

+ 115 - 115
mainline/tests/general/test_basic/test_view_format_view_nest_per_file_stdout.gold.txt

@@ -1,115 +1,115 @@
-<view>
-
-    <data>
-        <info path="./simple.cpp" id="1" />
-        <file-data>
-            <regions>
-                <region>
-                    <info cursor="0" name="__global__" type="global" offset_end="836" line_begin="1" line_end="78" modified="False" offset_begin="0" />
-                    <data />
-                    <subregions>
-                        <subregion>
-                            <info cursor="4" name="hmm" type="namespace" offset_end="835" line_begin="3" line_end="77" modified="True" offset_begin="2" />
-                            <data />
-                            <subregions>
-                                <subregion>
-                                    <info cursor="10" name="A" type="class" offset_end="831" line_begin="10" line_end="75" modified="True" offset_begin="111" />
-                                    <data />
-                                    <subregions>
-                                        <subregion>
-                                            <info cursor="13" name="A" type="function" offset_end="269" line_begin="13" line_end="24" modified="False" offset_begin="123" />
-                                            <data>
-                                                <std.code.complexity cyclomatic="3">
-                                                    <__diff__ cyclomatic="0" />
-                                                </std.code.complexity>
-                                            </data>
-                                            <subregions>
-                                            </subregions>
-                                        </subregion>
-                                        <subregion>
-                                            <info cursor="26" name="func" type="function" offset_end="455" line_begin="26" line_end="42" modified="False" offset_begin="272" />
-                                            <data>
-                                                <std.code.complexity cyclomatic="1">
-                                                    <__diff__ cyclomatic="0" />
-                                                </std.code.complexity>
-                                            </data>
-                                            <subregions>
-                                                <subregion>
-                                                    <info cursor="28" name="embeded" type="class" offset_end="441" line_begin="28" line_end="40" modified="False" offset_begin="301" />
-                                                    <data />
-                                                    <subregions>
-                                                        <subregion>
-                                                            <info cursor="30" name="embeded" type="function" offset_end="437" line_begin="30" line_end="39" modified="True" offset_begin="322" />
-                                                            <data>
-                                                                <std.code.complexity cyclomatic="2">
-                                                                    <__diff__ cyclomatic="1" />
-                                                                </std.code.complexity>
-                                                            </data>
-                                                            <subregions>
-                                                            </subregions>
-                                                        </subregion>
-                                                    </subregions>
-                                                </subregion>
-                                            </subregions>
-                                        </subregion>
-                                        <subregion>
-                                            <info cursor="44" name="never" type="function" offset_end="549" line_begin="44" line_end="51" modified="True" offset_begin="458" />
-                                            <data>
-                                                <std.code.complexity cyclomatic="1">
-                                                    <__diff__ cyclomatic="0" />
-                                                </std.code.complexity>
-                                            </data>
-                                            <subregions>
-                                            </subregions>
-                                        </subregion>
-                                        <subregion>
-                                            <info cursor="53" name="new_func" type="function" offset_end="585" line_begin="53" line_end="56" modified="None" offset_begin="552" />
-                                            <data>
-                                                <std.code.complexity cyclomatic="0" />
-                                            </data>
-                                            <subregions>
-                                            </subregions>
-                                        </subregion>
-                                        <subregion>
-                                            <info cursor="58" name="new_func_complex" type="function" offset_end="646" line_begin="58" line_end="62" modified="None" offset_begin="588" />
-                                            <data>
-                                                <std.code.complexity cyclomatic="1" />
-                                            </data>
-                                            <subregions>
-                                            </subregions>
-                                        </subregion>
-                                        <subregion>
-                                            <info cursor="65" name="new_func_complex_but_suppressed" type="function" offset_end="808" line_begin="64" line_end="72" modified="None" offset_begin="649" />
-                                            <data>
-                                                <std.code.complexity cyclomatic="2" />
-                                            </data>
-                                            <subregions>
-                                            </subregions>
-                                        </subregion>
-                                    </subregions>
-                                </subregion>
-                            </subregions>
-                        </subregion>
-                    </subregions>
-                </region>
-            </regions>
-        </file-data>
-        <subfiles>
-        </subfiles>
-        <subdirs>
-        </subdirs>
-        <aggregated-data>
-            <std.code.complexity>
-                <cyclomatic count="7" nonzero="False" total="10.0" min="0" max="3" avg="1.42857142857" sup="0">
-                    <__diff__ count="1" nonzero="0" avg="-0.0714285714286" min="-1" max="0" total="1.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="1" __diff__="1" metric="0" ratio="0.142857142857" />
-                        <distribution-bar count="3" __diff__="-1" metric="1" ratio="0.428571428571" />
-                        <distribution-bar count="2" __diff__="1" metric="2" ratio="0.285714285714" />
-                        <distribution-bar count="1" __diff__="0" metric="3" ratio="0.142857142857" />
-                    </distribution-bars>
-                </cyclomatic>
-            </std.code.complexity>
-        </aggregated-data>
-    </data>
-</view>
+<view>
+
+    <data>
+        <info id="1" path="./simple.cpp" />
+        <file-data>
+            <regions>
+                <region>
+                    <info cursor="0" line_begin="1" line_end="78" modified="False" name="__global__" offset_begin="0" offset_end="836" type="global" />
+                    <data />
+                    <subregions>
+                        <subregion>
+                            <info cursor="4" line_begin="3" line_end="77" modified="True" name="hmm" offset_begin="2" offset_end="835" type="namespace" />
+                            <data />
+                            <subregions>
+                                <subregion>
+                                    <info cursor="10" line_begin="10" line_end="75" modified="True" name="A" offset_begin="111" offset_end="831" type="class" />
+                                    <data />
+                                    <subregions>
+                                        <subregion>
+                                            <info cursor="13" line_begin="13" line_end="24" modified="False" name="A" offset_begin="123" offset_end="269" type="function" />
+                                            <data>
+                                                <std.code.complexity cyclomatic="3">
+                                                    <__diff__ cyclomatic="0" />
+                                                </std.code.complexity>
+                                            </data>
+                                            <subregions>
+                                            </subregions>
+                                        </subregion>
+                                        <subregion>
+                                            <info cursor="26" line_begin="26" line_end="42" modified="False" name="func" offset_begin="272" offset_end="455" type="function" />
+                                            <data>
+                                                <std.code.complexity cyclomatic="1">
+                                                    <__diff__ cyclomatic="0" />
+                                                </std.code.complexity>
+                                            </data>
+                                            <subregions>
+                                                <subregion>
+                                                    <info cursor="28" line_begin="28" line_end="40" modified="False" name="embeded" offset_begin="301" offset_end="441" type="class" />
+                                                    <data />
+                                                    <subregions>
+                                                        <subregion>
+                                                            <info cursor="30" line_begin="30" line_end="39" modified="True" name="embeded" offset_begin="322" offset_end="437" type="function" />
+                                                            <data>
+                                                                <std.code.complexity cyclomatic="2">
+                                                                    <__diff__ cyclomatic="1" />
+                                                                </std.code.complexity>
+                                                            </data>
+                                                            <subregions>
+                                                            </subregions>
+                                                        </subregion>
+                                                    </subregions>
+                                                </subregion>
+                                            </subregions>
+                                        </subregion>
+                                        <subregion>
+                                            <info cursor="44" line_begin="44" line_end="51" modified="True" name="never" offset_begin="458" offset_end="549" type="function" />
+                                            <data>
+                                                <std.code.complexity cyclomatic="1">
+                                                    <__diff__ cyclomatic="0" />
+                                                </std.code.complexity>
+                                            </data>
+                                            <subregions>
+                                            </subregions>
+                                        </subregion>
+                                        <subregion>
+                                            <info cursor="53" line_begin="53" line_end="56" modified="None" name="new_func" offset_begin="552" offset_end="585" type="function" />
+                                            <data>
+                                                <std.code.complexity cyclomatic="0" />
+                                            </data>
+                                            <subregions>
+                                            </subregions>
+                                        </subregion>
+                                        <subregion>
+                                            <info cursor="58" line_begin="58" line_end="62" modified="None" name="new_func_complex" offset_begin="588" offset_end="646" type="function" />
+                                            <data>
+                                                <std.code.complexity cyclomatic="1" />
+                                            </data>
+                                            <subregions>
+                                            </subregions>
+                                        </subregion>
+                                        <subregion>
+                                            <info cursor="65" line_begin="64" line_end="72" modified="None" name="new_func_complex_but_suppressed" offset_begin="649" offset_end="808" type="function" />
+                                            <data>
+                                                <std.code.complexity cyclomatic="2" />
+                                            </data>
+                                            <subregions>
+                                            </subregions>
+                                        </subregion>
+                                    </subregions>
+                                </subregion>
+                            </subregions>
+                        </subregion>
+                    </subregions>
+                </region>
+            </regions>
+        </file-data>
+        <subfiles>
+        </subfiles>
+        <subdirs>
+        </subdirs>
+        <aggregated-data>
+            <std.code.complexity>
+                <cyclomatic avg="1.42857142857" count="7" max="3" min="0" nonzero="False" sup="0" total="10.0">
+                    <__diff__ avg="-0.0714285714286" count="1" max="0" min="-1" nonzero="0" sup="0" total="1.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="1" count="1" metric="0" ratio="0.142857142857" />
+                        <distribution-bar __diff__="-1" count="3" metric="1" ratio="0.428571428571" />
+                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.285714285714" />
+                        <distribution-bar __diff__="0" count="1" metric="3" ratio="0.142857142857" />
+                    </distribution-bars>
+                </cyclomatic>
+            </std.code.complexity>
+        </aggregated-data>
+    </data>
+</view>

+ 27 - 27
mainline/tests/general/test_basic/test_view_format_view_nest_stdout.gold.txt

@@ -1,27 +1,27 @@
-<view>
-
-    <data>
-        <info path="./" id="1" />
-        <file-data />
-        <subfiles>
-            <subfile>file_deleted_in_new_sources.cpp</subfile>
-            <subfile>simple2.cpp</subfile>
-            <subfile>simple.cpp</subfile>
-        </subfiles>
-        <subdirs>
-        </subdirs>
-        <aggregated-data>
-            <std.code.complexity>
-                <cyclomatic count="8" nonzero="False" total="13.0" min="0" max="3" avg="1.625" sup="0">
-                    <__diff__ count="0" nonzero="0" avg="0.25" min="-1" max="0" total="2.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="1" __diff__="1" metric="0" ratio="0.125" />
-                        <distribution-bar count="3" __diff__="-3" metric="1" ratio="0.375" />
-                        <distribution-bar count="2" __diff__="1" metric="2" ratio="0.25" />
-                        <distribution-bar count="2" __diff__="1" metric="3" ratio="0.25" />
-                    </distribution-bars>
-                </cyclomatic>
-            </std.code.complexity>
-        </aggregated-data>
-    </data>
-</view>
+<view>
+
+    <data>
+        <info id="1" path="./" />
+        <file-data />
+        <subfiles>
+            <subfile>file_deleted_in_new_sources.cpp</subfile>
+            <subfile>simple2.cpp</subfile>
+            <subfile>simple.cpp</subfile>
+        </subfiles>
+        <subdirs>
+        </subdirs>
+        <aggregated-data>
+            <std.code.complexity>
+                <cyclomatic avg="1.625" count="8" max="3" min="0" nonzero="False" sup="0" total="13.0">
+                    <__diff__ avg="0.25" count="0" max="0" min="-1" nonzero="0" sup="0" total="2.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="1" count="1" metric="0" ratio="0.125" />
+                        <distribution-bar __diff__="-3" count="3" metric="1" ratio="0.375" />
+                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.25" />
+                        <distribution-bar __diff__="1" count="2" metric="3" ratio="0.25" />
+                    </distribution-bars>
+                </cyclomatic>
+            </std.code.complexity>
+        </aggregated-data>
+    </data>
+</view>

+ 1 - 1
mainline/tests/general/test_basic/test_view_format_view_python_stdout.gold.txt

@@ -1 +1 @@
-{'view': [{'data: {'info': {'path': './', 'id': 1}, 'file-data': {}, 'subfiles': [u'file_deleted_in_new_sources.cpp', u'simple.cpp'], 'subdirs': [], 'aggregated-data': {'std.code.complexity': {'cyclomatic': {'count': 8, 'nonzero': False, 'avg': 1.375, 'min': 1, 'max': 3, 'distribution-bars': [{'count': 6, 'ratio': 0.75, 'metric': '1'}, {'count': 1, 'ratio': 0.125, 'metric': '2'}, {'count': 1, 'ratio': 0.125, 'metric': '3'}], 'sup': 0, 'total': 11.0}}}}}]}
+{'view': [{'data: {'info': {'path': './', 'id': 1}, 'file-data': {}, 'subfiles': [u'file_deleted_in_new_sources.cpp', u'simple.cpp'], 'subdirs': [], 'aggregated-data': {'std.code.complexity': {'cyclomatic': {'nonzero': False, 'count': 8, 'avg': 1.375, 'min': 1, 'max': 3, 'distribution-bars': [{'count': 6, 'ratio': 0.75, 'metric': '1'}, {'count': 1, 'ratio': 0.125, 'metric': '2'}, {'count': 1, 'ratio': 0.125, 'metric': '3'}], 'sup': 0, 'total': 11.0}}}}}]}

+ 16 - 16
mainline/tests/general/test_basic/test_view_format_view_txt_stdout.gold.txt

@@ -1,16 +1,16 @@
-./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.375
-	Minimum        : 1
-	Maximum        : 3
-	Total          : 11.0
-	Distribution   : 8 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.750 : 0.750 : 6	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.125 : 0.875 : 1	|||||||||||||
-	             3 : 0.125 : 1.000 : 1	|||||||||||||
-
-./:: info: Directory content:
-	File           : file_deleted_in_new_sources.cpp
-	File           : simple.cpp
-
-
+./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 1.375
+	Minimum        : 1
+	Maximum        : 3
+	Total          : 11.0
+	Distribution   : 8 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.750 : 0.750 : 6	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.125 : 0.875 : 1	|||||||||||||
+	             3 : 0.125 : 1.000 : 1	|||||||||||||
+
+./:: info: Directory content:
+	File           : file_deleted_in_new_sources.cpp
+	File           : simple.cpp
+
+

+ 24 - 24
mainline/tests/general/test_basic/test_view_format_view_xml_stdout.gold.txt

@@ -1,24 +1,24 @@
-<view>
-
-    <data>
-        <info path="./" id="1" />
-        <file-data />
-        <subfiles>
-            <subfile>file_deleted_in_new_sources.cpp</subfile>
-            <subfile>simple.cpp</subfile>
-        </subfiles>
-        <subdirs>
-        </subdirs>
-        <aggregated-data>
-            <std.code.complexity>
-                <cyclomatic count="8" nonzero="False" total="11.0" min="1" max="3" avg="1.375" sup="0">
-                    <distribution-bars>
-                        <distribution-bar count="6" metric="1" ratio="0.75" />
-                        <distribution-bar count="1" metric="2" ratio="0.125" />
-                        <distribution-bar count="1" metric="3" ratio="0.125" />
-                    </distribution-bars>
-                </cyclomatic>
-            </std.code.complexity>
-        </aggregated-data>
-    </data>
-</view>
+<view>
+
+    <data>
+        <info id="1" path="./" />
+        <file-data />
+        <subfiles>
+            <subfile>file_deleted_in_new_sources.cpp</subfile>
+            <subfile>simple.cpp</subfile>
+        </subfiles>
+        <subdirs>
+        </subdirs>
+        <aggregated-data>
+            <std.code.complexity>
+                <cyclomatic avg="1.375" count="8" max="3" min="1" nonzero="False" sup="0" total="11.0">
+                    <distribution-bars>
+                        <distribution-bar count="6" metric="1" ratio="0.75" />
+                        <distribution-bar count="1" metric="2" ratio="0.125" />
+                        <distribution-bar count="1" metric="3" ratio="0.125" />
+                    </distribution-bars>
+                </cyclomatic>
+            </std.code.complexity>
+        </aggregated-data>
+    </data>
+</view>

+ 6 - 6
mainline/tests/general/test_basic/test_workflow_collect_default_stderr.gold.txt

@@ -1,6 +1,6 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Excluding: ./.unused.cpp
-[LOG]: INFO:	Skipping: ./dummy.txt
-[LOG]: INFO:	Processing: ./file_deleted_in_new_sources.cpp
-[LOG]: INFO:	Processing: ./simple.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Excluding: ./.unused.cpp
+[LOG]: INFO:	Skipping: ./dummy.txt
+[LOG]: INFO:	Processing: ./file_deleted_in_new_sources.cpp
+[LOG]: INFO:	Processing: ./simple.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 5 - 5
mainline/tests/general/test_basic/test_workflow_collect_second_stderr.gold.txt

@@ -1,5 +1,5 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Excluding: ./.unused.cpp
-[LOG]: INFO:	Processing: ./simple.cpp
-[LOG]: INFO:	Processing: ./simple2.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Excluding: ./.unused.cpp
+[LOG]: INFO:	Processing: ./simple.cpp
+[LOG]: INFO:	Processing: ./simple2.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 3 - 3
mainline/tests/general/test_basic/test_workflow_export_default_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 19 - 19
mainline/tests/general/test_basic/test_workflow_export_default_stdout.gold.txt

@@ -1,19 +1,19 @@
-file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std.suppress.file:count,std.suppress.file:list,std.suppress:count,std.suppress:list,std.code.lines:code,std.code.lines:total,std.code.lines:preprocessor,std.code.lines:comments
-./file_deleted_in_new_sources.cpp,__global__,global,,1,34,,,,,,0,0,0,0
-./file_deleted_in_new_sources.cpp,hmm,namespace,,3,24,,,,,,4,7,0,3
-./file_deleted_in_new_sources.cpp,B,class,,9,22,,,,,,3,3,0,0
-./file_deleted_in_new_sources.cpp,B,function,,12,20,1,,,,,8,9,0,2
-./file_deleted_in_new_sources.cpp,never_old,function,,26,33,1,,,,,7,7,0,0
-./file_deleted_in_new_sources.cpp,,file,,1,34,,,,,,,,,
-./simple.cpp,__global__,global,,1,71,,,,,,0,0,0,0
-./simple.cpp,hmm,namespace,,3,70,,,,,,4,6,1,1
-./simple.cpp,A,class,,9,68,,,,,,4,4,0,0
-./simple.cpp,A,function,,12,23,3,,,,,11,12,0,2
-./simple.cpp,func,function,,26,40,1,,,,,5,5,0,0
-./simple.cpp,embeded,class,,28,38,,,,,,3,3,0,0
-./simple.cpp,embeded,function,,30,37,1,,,,,7,8,0,1
-./simple.cpp,func_to_be_removed_in_new_sources,function,,42,56,2,,,,,5,5,0,0
-./simple.cpp,embeded,class,,44,54,,,,,,3,3,0,0
-./simple.cpp,embeded,function,,46,53,1,,,,,7,8,0,1
-./simple.cpp,never,function,,58,65,1,,,,,7,7,0,0
-./simple.cpp,,file,,1,71,,,,,,,,,
+file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std.suppress.file:count,std.suppress.file:list,std.suppress:count,std.suppress:list,std.code.lines:code,std.code.lines:total,std.code.lines:preprocessor,std.code.lines:comments
+./file_deleted_in_new_sources.cpp,__global__,global,,1,34,,,,,,0,0,0,0
+./file_deleted_in_new_sources.cpp,hmm,namespace,,3,24,,,,,,4,7,0,3
+./file_deleted_in_new_sources.cpp,B,class,,9,22,,,,,,3,3,0,0
+./file_deleted_in_new_sources.cpp,B,function,,12,20,1,,,,,8,9,0,2
+./file_deleted_in_new_sources.cpp,never_old,function,,26,33,1,,,,,7,7,0,0
+./file_deleted_in_new_sources.cpp,,file,,1,34,,,,,,,,,
+./simple.cpp,__global__,global,,1,71,,,,,,0,0,0,0
+./simple.cpp,hmm,namespace,,3,70,,,,,,4,6,1,1
+./simple.cpp,A,class,,9,68,,,,,,4,4,0,0
+./simple.cpp,A,function,,12,23,3,,,,,11,12,0,2
+./simple.cpp,func,function,,26,40,1,,,,,5,5,0,0
+./simple.cpp,embeded,class,,28,38,,,,,,3,3,0,0
+./simple.cpp,embeded,function,,30,37,1,,,,,7,8,0,1
+./simple.cpp,func_to_be_removed_in_new_sources,function,,42,56,2,,,,,5,5,0,0
+./simple.cpp,embeded,class,,44,54,,,,,,3,3,0,0
+./simple.cpp,embeded,function,,46,53,1,,,,,7,8,0,1
+./simple.cpp,never,function,,58,65,1,,,,,7,7,0,0
+./simple.cpp,,file,,1,71,,,,,,,,,

+ 3 - 3
mainline/tests/general/test_basic/test_workflow_export_second_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 18 - 18
mainline/tests/general/test_basic/test_workflow_export_second_stdout.gold.txt

@@ -1,18 +1,18 @@
-file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std.suppress.file:count,std.suppress.file:list,std.suppress:count,std.suppress:list,std.code.lines:code,std.code.lines:total,std.code.lines:preprocessor,std.code.lines:comments
-./simple.cpp,__global__,global,False,1,78,,,,,,0,0,0,0
-./simple.cpp,hmm,namespace,True,3,77,,,,,,4,7,2,1
-./simple.cpp,A,class,True,10,75,,,,,,4,4,0,0
-./simple.cpp,A,function,False,13,24,3,,,,,11,12,0,2
-./simple.cpp,func,function,False,26,42,1,,,,,5,5,0,0
-./simple.cpp,embeded,class,False,28,40,,,,,,3,3,0,0
-./simple.cpp,embeded,function,True,30,39,2,,,,,8,9,0,2
-./simple.cpp,never,function,True,44,51,1,,,,,7,7,0,1
-./simple.cpp,new_func,function,,53,56,0,,,,,3,4,0,1
-./simple.cpp,new_func_complex,function,,58,62,1,,,,,5,5,0,0
-./simple.cpp,new_func_complex_but_suppressed,function,,64,72,2,,,1,[std.code.complexity:cyclomatic],8,9,0,1
-./simple.cpp,,file,True,1,78,,,,,,,,,
-./simple2.cpp,__global__,global,,1,26,,,,,,0,0,0,0
-./simple2.cpp,hmm,namespace,,3,25,,,,,,4,5,0,1
-./simple2.cpp,New_A,class,,7,23,,,,,,3,3,0,0
-./simple2.cpp,New_A,function,,10,21,3,,,,,10,12,0,2
-./simple2.cpp,,file,,1,26,,,,,,,,,
+file,region,type,modified,line start,line end,std.code.complexity:cyclomatic,std.suppress.file:count,std.suppress.file:list,std.suppress:count,std.suppress:list,std.code.lines:code,std.code.lines:total,std.code.lines:preprocessor,std.code.lines:comments
+./simple.cpp,__global__,global,False,1,78,,,,,,0,0,0,0
+./simple.cpp,hmm,namespace,True,3,77,,,,,,4,7,2,1
+./simple.cpp,A,class,True,10,75,,,,,,4,4,0,0
+./simple.cpp,A,function,False,13,24,3,,,,,11,12,0,2
+./simple.cpp,func,function,False,26,42,1,,,,,5,5,0,0
+./simple.cpp,embeded,class,False,28,40,,,,,,3,3,0,0
+./simple.cpp,embeded,function,True,30,39,2,,,,,8,9,0,2
+./simple.cpp,never,function,True,44,51,1,,,,,7,7,0,1
+./simple.cpp,new_func,function,,53,56,0,,,,,3,4,0,1
+./simple.cpp,new_func_complex,function,,58,62,1,,,,,5,5,0,0
+./simple.cpp,new_func_complex_but_suppressed,function,,64,72,2,,,1,[std.code.complexity:cyclomatic],8,9,0,1
+./simple.cpp,,file,True,1,78,,,,,,,,,
+./simple2.cpp,__global__,global,,1,26,,,,,,0,0,0,0
+./simple2.cpp,hmm,namespace,,3,25,,,,,,4,5,0,1
+./simple2.cpp,New_A,class,,7,23,,,,,,3,3,0,0
+./simple2.cpp,New_A,function,,10,21,3,,,,,10,12,0,2
+./simple2.cpp,,file,,1,26,,,,,,,,,

+ 3 - 3
mainline/tests/general/test_basic/test_workflow_info_default_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 31 - 31
mainline/tests/general/test_basic/test_workflow_info_default_stdout.gold.txt

@@ -1,31 +1,31 @@
-test_workflow.db:: info: Created using plugins and settings:
-	version        : 1.0
-	std.code.cs:version: 1.0
-	std.code.cs:files: *.cs
-	std.code.complexity:version: 1.1
-	std.code.lines:version: 1.1
-	std.code.cpp:version: 1.1
-	std.code.cpp:files: *.c,*.cc,*.cpp,*.cxx,*.h,*.hh,*.hpp,*.hxx
-	std.code.java:version: 1.1
-	std.code.java:files: *.java
-	std.code.todo:version: 1.0
-	std.code.todo:tags: FIXME,FixMe,HACK,TBD,TODO,ToDo,XXX
-	std.code.magic:version: 1.2
-	std.code.magic:number.simplier: False
-	std.suppress:version: 1.0
-
-test_workflow.db:: info: Collected metrics:
-	std.code.complexity:cyclomatic: 
-	std.code.lines:code: 
-	std.code.lines:comments: 
-	std.code.lines:preprocessor: 
-	std.code.lines:total: 
-	std.suppress:count: 
-	std.suppress:list: 
-	std.suppress.file:count: 
-	std.suppress.file:list: 
-
-./:: info: Processed files and checksums:
-	./file_deleted_in_new_sources.cpp: 0xfd51c243
-	./simple.cpp   : 0xcf51202e
-
+test_workflow.db:: info: Created using plugins and settings:
+	version        : 1.0
+	std.code.complexity:version: 1.1
+	std.code.cpp:version: 1.1
+	std.code.cpp:files: *.c,*.cc,*.cpp,*.cxx,*.h,*.hh,*.hpp,*.hxx
+	std.code.cs:version: 1.0
+	std.code.cs:files: *.cs
+	std.code.java:version: 1.1
+	std.code.java:files: *.java
+	std.code.lines:version: 1.1
+	std.code.magic:version: 1.2
+	std.code.magic:number.simplier: False
+	std.code.todo:version: 1.0
+	std.code.todo:tags: FIXME,FixMe,HACK,TBD,TODO,ToDo,XXX
+	std.suppress:version: 1.0
+
+test_workflow.db:: info: Collected metrics:
+	std.code.complexity:cyclomatic: 
+	std.code.lines:code: 
+	std.code.lines:comments: 
+	std.code.lines:preprocessor: 
+	std.code.lines:total: 
+	std.suppress:count: 
+	std.suppress:list: 
+	std.suppress.file:count: 
+	std.suppress.file:list: 
+
+./:: info: Processed files and checksums:
+	./file_deleted_in_new_sources.cpp: 0xfd51c243
+	./simple.cpp   : 0xcf51202e
+

+ 3 - 3
mainline/tests/general/test_basic/test_workflow_info_second_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 31 - 31
mainline/tests/general/test_basic/test_workflow_info_second_stdout.gold.txt

@@ -1,31 +1,31 @@
-test_workflow.db:: info: Created using plugins and settings:
-	version        : 1.0
-	std.code.cs:version: 1.0
-	std.code.cs:files: *.cs
-	std.code.complexity:version: 1.1
-	std.code.lines:version: 1.1
-	std.code.cpp:version: 1.1
-	std.code.cpp:files: *.c,*.cc,*.cpp,*.cxx,*.h,*.hh,*.hpp,*.hxx
-	std.code.java:version: 1.1
-	std.code.java:files: *.java
-	std.code.todo:version: 1.0
-	std.code.todo:tags: FIXME,FixMe,HACK,TBD,TODO,ToDo,XXX
-	std.code.magic:version: 1.2
-	std.code.magic:number.simplier: False
-	std.suppress:version: 1.0
-
-test_workflow.db:: info: Collected metrics:
-	std.code.complexity:cyclomatic: 
-	std.code.lines:code: 
-	std.code.lines:comments: 
-	std.code.lines:preprocessor: 
-	std.code.lines:total: 
-	std.suppress:count: 
-	std.suppress:list: 
-	std.suppress.file:count: 
-	std.suppress.file:list: 
-
-./:: info: Processed files and checksums:
-	./simple.cpp   : 0xa0fb97eb [modified]
-	./simple2.cpp  : 0x44023f81 [new]
-
+test_workflow.db:: info: Created using plugins and settings:
+	version        : 1.0
+	std.code.complexity:version: 1.1
+	std.code.cpp:version: 1.1
+	std.code.cpp:files: *.c,*.cc,*.cpp,*.cxx,*.h,*.hh,*.hpp,*.hxx
+	std.code.cs:version: 1.0
+	std.code.cs:files: *.cs
+	std.code.java:version: 1.1
+	std.code.java:files: *.java
+	std.code.lines:version: 1.1
+	std.code.magic:version: 1.2
+	std.code.magic:number.simplier: False
+	std.code.todo:version: 1.0
+	std.code.todo:tags: FIXME,FixMe,HACK,TBD,TODO,ToDo,XXX
+	std.suppress:version: 1.0
+
+test_workflow.db:: info: Collected metrics:
+	std.code.complexity:cyclomatic: 
+	std.code.lines:code: 
+	std.code.lines:comments: 
+	std.code.lines:preprocessor: 
+	std.code.lines:total: 
+	std.suppress:count: 
+	std.suppress:list: 
+	std.suppress.file:count: 
+	std.suppress.file:list: 
+
+./:: info: Processed files and checksums:
+	./simple.cpp   : 0xa0fb97eb [modified]
+	./simple2.cpp  : 0x44023f81 [new]
+

+ 4 - 4
mainline/tests/general/test_basic/test_workflow_limit_default_stderr.gold.txt

@@ -1,4 +1,4 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
-[LOG]: WARNING:	Done (1 seconds). Exit code: 8
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
+[LOG]: WARNING:	Done (1 seconds). Exit code: 8

+ 72 - 72
mainline/tests/general/test_basic/test_workflow_limit_default_stdout.gold.txt

@@ -1,72 +1,72 @@
-./file_deleted_in_new_sources.cpp:12: warning: Metric 'std.code.complexity:cyclomatic' for region 'B' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : B
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./file_deleted_in_new_sources.cpp:26: warning: Metric 'std.code.complexity:cyclomatic' for region 'never_old' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : never_old
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:12: warning: Metric 'std.code.complexity:cyclomatic' for region 'A' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : A
-	Metric value   : 3
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:26: warning: Metric 'std.code.complexity:cyclomatic' for region 'func' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : func
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:30: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : embeded
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:42: warning: Metric 'std.code.complexity:cyclomatic' for region 'func_to_be_removed_in_new_sources' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : func_to_be_removed_in_new_sources
-	Metric value   : 2
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:46: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : embeded
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'never' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : never
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./file_deleted_in_new_sources.cpp:12: warning: Metric 'std.code.complexity:cyclomatic' for region 'B' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : B
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./file_deleted_in_new_sources.cpp:26: warning: Metric 'std.code.complexity:cyclomatic' for region 'never_old' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : never_old
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:12: warning: Metric 'std.code.complexity:cyclomatic' for region 'A' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : A
+	Metric value   : 3
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:26: warning: Metric 'std.code.complexity:cyclomatic' for region 'func' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : func
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:30: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : embeded
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:42: warning: Metric 'std.code.complexity:cyclomatic' for region 'func_to_be_removed_in_new_sources' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : func_to_be_removed_in_new_sources
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:46: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : embeded
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'never' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : never
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 4 - 4
mainline/tests/general/test_basic/test_workflow_limit_second_stderr.gold.txt

@@ -1,4 +1,4 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
-[LOG]: WARNING:	Done (1 seconds). Exit code: 6
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
+[LOG]: WARNING:	Done (1 seconds). Exit code: 6

+ 54 - 54
mainline/tests/general/test_basic/test_workflow_limit_second_stdout.gold.txt

@@ -1,54 +1,54 @@
-./simple.cpp:13: warning: Metric 'std.code.complexity:cyclomatic' for region 'A' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : A
-	Metric value   : 3
-	Modified       : False
-	Change trend   : 0
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:26: warning: Metric 'std.code.complexity:cyclomatic' for region 'func' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : func
-	Metric value   : 1
-	Modified       : False
-	Change trend   : 0
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:30: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : embeded
-	Metric value   : 2
-	Modified       : True
-	Change trend   : +1
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:44: warning: Metric 'std.code.complexity:cyclomatic' for region 'never' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : never
-	Metric value   : 1
-	Modified       : True
-	Change trend   : 0
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'new_func_complex' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : new_func_complex
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple2.cpp:10: warning: Metric 'std.code.complexity:cyclomatic' for region 'New_A' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : New_A
-	Metric value   : 3
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./simple.cpp:13: warning: Metric 'std.code.complexity:cyclomatic' for region 'A' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : A
+	Metric value   : 3
+	Modified       : False
+	Change trend   : 0
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:26: warning: Metric 'std.code.complexity:cyclomatic' for region 'func' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : func
+	Metric value   : 1
+	Modified       : False
+	Change trend   : 0
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:30: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : embeded
+	Metric value   : 2
+	Modified       : True
+	Change trend   : +1
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:44: warning: Metric 'std.code.complexity:cyclomatic' for region 'never' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : never
+	Metric value   : 1
+	Modified       : True
+	Change trend   : 0
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'new_func_complex' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : new_func_complex
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple2.cpp:10: warning: Metric 'std.code.complexity:cyclomatic' for region 'New_A' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : New_A
+	Metric value   : 3
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 4 - 4
mainline/tests/general/test_basic/test_workflow_limit_second_warn_all_stderr.gold.txt

@@ -1,4 +1,4 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
-[LOG]: WARNING:	Done (1 seconds). Exit code: 6
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
+[LOG]: WARNING:	Done (1 seconds). Exit code: 6

+ 54 - 54
mainline/tests/general/test_basic/test_workflow_limit_second_warn_all_stdout.gold.txt

@@ -1,54 +1,54 @@
-./simple.cpp:13: warning: Metric 'std.code.complexity:cyclomatic' for region 'A' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : A
-	Metric value   : 3
-	Modified       : False
-	Change trend   : 0
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:26: warning: Metric 'std.code.complexity:cyclomatic' for region 'func' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : func
-	Metric value   : 1
-	Modified       : False
-	Change trend   : 0
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:30: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : embeded
-	Metric value   : 2
-	Modified       : True
-	Change trend   : +1
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:44: warning: Metric 'std.code.complexity:cyclomatic' for region 'never' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : never
-	Metric value   : 1
-	Modified       : True
-	Change trend   : 0
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'new_func_complex' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : new_func_complex
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple2.cpp:10: warning: Metric 'std.code.complexity:cyclomatic' for region 'New_A' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : New_A
-	Metric value   : 3
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./simple.cpp:13: warning: Metric 'std.code.complexity:cyclomatic' for region 'A' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : A
+	Metric value   : 3
+	Modified       : False
+	Change trend   : 0
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:26: warning: Metric 'std.code.complexity:cyclomatic' for region 'func' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : func
+	Metric value   : 1
+	Modified       : False
+	Change trend   : 0
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:30: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : embeded
+	Metric value   : 2
+	Modified       : True
+	Change trend   : +1
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:44: warning: Metric 'std.code.complexity:cyclomatic' for region 'never' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : never
+	Metric value   : 1
+	Modified       : True
+	Change trend   : 0
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'new_func_complex' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : new_func_complex
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple2.cpp:10: warning: Metric 'std.code.complexity:cyclomatic' for region 'New_A' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : New_A
+	Metric value   : 3
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 5 - 5
mainline/tests/general/test_basic/test_workflow_limit_second_warn_new_stderr.gold.txt

@@ -1,5 +1,5 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Identifying changed files...
-[LOG]: INFO:	Processing: ./
-[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
-[LOG]: WARNING:	Done (1 seconds). Exit code: 2
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Identifying changed files...
+[LOG]: INFO:	Processing: ./
+[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
+[LOG]: WARNING:	Done (1 seconds). Exit code: 2

+ 18 - 18
mainline/tests/general/test_basic/test_workflow_limit_second_warn_new_stdout.gold.txt

@@ -1,18 +1,18 @@
-./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'new_func_complex' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : new_func_complex
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple2.cpp:10: warning: Metric 'std.code.complexity:cyclomatic' for region 'New_A' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : New_A
-	Metric value   : 3
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'new_func_complex' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : new_func_complex
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple2.cpp:10: warning: Metric 'std.code.complexity:cyclomatic' for region 'New_A' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : New_A
+	Metric value   : 3
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 5 - 5
mainline/tests/general/test_basic/test_workflow_limit_second_warn_touched_stderr.gold.txt

@@ -1,5 +1,5 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Identifying changed files...
-[LOG]: INFO:	Processing: ./
-[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
-[LOG]: WARNING:	Done (1 seconds). Exit code: 4
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Identifying changed files...
+[LOG]: INFO:	Processing: ./
+[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
+[LOG]: WARNING:	Done (1 seconds). Exit code: 4

+ 36 - 36
mainline/tests/general/test_basic/test_workflow_limit_second_warn_touched_stdout.gold.txt

@@ -1,36 +1,36 @@
-./simple.cpp:30: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : embeded
-	Metric value   : 2
-	Modified       : True
-	Change trend   : +1
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:44: warning: Metric 'std.code.complexity:cyclomatic' for region 'never' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : never
-	Metric value   : 1
-	Modified       : True
-	Change trend   : 0
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'new_func_complex' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : new_func_complex
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple2.cpp:10: warning: Metric 'std.code.complexity:cyclomatic' for region 'New_A' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : New_A
-	Metric value   : 3
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./simple.cpp:30: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : embeded
+	Metric value   : 2
+	Modified       : True
+	Change trend   : +1
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:44: warning: Metric 'std.code.complexity:cyclomatic' for region 'never' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : never
+	Metric value   : 1
+	Modified       : True
+	Change trend   : 0
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'new_func_complex' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : new_func_complex
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple2.cpp:10: warning: Metric 'std.code.complexity:cyclomatic' for region 'New_A' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : New_A
+	Metric value   : 3
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 5 - 5
mainline/tests/general/test_basic/test_workflow_limit_second_warn_trend_stderr.gold.txt

@@ -1,5 +1,5 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Identifying changed files...
-[LOG]: INFO:	Processing: ./
-[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
-[LOG]: WARNING:	Done (1 seconds). Exit code: 3
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Identifying changed files...
+[LOG]: INFO:	Processing: ./
+[LOG]: INFO:	Applying limit: namespace 'std.code.complexity', filter '('cyclomatic', '>', 0.0)'
+[LOG]: WARNING:	Done (1 seconds). Exit code: 3

+ 27 - 27
mainline/tests/general/test_basic/test_workflow_limit_second_warn_trend_stdout.gold.txt

@@ -1,27 +1,27 @@
-./simple.cpp:30: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : embeded
-	Metric value   : 2
-	Modified       : True
-	Change trend   : +1
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'new_func_complex' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : new_func_complex
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./simple2.cpp:10: warning: Metric 'std.code.complexity:cyclomatic' for region 'New_A' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : New_A
-	Metric value   : 3
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./simple.cpp:30: warning: Metric 'std.code.complexity:cyclomatic' for region 'embeded' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : embeded
+	Metric value   : 2
+	Modified       : True
+	Change trend   : +1
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple.cpp:58: warning: Metric 'std.code.complexity:cyclomatic' for region 'new_func_complex' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : new_func_complex
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./simple2.cpp:10: warning: Metric 'std.code.complexity:cyclomatic' for region 'New_A' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : New_A
+	Metric value   : 3
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 3 - 3
mainline/tests/general/test_basic/test_workflow_view_default_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 76 - 76
mainline/tests/general/test_basic/test_workflow_view_default_stdout.gold.txt

@@ -1,76 +1,76 @@
-<view>
-
-    <data>
-        <info path="./" id="1" />
-        <file-data />
-        <subfiles>
-            <subfile>file_deleted_in_new_sources.cpp</subfile>
-            <subfile>simple.cpp</subfile>
-        </subfiles>
-        <subdirs>
-        </subdirs>
-        <aggregated-data>
-            <std.code.complexity>
-                <cyclomatic count="8" nonzero="False" total="11.0" min="1" max="3" avg="1.375" sup="0">
-                    <distribution-bars>
-                        <distribution-bar count="6" metric="1" ratio="0.75" />
-                        <distribution-bar count="1" metric="2" ratio="0.125" />
-                        <distribution-bar count="1" metric="3" ratio="0.125" />
-                    </distribution-bars>
-                </cyclomatic>
-            </std.code.complexity>
-            <std.suppress.file>
-                <count count="0" nonzero="True" total="0.0" min="None" max="None" avg="None" sup="0">
-                    <distribution-bars>
-                    </distribution-bars>
-                </count>
-            </std.suppress.file>
-            <std.suppress>
-                <count count="0" nonzero="True" total="0.0" min="None" max="None" avg="None" sup="0">
-                    <distribution-bars>
-                    </distribution-bars>
-                </count>
-            </std.suppress>
-            <std.code.lines>
-                <total count="16" nonzero="False" total="87.0" min="0" max="12" avg="5.4375" sup="0">
-                    <distribution-bars>
-                        <distribution-bar count="2" metric="0" ratio="0.125" />
-                        <distribution-bar count="3" metric="3" ratio="0.1875" />
-                        <distribution-bar count="1" metric="4" ratio="0.0625" />
-                        <distribution-bar count="2" metric="5" ratio="0.125" />
-                        <distribution-bar count="1" metric="6" ratio="0.0625" />
-                        <distribution-bar count="3" metric="7" ratio="0.1875" />
-                        <distribution-bar count="2" metric="8" ratio="0.125" />
-                        <distribution-bar count="1" metric="9" ratio="0.0625" />
-                        <distribution-bar count="1" metric="12" ratio="0.0625" />
-                    </distribution-bars>
-                </total>
-                <code count="16" nonzero="False" total="78.0" min="0" max="11" avg="4.875" sup="0">
-                    <distribution-bars>
-                        <distribution-bar count="2" metric="0" ratio="0.125" />
-                        <distribution-bar count="3" metric="3" ratio="0.1875" />
-                        <distribution-bar count="3" metric="4" ratio="0.1875" />
-                        <distribution-bar count="2" metric="5" ratio="0.125" />
-                        <distribution-bar count="4" metric="7" ratio="0.25" />
-                        <distribution-bar count="1" metric="8" ratio="0.0625" />
-                        <distribution-bar count="1" metric="11" ratio="0.0625" />
-                    </distribution-bars>
-                </code>
-                <preprocessor count="16" nonzero="False" total="1.0" min="0" max="1" avg="0.0625" sup="0">
-                    <distribution-bars>
-                        <distribution-bar count="15" metric="0" ratio="0.9375" />
-                        <distribution-bar count="1" metric="1" ratio="0.0625" />
-                    </distribution-bars>
-                </preprocessor>
-                <comments count="16" nonzero="False" total="10.0" min="0" max="3" avg="0.625" sup="0">
-                    <distribution-bars>
-                        <distribution-bar count="10" metric="0" ratio="0.625" />
-                        <distribution-bar count="3" metric="1" ratio="0.1875" />
-                        <distribution-bar count="2" metric="2" ratio="0.125" />
-                        <distribution-bar count="1" metric="3" ratio="0.0625" />
-                    </distribution-bars>
-                </comments>
-            </std.code.lines>
-        </aggregated-data>
-    </data>
-</view>
+<view>
+
+    <data>
+        <info id="1" path="./" />
+        <file-data />
+        <subfiles>
+            <subfile>file_deleted_in_new_sources.cpp</subfile>
+            <subfile>simple.cpp</subfile>
+        </subfiles>
+        <subdirs>
+        </subdirs>
+        <aggregated-data>
+            <std.code.complexity>
+                <cyclomatic avg="1.375" count="8" max="3" min="1" nonzero="False" sup="0" total="11.0">
+                    <distribution-bars>
+                        <distribution-bar count="6" metric="1" ratio="0.75" />
+                        <distribution-bar count="1" metric="2" ratio="0.125" />
+                        <distribution-bar count="1" metric="3" ratio="0.125" />
+                    </distribution-bars>
+                </cyclomatic>
+            </std.code.complexity>
+            <std.suppress.file>
+                <count avg="None" count="0" max="None" min="None" nonzero="True" sup="0" total="0.0">
+                    <distribution-bars>
+                    </distribution-bars>
+                </count>
+            </std.suppress.file>
+            <std.suppress>
+                <count avg="None" count="0" max="None" min="None" nonzero="True" sup="0" total="0.0">
+                    <distribution-bars>
+                    </distribution-bars>
+                </count>
+            </std.suppress>
+            <std.code.lines>
+                <total avg="5.4375" count="16" max="12" min="0" nonzero="False" sup="0" total="87.0">
+                    <distribution-bars>
+                        <distribution-bar count="2" metric="0" ratio="0.125" />
+                        <distribution-bar count="3" metric="3" ratio="0.1875" />
+                        <distribution-bar count="1" metric="4" ratio="0.0625" />
+                        <distribution-bar count="2" metric="5" ratio="0.125" />
+                        <distribution-bar count="1" metric="6" ratio="0.0625" />
+                        <distribution-bar count="3" metric="7" ratio="0.1875" />
+                        <distribution-bar count="2" metric="8" ratio="0.125" />
+                        <distribution-bar count="1" metric="9" ratio="0.0625" />
+                        <distribution-bar count="1" metric="12" ratio="0.0625" />
+                    </distribution-bars>
+                </total>
+                <code avg="4.875" count="16" max="11" min="0" nonzero="False" sup="0" total="78.0">
+                    <distribution-bars>
+                        <distribution-bar count="2" metric="0" ratio="0.125" />
+                        <distribution-bar count="3" metric="3" ratio="0.1875" />
+                        <distribution-bar count="3" metric="4" ratio="0.1875" />
+                        <distribution-bar count="2" metric="5" ratio="0.125" />
+                        <distribution-bar count="4" metric="7" ratio="0.25" />
+                        <distribution-bar count="1" metric="8" ratio="0.0625" />
+                        <distribution-bar count="1" metric="11" ratio="0.0625" />
+                    </distribution-bars>
+                </code>
+                <preprocessor avg="0.0625" count="16" max="1" min="0" nonzero="False" sup="0" total="1.0">
+                    <distribution-bars>
+                        <distribution-bar count="15" metric="0" ratio="0.9375" />
+                        <distribution-bar count="1" metric="1" ratio="0.0625" />
+                    </distribution-bars>
+                </preprocessor>
+                <comments avg="0.625" count="16" max="3" min="0" nonzero="False" sup="0" total="10.0">
+                    <distribution-bars>
+                        <distribution-bar count="10" metric="0" ratio="0.625" />
+                        <distribution-bar count="3" metric="1" ratio="0.1875" />
+                        <distribution-bar count="2" metric="2" ratio="0.125" />
+                        <distribution-bar count="1" metric="3" ratio="0.0625" />
+                    </distribution-bars>
+                </comments>
+            </std.code.lines>
+        </aggregated-data>
+    </data>
+</view>

+ 3 - 3
mainline/tests/general/test_basic/test_workflow_view_second_per_file_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./simple.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./simple.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 184 - 184
mainline/tests/general/test_basic/test_workflow_view_second_per_file_stdout.gold.txt

@@ -1,184 +1,184 @@
-<view>
-
-    <data>
-        <info path="./simple.cpp" id="1" />
-        <file-data>
-            <regions>
-                <region>
-                    <info cursor="0" name="__global__" type="global" offset_end="836" line_begin="1" line_end="78" modified="False" offset_begin="0" />
-                    <data>
-                        <std.code.lines total="0" code="0" preprocessor="0" comments="0">
-                            <__diff__ code="0" total="0" preprocessor="0" comments="0" />
-                        </std.code.lines>
-                    </data>
-                </region>
-                <region>
-                    <info cursor="4" name="hmm" type="namespace" offset_end="835" line_begin="3" line_end="77" modified="True" offset_begin="2" />
-                    <data>
-                        <std.code.lines total="7" code="4" preprocessor="2" comments="1">
-                            <__diff__ code="0" total="1" preprocessor="1" comments="0" />
-                        </std.code.lines>
-                    </data>
-                </region>
-                <region>
-                    <info cursor="10" name="A" type="class" offset_end="831" line_begin="10" line_end="75" modified="True" offset_begin="111" />
-                    <data>
-                        <std.code.lines total="4" code="4" preprocessor="0" comments="0">
-                            <__diff__ code="0" total="0" preprocessor="0" comments="0" />
-                        </std.code.lines>
-                    </data>
-                </region>
-                <region>
-                    <info cursor="13" name="A" type="function" offset_end="269" line_begin="13" line_end="24" modified="False" offset_begin="123" />
-                    <data>
-                        <std.code.complexity cyclomatic="3">
-                            <__diff__ cyclomatic="0" />
-                        </std.code.complexity>
-                        <std.code.lines total="12" code="11" preprocessor="0" comments="2">
-                            <__diff__ code="0" total="0" preprocessor="0" comments="0" />
-                        </std.code.lines>
-                    </data>
-                </region>
-                <region>
-                    <info cursor="26" name="func" type="function" offset_end="455" line_begin="26" line_end="42" modified="False" offset_begin="272" />
-                    <data>
-                        <std.code.complexity cyclomatic="1">
-                            <__diff__ cyclomatic="0" />
-                        </std.code.complexity>
-                        <std.code.lines total="5" code="5" preprocessor="0" comments="0">
-                            <__diff__ code="0" total="0" preprocessor="0" comments="0" />
-                        </std.code.lines>
-                    </data>
-                </region>
-                <region>
-                    <info cursor="28" name="embeded" type="class" offset_end="441" line_begin="28" line_end="40" modified="False" offset_begin="301" />
-                    <data>
-                        <std.code.lines total="3" code="3" preprocessor="0" comments="0">
-                            <__diff__ code="0" total="0" preprocessor="0" comments="0" />
-                        </std.code.lines>
-                    </data>
-                </region>
-                <region>
-                    <info cursor="30" name="embeded" type="function" offset_end="437" line_begin="30" line_end="39" modified="True" offset_begin="322" />
-                    <data>
-                        <std.code.complexity cyclomatic="2">
-                            <__diff__ cyclomatic="1" />
-                        </std.code.complexity>
-                        <std.code.lines total="9" code="8" preprocessor="0" comments="2">
-                            <__diff__ code="1" total="1" preprocessor="0" comments="1" />
-                        </std.code.lines>
-                    </data>
-                </region>
-                <region>
-                    <info cursor="44" name="never" type="function" offset_end="549" line_begin="44" line_end="51" modified="True" offset_begin="458" />
-                    <data>
-                        <std.code.complexity cyclomatic="1">
-                            <__diff__ cyclomatic="0" />
-                        </std.code.complexity>
-                        <std.code.lines total="7" code="7" preprocessor="0" comments="1">
-                            <__diff__ code="0" total="0" preprocessor="0" comments="1" />
-                        </std.code.lines>
-                    </data>
-                </region>
-                <region>
-                    <info cursor="53" name="new_func" type="function" offset_end="585" line_begin="53" line_end="56" modified="None" offset_begin="552" />
-                    <data>
-                        <std.code.complexity cyclomatic="0" />
-                        <std.code.lines total="4" code="3" preprocessor="0" comments="1" />
-                    </data>
-                </region>
-                <region>
-                    <info cursor="58" name="new_func_complex" type="function" offset_end="646" line_begin="58" line_end="62" modified="None" offset_begin="588" />
-                    <data>
-                        <std.code.complexity cyclomatic="1" />
-                        <std.code.lines total="5" code="5" preprocessor="0" comments="0" />
-                    </data>
-                </region>
-                <region>
-                    <info cursor="65" name="new_func_complex_but_suppressed" type="function" offset_end="808" line_begin="64" line_end="72" modified="None" offset_begin="649" />
-                    <data>
-                        <std.code.complexity cyclomatic="2" />
-                        <std.suppress count="1" list="[std.code.complexity:cyclomatic]" />
-                        <std.code.lines total="9" code="8" preprocessor="0" comments="1" />
-                    </data>
-                </region>
-            </regions>
-        </file-data>
-        <subfiles>
-        </subfiles>
-        <subdirs>
-        </subdirs>
-        <aggregated-data>
-            <std.code.complexity>
-                <cyclomatic count="7" nonzero="False" total="10.0" min="0" max="3" avg="1.42857142857" sup="1">
-                    <__diff__ count="1" nonzero="0" avg="-0.0714285714286" min="-1" max="0" total="1.0" sup="1" />
-                    <distribution-bars>
-                        <distribution-bar count="1" __diff__="1" metric="0" ratio="0.142857142857" />
-                        <distribution-bar count="3" __diff__="-1" metric="1" ratio="0.428571428571" />
-                        <distribution-bar count="2" __diff__="1" metric="2" ratio="0.285714285714" />
-                        <distribution-bar count="1" __diff__="0" metric="3" ratio="0.142857142857" />
-                    </distribution-bars>
-                </cyclomatic>
-            </std.code.complexity>
-            <std.suppress.file>
-                <count count="0" nonzero="True" total="0.0" min="None" max="None" avg="None" sup="0">
-                    <__diff__ count="0" nonzero="0" avg="0" min="0" max="0" total="0.0" sup="0" />
-                    <distribution-bars>
-                    </distribution-bars>
-                </count>
-            </std.suppress.file>
-            <std.suppress>
-                <count count="1" nonzero="True" total="1.0" min="1" max="1" avg="1.0" sup="0">
-                    <__diff__ count="1" nonzero="0" avg="1.0" min="1" max="1" total="1.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="1" __diff__="1" metric="1" ratio="1.0" />
-                    </distribution-bars>
-                </count>
-            </std.suppress>
-            <std.code.lines>
-                <total count="11" nonzero="False" total="65.0" min="0" max="12" avg="5.90909090909" sup="0">
-                    <__diff__ count="0" nonzero="0" avg="0.363636363636" min="0" max="0" total="4.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="1" __diff__="0" metric="0" ratio="0.0909090909091" />
-                        <distribution-bar count="1" __diff__="-1" metric="3" ratio="0.0909090909091" />
-                        <distribution-bar count="2" __diff__="1" metric="4" ratio="0.181818181818" />
-                        <distribution-bar count="2" __diff__="0" metric="5" ratio="0.181818181818" />
-                        <distribution-bar count="0" __diff__="-1" metric="6" ratio="0" />
-                        <distribution-bar count="2" __diff__="1" metric="7" ratio="0.181818181818" />
-                        <distribution-bar count="0" __diff__="-2" metric="8" ratio="0" />
-                        <distribution-bar count="2" __diff__="2" metric="9" ratio="0.181818181818" />
-                        <distribution-bar count="1" __diff__="0" metric="12" ratio="0.0909090909091" />
-                    </distribution-bars>
-                </total>
-                <code count="11" nonzero="False" total="58.0" min="0" max="11" avg="5.27272727273" sup="0">
-                    <__diff__ count="0" nonzero="0" avg="0.181818181818" min="0" max="0" total="2.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="1" __diff__="0" metric="0" ratio="0.0909090909091" />
-                        <distribution-bar count="2" __diff__="0" metric="3" ratio="0.181818181818" />
-                        <distribution-bar count="2" __diff__="0" metric="4" ratio="0.181818181818" />
-                        <distribution-bar count="2" __diff__="0" metric="5" ratio="0.181818181818" />
-                        <distribution-bar count="1" __diff__="-2" metric="7" ratio="0.0909090909091" />
-                        <distribution-bar count="2" __diff__="2" metric="8" ratio="0.181818181818" />
-                        <distribution-bar count="1" __diff__="0" metric="11" ratio="0.0909090909091" />
-                    </distribution-bars>
-                </code>
-                <preprocessor count="11" nonzero="False" total="2.0" min="0" max="2" avg="0.181818181818" sup="0">
-                    <__diff__ count="0" nonzero="0" avg="0.0909090909091" min="0" max="1" total="1.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="10" __diff__="0" metric="0" ratio="0.909090909091" />
-                        <distribution-bar count="0" __diff__="-1" metric="1" ratio="0" />
-                        <distribution-bar count="1" __diff__="1" metric="2" ratio="0.0909090909091" />
-                    </distribution-bars>
-                </preprocessor>
-                <comments count="11" nonzero="False" total="8.0" min="0" max="2" avg="0.727272727273" sup="0">
-                    <__diff__ count="0" nonzero="0" avg="0.272727272727" min="0" max="0" total="3.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="5" __diff__="-2" metric="0" ratio="0.454545454545" />
-                        <distribution-bar count="4" __diff__="1" metric="1" ratio="0.363636363636" />
-                        <distribution-bar count="2" __diff__="1" metric="2" ratio="0.181818181818" />
-                    </distribution-bars>
-                </comments>
-            </std.code.lines>
-        </aggregated-data>
-    </data>
-</view>
+<view>
+
+    <data>
+        <info id="1" path="./simple.cpp" />
+        <file-data>
+            <regions>
+                <region>
+                    <info cursor="0" line_begin="1" line_end="78" modified="False" name="__global__" offset_begin="0" offset_end="836" type="global" />
+                    <data>
+                        <std.code.lines code="0" comments="0" preprocessor="0" total="0">
+                            <__diff__ code="0" comments="0" preprocessor="0" total="0" />
+                        </std.code.lines>
+                    </data>
+                </region>
+                <region>
+                    <info cursor="4" line_begin="3" line_end="77" modified="True" name="hmm" offset_begin="2" offset_end="835" type="namespace" />
+                    <data>
+                        <std.code.lines code="4" comments="1" preprocessor="2" total="7">
+                            <__diff__ code="0" comments="0" preprocessor="1" total="1" />
+                        </std.code.lines>
+                    </data>
+                </region>
+                <region>
+                    <info cursor="10" line_begin="10" line_end="75" modified="True" name="A" offset_begin="111" offset_end="831" type="class" />
+                    <data>
+                        <std.code.lines code="4" comments="0" preprocessor="0" total="4">
+                            <__diff__ code="0" comments="0" preprocessor="0" total="0" />
+                        </std.code.lines>
+                    </data>
+                </region>
+                <region>
+                    <info cursor="13" line_begin="13" line_end="24" modified="False" name="A" offset_begin="123" offset_end="269" type="function" />
+                    <data>
+                        <std.code.complexity cyclomatic="3">
+                            <__diff__ cyclomatic="0" />
+                        </std.code.complexity>
+                        <std.code.lines code="11" comments="2" preprocessor="0" total="12">
+                            <__diff__ code="0" comments="0" preprocessor="0" total="0" />
+                        </std.code.lines>
+                    </data>
+                </region>
+                <region>
+                    <info cursor="26" line_begin="26" line_end="42" modified="False" name="func" offset_begin="272" offset_end="455" type="function" />
+                    <data>
+                        <std.code.complexity cyclomatic="1">
+                            <__diff__ cyclomatic="0" />
+                        </std.code.complexity>
+                        <std.code.lines code="5" comments="0" preprocessor="0" total="5">
+                            <__diff__ code="0" comments="0" preprocessor="0" total="0" />
+                        </std.code.lines>
+                    </data>
+                </region>
+                <region>
+                    <info cursor="28" line_begin="28" line_end="40" modified="False" name="embeded" offset_begin="301" offset_end="441" type="class" />
+                    <data>
+                        <std.code.lines code="3" comments="0" preprocessor="0" total="3">
+                            <__diff__ code="0" comments="0" preprocessor="0" total="0" />
+                        </std.code.lines>
+                    </data>
+                </region>
+                <region>
+                    <info cursor="30" line_begin="30" line_end="39" modified="True" name="embeded" offset_begin="322" offset_end="437" type="function" />
+                    <data>
+                        <std.code.complexity cyclomatic="2">
+                            <__diff__ cyclomatic="1" />
+                        </std.code.complexity>
+                        <std.code.lines code="8" comments="2" preprocessor="0" total="9">
+                            <__diff__ code="1" comments="1" preprocessor="0" total="1" />
+                        </std.code.lines>
+                    </data>
+                </region>
+                <region>
+                    <info cursor="44" line_begin="44" line_end="51" modified="True" name="never" offset_begin="458" offset_end="549" type="function" />
+                    <data>
+                        <std.code.complexity cyclomatic="1">
+                            <__diff__ cyclomatic="0" />
+                        </std.code.complexity>
+                        <std.code.lines code="7" comments="1" preprocessor="0" total="7">
+                            <__diff__ code="0" comments="1" preprocessor="0" total="0" />
+                        </std.code.lines>
+                    </data>
+                </region>
+                <region>
+                    <info cursor="53" line_begin="53" line_end="56" modified="None" name="new_func" offset_begin="552" offset_end="585" type="function" />
+                    <data>
+                        <std.code.complexity cyclomatic="0" />
+                        <std.code.lines code="3" comments="1" preprocessor="0" total="4" />
+                    </data>
+                </region>
+                <region>
+                    <info cursor="58" line_begin="58" line_end="62" modified="None" name="new_func_complex" offset_begin="588" offset_end="646" type="function" />
+                    <data>
+                        <std.code.complexity cyclomatic="1" />
+                        <std.code.lines code="5" comments="0" preprocessor="0" total="5" />
+                    </data>
+                </region>
+                <region>
+                    <info cursor="65" line_begin="64" line_end="72" modified="None" name="new_func_complex_but_suppressed" offset_begin="649" offset_end="808" type="function" />
+                    <data>
+                        <std.code.complexity cyclomatic="2" />
+                        <std.suppress count="1" list="[std.code.complexity:cyclomatic]" />
+                        <std.code.lines code="8" comments="1" preprocessor="0" total="9" />
+                    </data>
+                </region>
+            </regions>
+        </file-data>
+        <subfiles>
+        </subfiles>
+        <subdirs>
+        </subdirs>
+        <aggregated-data>
+            <std.code.complexity>
+                <cyclomatic avg="1.42857142857" count="7" max="3" min="0" nonzero="False" sup="1" total="10.0">
+                    <__diff__ avg="-0.0714285714286" count="1" max="0" min="-1" nonzero="0" sup="1" total="1.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="1" count="1" metric="0" ratio="0.142857142857" />
+                        <distribution-bar __diff__="-1" count="3" metric="1" ratio="0.428571428571" />
+                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.285714285714" />
+                        <distribution-bar __diff__="0" count="1" metric="3" ratio="0.142857142857" />
+                    </distribution-bars>
+                </cyclomatic>
+            </std.code.complexity>
+            <std.suppress.file>
+                <count avg="None" count="0" max="None" min="None" nonzero="True" sup="0" total="0.0">
+                    <__diff__ avg="0" count="0" max="0" min="0" nonzero="0" sup="0" total="0.0" />
+                    <distribution-bars>
+                    </distribution-bars>
+                </count>
+            </std.suppress.file>
+            <std.suppress>
+                <count avg="1.0" count="1" max="1" min="1" nonzero="True" sup="0" total="1.0">
+                    <__diff__ avg="1.0" count="1" max="1" min="1" nonzero="0" sup="0" total="1.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="1" count="1" metric="1" ratio="1.0" />
+                    </distribution-bars>
+                </count>
+            </std.suppress>
+            <std.code.lines>
+                <total avg="5.90909090909" count="11" max="12" min="0" nonzero="False" sup="0" total="65.0">
+                    <__diff__ avg="0.363636363636" count="0" max="0" min="0" nonzero="0" sup="0" total="4.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="0" count="1" metric="0" ratio="0.0909090909091" />
+                        <distribution-bar __diff__="-1" count="1" metric="3" ratio="0.0909090909091" />
+                        <distribution-bar __diff__="1" count="2" metric="4" ratio="0.181818181818" />
+                        <distribution-bar __diff__="0" count="2" metric="5" ratio="0.181818181818" />
+                        <distribution-bar __diff__="-1" count="0" metric="6" ratio="0" />
+                        <distribution-bar __diff__="1" count="2" metric="7" ratio="0.181818181818" />
+                        <distribution-bar __diff__="-2" count="0" metric="8" ratio="0" />
+                        <distribution-bar __diff__="2" count="2" metric="9" ratio="0.181818181818" />
+                        <distribution-bar __diff__="0" count="1" metric="12" ratio="0.0909090909091" />
+                    </distribution-bars>
+                </total>
+                <code avg="5.27272727273" count="11" max="11" min="0" nonzero="False" sup="0" total="58.0">
+                    <__diff__ avg="0.181818181818" count="0" max="0" min="0" nonzero="0" sup="0" total="2.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="0" count="1" metric="0" ratio="0.0909090909091" />
+                        <distribution-bar __diff__="0" count="2" metric="3" ratio="0.181818181818" />
+                        <distribution-bar __diff__="0" count="2" metric="4" ratio="0.181818181818" />
+                        <distribution-bar __diff__="0" count="2" metric="5" ratio="0.181818181818" />
+                        <distribution-bar __diff__="-2" count="1" metric="7" ratio="0.0909090909091" />
+                        <distribution-bar __diff__="2" count="2" metric="8" ratio="0.181818181818" />
+                        <distribution-bar __diff__="0" count="1" metric="11" ratio="0.0909090909091" />
+                    </distribution-bars>
+                </code>
+                <preprocessor avg="0.181818181818" count="11" max="2" min="0" nonzero="False" sup="0" total="2.0">
+                    <__diff__ avg="0.0909090909091" count="0" max="1" min="0" nonzero="0" sup="0" total="1.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="0" count="10" metric="0" ratio="0.909090909091" />
+                        <distribution-bar __diff__="-1" count="0" metric="1" ratio="0" />
+                        <distribution-bar __diff__="1" count="1" metric="2" ratio="0.0909090909091" />
+                    </distribution-bars>
+                </preprocessor>
+                <comments avg="0.727272727273" count="11" max="2" min="0" nonzero="False" sup="0" total="8.0">
+                    <__diff__ avg="0.272727272727" count="0" max="0" min="0" nonzero="0" sup="0" total="3.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="-2" count="5" metric="0" ratio="0.454545454545" />
+                        <distribution-bar __diff__="1" count="4" metric="1" ratio="0.363636363636" />
+                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.181818181818" />
+                    </distribution-bars>
+                </comments>
+            </std.code.lines>
+        </aggregated-data>
+    </data>
+</view>

+ 3 - 3
mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_all_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./simple.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./simple.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 214 - 214
mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_all_stdout.gold.txt

@@ -1,214 +1,214 @@
-./simple.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-836
-	Line numbers   : 1-78
-	Modified       : False
-	std.code.lines:code: 0 [+0]
-	std.code.lines:total: 0 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:4: info: Metrics per 'hmm' region
-	Region name    : hmm
-	Region type    : namespace
-	Offsets        : 2-835
-	Line numbers   : 3-77
-	Modified       : True
-	std.code.lines:code: 4 [+0]
-	std.code.lines:total: 7 [+1]
-	std.code.lines:preprocessor: 2 [+1]
-	std.code.lines:comments: 1 [+0]
-
-./simple.cpp:10: info: Metrics per 'A' region
-	Region name    : A
-	Region type    : class
-	Offsets        : 111-831
-	Line numbers   : 10-75
-	Modified       : True
-	std.code.lines:code: 4 [+0]
-	std.code.lines:total: 4 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:13: info: Metrics per 'A' region
-	Region name    : A
-	Region type    : function
-	Offsets        : 123-269
-	Line numbers   : 13-24
-	Modified       : False
-	std.code.complexity:cyclomatic: 3 [+0]
-	std.code.lines:code: 11 [+0]
-	std.code.lines:total: 12 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 2 [+0]
-
-./simple.cpp:26: info: Metrics per 'func' region
-	Region name    : func
-	Region type    : function
-	Offsets        : 272-455
-	Line numbers   : 26-42
-	Modified       : False
-	std.code.complexity:cyclomatic: 1 [+0]
-	std.code.lines:code: 5 [+0]
-	std.code.lines:total: 5 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:28: info: Metrics per 'embeded' region
-	Region name    : embeded
-	Region type    : class
-	Offsets        : 301-441
-	Line numbers   : 28-40
-	Modified       : False
-	std.code.lines:code: 3 [+0]
-	std.code.lines:total: 3 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:30: info: Metrics per 'embeded' region
-	Region name    : embeded
-	Region type    : function
-	Offsets        : 322-437
-	Line numbers   : 30-39
-	Modified       : True
-	std.code.complexity:cyclomatic: 2 [+1]
-	std.code.lines:code: 8 [+1]
-	std.code.lines:total: 9 [+1]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 2 [+1]
-
-./simple.cpp:44: info: Metrics per 'never' region
-	Region name    : never
-	Region type    : function
-	Offsets        : 458-549
-	Line numbers   : 44-51
-	Modified       : True
-	std.code.complexity:cyclomatic: 1 [+0]
-	std.code.lines:code: 7 [+0]
-	std.code.lines:total: 7 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 1 [+1]
-
-./simple.cpp:53: info: Metrics per 'new_func' region
-	Region name    : new_func
-	Region type    : function
-	Offsets        : 552-585
-	Line numbers   : 53-56
-	Modified       : None
-	std.code.complexity:cyclomatic: 0
-	std.code.lines:code: 3
-	std.code.lines:total: 4
-	std.code.lines:preprocessor: 0
-	std.code.lines:comments: 1
-
-./simple.cpp:58: info: Metrics per 'new_func_complex' region
-	Region name    : new_func_complex
-	Region type    : function
-	Offsets        : 588-646
-	Line numbers   : 58-62
-	Modified       : None
-	std.code.complexity:cyclomatic: 1
-	std.code.lines:code: 5
-	std.code.lines:total: 5
-	std.code.lines:preprocessor: 0
-	std.code.lines:comments: 0
-
-./simple.cpp:65: info: Metrics per 'new_func_complex_but_suppressed' region
-	Region name    : new_func_complex_but_suppressed
-	Region type    : function
-	Offsets        : 649-808
-	Line numbers   : 64-72
-	Modified       : None
-	std.code.complexity:cyclomatic: 2
-	std.suppress:count: 1
-	std.suppress:list: [std.code.complexity:cyclomatic]
-	std.code.lines:code: 8
-	std.code.lines:total: 9
-	std.code.lines:preprocessor: 0
-	std.code.lines:comments: 1
-
-./simple.cpp:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.42857142857 [-0.0714285714286]
-	Minimum        : 0 [-1]
-	Maximum        : 3 [+0]
-	Total          : 10.0 [+1.0]
-	Distribution   : 7 [+1] regions in total (including 1 [+1] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.143 : 0.143 : 1 [+1]	||||||||||||||
-	             1 : 0.429 : 0.571 : 3 [-1]	|||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.286 : 0.857 : 2 [+1]	|||||||||||||||||||||||||||||
-	             3 : 0.143 : 1.000 : 1 [+0]	||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.suppress.file:count' metric
-	Average        : None [+0] (excluding zero metric values)
-	Minimum        : None [+0]
-	Maximum        : None [+0]
-	Total          : 0.0 [+0.0]
-	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-
-./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
-	Average        : 1.0 [+1.0] (excluding zero metric values)
-	Minimum        : 1 [+1]
-	Maximum        : 1 [+1]
-	Total          : 1.0 [+1.0]
-	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.90909090909 [+0.363636363636]
-	Minimum        : 0 [+0]
-	Maximum        : 12 [+0]
-	Total          : 65.0 [+4.0]
-	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
-	             3 : 0.091 : 0.182 :  1 [-1 ]	|||||||||
-	             4 : 0.182 : 0.364 :  2 [+1 ]	||||||||||||||||||
-	             5 : 0.182 : 0.545 :  2 [+0 ]	||||||||||||||||||
-	             6 : 0.000 : 0.545 :  0 [-1 ]	
-	             7 : 0.182 : 0.727 :  2 [+1 ]	||||||||||||||||||
-	             8 : 0.000 : 0.727 :  0 [-2 ]	
-	             9 : 0.182 : 0.909 :  2 [+2 ]	||||||||||||||||||
-	            12 : 0.091 : 1.000 :  1 [+0 ]	|||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.27272727273 [+0.181818181818]
-	Minimum        : 0 [+0]
-	Maximum        : 11 [+0]
-	Total          : 58.0 [+2.0]
-	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
-	             3 : 0.182 : 0.273 :  2 [+0 ]	||||||||||||||||||
-	             4 : 0.182 : 0.455 :  2 [+0 ]	||||||||||||||||||
-	             5 : 0.182 : 0.636 :  2 [+0 ]	||||||||||||||||||
-	             7 : 0.091 : 0.727 :  1 [-2 ]	|||||||||
-	             8 : 0.182 : 0.909 :  2 [+2 ]	||||||||||||||||||
-	            11 : 0.091 : 1.000 :  1 [+0 ]	|||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.181818181818 [+0.0909090909091]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+1]
-	Total          : 2.0 [+1.0]
-	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.909 : 0.909 : 10 [+0 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.000 : 0.909 :  0 [-1 ]	
-	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.727272727273 [+0.272727272727]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+0]
-	Total          : 8.0 [+3.0]
-	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.455 : 0.455 :  5 [-2 ]	|||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.364 : 0.818 :  4 [+1 ]	||||||||||||||||||||||||||||||||||||
-	             2 : 0.182 : 1.000 :  2 [+1 ]	||||||||||||||||||
-
-
+./simple.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-836
+	Line numbers   : 1-78
+	Modified       : False
+	std.code.lines:code: 0 [+0]
+	std.code.lines:total: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:4: info: Metrics per 'hmm' region
+	Region name    : hmm
+	Region type    : namespace
+	Offsets        : 2-835
+	Line numbers   : 3-77
+	Modified       : True
+	std.code.lines:code: 4 [+0]
+	std.code.lines:total: 7 [+1]
+	std.code.lines:preprocessor: 2 [+1]
+	std.code.lines:comments: 1 [+0]
+
+./simple.cpp:10: info: Metrics per 'A' region
+	Region name    : A
+	Region type    : class
+	Offsets        : 111-831
+	Line numbers   : 10-75
+	Modified       : True
+	std.code.lines:code: 4 [+0]
+	std.code.lines:total: 4 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:13: info: Metrics per 'A' region
+	Region name    : A
+	Region type    : function
+	Offsets        : 123-269
+	Line numbers   : 13-24
+	Modified       : False
+	std.code.complexity:cyclomatic: 3 [+0]
+	std.code.lines:code: 11 [+0]
+	std.code.lines:total: 12 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 2 [+0]
+
+./simple.cpp:26: info: Metrics per 'func' region
+	Region name    : func
+	Region type    : function
+	Offsets        : 272-455
+	Line numbers   : 26-42
+	Modified       : False
+	std.code.complexity:cyclomatic: 1 [+0]
+	std.code.lines:code: 5 [+0]
+	std.code.lines:total: 5 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:28: info: Metrics per 'embeded' region
+	Region name    : embeded
+	Region type    : class
+	Offsets        : 301-441
+	Line numbers   : 28-40
+	Modified       : False
+	std.code.lines:code: 3 [+0]
+	std.code.lines:total: 3 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:30: info: Metrics per 'embeded' region
+	Region name    : embeded
+	Region type    : function
+	Offsets        : 322-437
+	Line numbers   : 30-39
+	Modified       : True
+	std.code.complexity:cyclomatic: 2 [+1]
+	std.code.lines:code: 8 [+1]
+	std.code.lines:total: 9 [+1]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 2 [+1]
+
+./simple.cpp:44: info: Metrics per 'never' region
+	Region name    : never
+	Region type    : function
+	Offsets        : 458-549
+	Line numbers   : 44-51
+	Modified       : True
+	std.code.complexity:cyclomatic: 1 [+0]
+	std.code.lines:code: 7 [+0]
+	std.code.lines:total: 7 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 1 [+1]
+
+./simple.cpp:53: info: Metrics per 'new_func' region
+	Region name    : new_func
+	Region type    : function
+	Offsets        : 552-585
+	Line numbers   : 53-56
+	Modified       : None
+	std.code.complexity:cyclomatic: 0
+	std.code.lines:code: 3
+	std.code.lines:total: 4
+	std.code.lines:preprocessor: 0
+	std.code.lines:comments: 1
+
+./simple.cpp:58: info: Metrics per 'new_func_complex' region
+	Region name    : new_func_complex
+	Region type    : function
+	Offsets        : 588-646
+	Line numbers   : 58-62
+	Modified       : None
+	std.code.complexity:cyclomatic: 1
+	std.code.lines:code: 5
+	std.code.lines:total: 5
+	std.code.lines:preprocessor: 0
+	std.code.lines:comments: 0
+
+./simple.cpp:65: info: Metrics per 'new_func_complex_but_suppressed' region
+	Region name    : new_func_complex_but_suppressed
+	Region type    : function
+	Offsets        : 649-808
+	Line numbers   : 64-72
+	Modified       : None
+	std.code.complexity:cyclomatic: 2
+	std.suppress:count: 1
+	std.suppress:list: [std.code.complexity:cyclomatic]
+	std.code.lines:code: 8
+	std.code.lines:total: 9
+	std.code.lines:preprocessor: 0
+	std.code.lines:comments: 1
+
+./simple.cpp:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 1.42857142857 [-0.0714285714286]
+	Minimum        : 0 [-1]
+	Maximum        : 3 [+0]
+	Total          : 10.0 [+1.0]
+	Distribution   : 7 [+1] regions in total (including 1 [+1] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.143 : 0.143 : 1 [+1]	||||||||||||||
+	             1 : 0.429 : 0.571 : 3 [-1]	|||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.286 : 0.857 : 2 [+1]	|||||||||||||||||||||||||||||
+	             3 : 0.143 : 1.000 : 1 [+0]	||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.suppress.file:count' metric
+	Average        : None [+0] (excluding zero metric values)
+	Minimum        : None [+0]
+	Maximum        : None [+0]
+	Total          : 0.0 [+0.0]
+	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+
+./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
+	Average        : 1.0 [+1.0] (excluding zero metric values)
+	Minimum        : 1 [+1]
+	Maximum        : 1 [+1]
+	Total          : 1.0 [+1.0]
+	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
+	Average        : 5.90909090909 [+0.363636363636]
+	Minimum        : 0 [+0]
+	Maximum        : 12 [+0]
+	Total          : 65.0 [+4.0]
+	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
+	             3 : 0.091 : 0.182 :  1 [-1 ]	|||||||||
+	             4 : 0.182 : 0.364 :  2 [+1 ]	||||||||||||||||||
+	             5 : 0.182 : 0.545 :  2 [+0 ]	||||||||||||||||||
+	             6 : 0.000 : 0.545 :  0 [-1 ]	
+	             7 : 0.182 : 0.727 :  2 [+1 ]	||||||||||||||||||
+	             8 : 0.000 : 0.727 :  0 [-2 ]	
+	             9 : 0.182 : 0.909 :  2 [+2 ]	||||||||||||||||||
+	            12 : 0.091 : 1.000 :  1 [+0 ]	|||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
+	Average        : 5.27272727273 [+0.181818181818]
+	Minimum        : 0 [+0]
+	Maximum        : 11 [+0]
+	Total          : 58.0 [+2.0]
+	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
+	             3 : 0.182 : 0.273 :  2 [+0 ]	||||||||||||||||||
+	             4 : 0.182 : 0.455 :  2 [+0 ]	||||||||||||||||||
+	             5 : 0.182 : 0.636 :  2 [+0 ]	||||||||||||||||||
+	             7 : 0.091 : 0.727 :  1 [-2 ]	|||||||||
+	             8 : 0.182 : 0.909 :  2 [+2 ]	||||||||||||||||||
+	            11 : 0.091 : 1.000 :  1 [+0 ]	|||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.181818181818 [+0.0909090909091]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+1]
+	Total          : 2.0 [+1.0]
+	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.909 : 0.909 : 10 [+0 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.000 : 0.909 :  0 [-1 ]	
+	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.727272727273 [+0.272727272727]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+0]
+	Total          : 8.0 [+3.0]
+	Distribution   : 11 [+0] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.455 : 0.455 :  5 [-2 ]	|||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.364 : 0.818 :  4 [+1 ]	||||||||||||||||||||||||||||||||||||
+	             2 : 0.182 : 1.000 :  2 [+1 ]	||||||||||||||||||
+
+

+ 4 - 4
mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_new_stderr.gold.txt

@@ -1,4 +1,4 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./simple.cpp
-[LOG]: INFO:	Processing: ./simple.cpp [modified]
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./simple.cpp
+[LOG]: INFO:	Processing: ./simple.cpp [modified]
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 200 - 200
mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_new_stdout.gold.txt

@@ -1,200 +1,200 @@
-./simple.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-836
-	Line numbers   : 1-78
-	Modified       : False
-	std.code.lines:code: 0 [+0]
-	std.code.lines:total: 0 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:4: info: Metrics per 'hmm' region
-	Region name    : hmm
-	Region type    : namespace
-	Offsets        : 2-835
-	Line numbers   : 3-77
-	Modified       : True
-	std.code.lines:code: 4 [+0]
-	std.code.lines:total: 7 [+1]
-	std.code.lines:preprocessor: 2 [+1]
-	std.code.lines:comments: 1 [+0]
-
-./simple.cpp:10: info: Metrics per 'A' region
-	Region name    : A
-	Region type    : class
-	Offsets        : 111-831
-	Line numbers   : 10-75
-	Modified       : True
-	std.code.lines:code: 4 [+0]
-	std.code.lines:total: 4 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:13: info: Metrics per 'A' region
-	Region name    : A
-	Region type    : function
-	Offsets        : 123-269
-	Line numbers   : 13-24
-	Modified       : False
-	std.code.complexity:cyclomatic: 3 [+0]
-	std.code.lines:code: 11 [+0]
-	std.code.lines:total: 12 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 2 [+0]
-
-./simple.cpp:26: info: Metrics per 'func' region
-	Region name    : func
-	Region type    : function
-	Offsets        : 272-455
-	Line numbers   : 26-42
-	Modified       : False
-	std.code.complexity:cyclomatic: 1 [+0]
-	std.code.lines:code: 5 [+0]
-	std.code.lines:total: 5 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:28: info: Metrics per 'embeded' region
-	Region name    : embeded
-	Region type    : class
-	Offsets        : 301-441
-	Line numbers   : 28-40
-	Modified       : False
-	std.code.lines:code: 3 [+0]
-	std.code.lines:total: 3 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:30: info: Metrics per 'embeded' region
-	Region name    : embeded
-	Region type    : function
-	Offsets        : 322-437
-	Line numbers   : 30-39
-	Modified       : True
-	std.code.complexity:cyclomatic: 2 [+1]
-	std.code.lines:code: 8 [+1]
-	std.code.lines:total: 9 [+1]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 2 [+1]
-
-./simple.cpp:44: info: Metrics per 'never' region
-	Region name    : never
-	Region type    : function
-	Offsets        : 458-549
-	Line numbers   : 44-51
-	Modified       : True
-	std.code.complexity:cyclomatic: 1 [+0]
-	std.code.lines:code: 7 [+0]
-	std.code.lines:total: 7 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 1 [+1]
-
-./simple.cpp:53: info: Metrics per 'new_func' region
-	Region name    : new_func
-	Region type    : function
-	Offsets        : 552-585
-	Line numbers   : 53-56
-	Modified       : None
-	std.code.complexity:cyclomatic: 0
-	std.code.lines:code: 3
-	std.code.lines:total: 4
-	std.code.lines:preprocessor: 0
-	std.code.lines:comments: 1
-
-./simple.cpp:58: info: Metrics per 'new_func_complex' region
-	Region name    : new_func_complex
-	Region type    : function
-	Offsets        : 588-646
-	Line numbers   : 58-62
-	Modified       : None
-	std.code.complexity:cyclomatic: 1
-	std.code.lines:code: 5
-	std.code.lines:total: 5
-	std.code.lines:preprocessor: 0
-	std.code.lines:comments: 0
-
-./simple.cpp:65: info: Metrics per 'new_func_complex_but_suppressed' region
-	Region name    : new_func_complex_but_suppressed
-	Region type    : function
-	Offsets        : 649-808
-	Line numbers   : 64-72
-	Modified       : None
-	std.code.complexity:cyclomatic: 2
-	std.suppress:count: 1
-	std.suppress:list: [std.code.complexity:cyclomatic]
-	std.code.lines:code: 8
-	std.code.lines:total: 9
-	std.code.lines:preprocessor: 0
-	std.code.lines:comments: 1
-
-./simple.cpp:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.0 [+1.0]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+2]
-	Total          : 3.0 [+3.0]
-	Distribution   : 3 [+3] regions in total (including 1 [+1] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
-	             1 : 0.333 : 0.667 : 1 [+1]	|||||||||||||||||||||||||||||||||
-	             2 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.suppress.file:count' metric
-	Average        : None [+0] (excluding zero metric values)
-	Minimum        : None [+0]
-	Maximum        : None [+0]
-	Total          : 0.0 [+0.0]
-	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-
-./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
-	Average        : 1.0 [+1.0] (excluding zero metric values)
-	Minimum        : 1 [+1]
-	Maximum        : 1 [+1]
-	Total          : 1.0 [+1.0]
-	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 6.0 [+6.0]
-	Minimum        : 4 [+4]
-	Maximum        : 9 [+9]
-	Total          : 18.0 [+18.0]
-	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             4 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
-	             5 : 0.333 : 0.667 : 1 [+1]	|||||||||||||||||||||||||||||||||
-	             9 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.33333333333 [+5.33333333333]
-	Minimum        : 3 [+3]
-	Maximum        : 8 [+8]
-	Total          : 16.0 [+16.0]
-	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             3 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
-	             5 : 0.333 : 0.667 : 1 [+1]	|||||||||||||||||||||||||||||||||
-	             8 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.0 [+0.0]
-	Minimum        : 0 [+0]
-	Maximum        : 0 [+0]
-	Total          : 0.0 [+0.0]
-	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 1.000 : 1.000 : 3 [+3]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.666666666667 [+0.666666666667]
-	Minimum        : 0 [+0]
-	Maximum        : 1 [+1]
-	Total          : 2.0 [+2.0]
-	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
-	             1 : 0.667 : 1.000 : 2 [+2]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-
+./simple.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-836
+	Line numbers   : 1-78
+	Modified       : False
+	std.code.lines:code: 0 [+0]
+	std.code.lines:total: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:4: info: Metrics per 'hmm' region
+	Region name    : hmm
+	Region type    : namespace
+	Offsets        : 2-835
+	Line numbers   : 3-77
+	Modified       : True
+	std.code.lines:code: 4 [+0]
+	std.code.lines:total: 7 [+1]
+	std.code.lines:preprocessor: 2 [+1]
+	std.code.lines:comments: 1 [+0]
+
+./simple.cpp:10: info: Metrics per 'A' region
+	Region name    : A
+	Region type    : class
+	Offsets        : 111-831
+	Line numbers   : 10-75
+	Modified       : True
+	std.code.lines:code: 4 [+0]
+	std.code.lines:total: 4 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:13: info: Metrics per 'A' region
+	Region name    : A
+	Region type    : function
+	Offsets        : 123-269
+	Line numbers   : 13-24
+	Modified       : False
+	std.code.complexity:cyclomatic: 3 [+0]
+	std.code.lines:code: 11 [+0]
+	std.code.lines:total: 12 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 2 [+0]
+
+./simple.cpp:26: info: Metrics per 'func' region
+	Region name    : func
+	Region type    : function
+	Offsets        : 272-455
+	Line numbers   : 26-42
+	Modified       : False
+	std.code.complexity:cyclomatic: 1 [+0]
+	std.code.lines:code: 5 [+0]
+	std.code.lines:total: 5 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:28: info: Metrics per 'embeded' region
+	Region name    : embeded
+	Region type    : class
+	Offsets        : 301-441
+	Line numbers   : 28-40
+	Modified       : False
+	std.code.lines:code: 3 [+0]
+	std.code.lines:total: 3 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:30: info: Metrics per 'embeded' region
+	Region name    : embeded
+	Region type    : function
+	Offsets        : 322-437
+	Line numbers   : 30-39
+	Modified       : True
+	std.code.complexity:cyclomatic: 2 [+1]
+	std.code.lines:code: 8 [+1]
+	std.code.lines:total: 9 [+1]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 2 [+1]
+
+./simple.cpp:44: info: Metrics per 'never' region
+	Region name    : never
+	Region type    : function
+	Offsets        : 458-549
+	Line numbers   : 44-51
+	Modified       : True
+	std.code.complexity:cyclomatic: 1 [+0]
+	std.code.lines:code: 7 [+0]
+	std.code.lines:total: 7 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 1 [+1]
+
+./simple.cpp:53: info: Metrics per 'new_func' region
+	Region name    : new_func
+	Region type    : function
+	Offsets        : 552-585
+	Line numbers   : 53-56
+	Modified       : None
+	std.code.complexity:cyclomatic: 0
+	std.code.lines:code: 3
+	std.code.lines:total: 4
+	std.code.lines:preprocessor: 0
+	std.code.lines:comments: 1
+
+./simple.cpp:58: info: Metrics per 'new_func_complex' region
+	Region name    : new_func_complex
+	Region type    : function
+	Offsets        : 588-646
+	Line numbers   : 58-62
+	Modified       : None
+	std.code.complexity:cyclomatic: 1
+	std.code.lines:code: 5
+	std.code.lines:total: 5
+	std.code.lines:preprocessor: 0
+	std.code.lines:comments: 0
+
+./simple.cpp:65: info: Metrics per 'new_func_complex_but_suppressed' region
+	Region name    : new_func_complex_but_suppressed
+	Region type    : function
+	Offsets        : 649-808
+	Line numbers   : 64-72
+	Modified       : None
+	std.code.complexity:cyclomatic: 2
+	std.suppress:count: 1
+	std.suppress:list: [std.code.complexity:cyclomatic]
+	std.code.lines:code: 8
+	std.code.lines:total: 9
+	std.code.lines:preprocessor: 0
+	std.code.lines:comments: 1
+
+./simple.cpp:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 1.0 [+1.0]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+2]
+	Total          : 3.0 [+3.0]
+	Distribution   : 3 [+3] regions in total (including 1 [+1] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
+	             1 : 0.333 : 0.667 : 1 [+1]	|||||||||||||||||||||||||||||||||
+	             2 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.suppress.file:count' metric
+	Average        : None [+0] (excluding zero metric values)
+	Minimum        : None [+0]
+	Maximum        : None [+0]
+	Total          : 0.0 [+0.0]
+	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+
+./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
+	Average        : 1.0 [+1.0] (excluding zero metric values)
+	Minimum        : 1 [+1]
+	Maximum        : 1 [+1]
+	Total          : 1.0 [+1.0]
+	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
+	Average        : 6.0 [+6.0]
+	Minimum        : 4 [+4]
+	Maximum        : 9 [+9]
+	Total          : 18.0 [+18.0]
+	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             4 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
+	             5 : 0.333 : 0.667 : 1 [+1]	|||||||||||||||||||||||||||||||||
+	             9 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
+	Average        : 5.33333333333 [+5.33333333333]
+	Minimum        : 3 [+3]
+	Maximum        : 8 [+8]
+	Total          : 16.0 [+16.0]
+	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             3 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
+	             5 : 0.333 : 0.667 : 1 [+1]	|||||||||||||||||||||||||||||||||
+	             8 : 0.333 : 1.000 : 1 [+1]	|||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.0 [+0.0]
+	Minimum        : 0 [+0]
+	Maximum        : 0 [+0]
+	Total          : 0.0 [+0.0]
+	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 1.000 : 1.000 : 3 [+3]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.666666666667 [+0.666666666667]
+	Minimum        : 0 [+0]
+	Maximum        : 1 [+1]
+	Total          : 2.0 [+2.0]
+	Distribution   : 3 [+3] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.333 : 0.333 : 1 [+1]	|||||||||||||||||||||||||||||||||
+	             1 : 0.667 : 1.000 : 2 [+2]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+

+ 4 - 4
mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_touched_stderr.gold.txt

@@ -1,4 +1,4 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./simple.cpp
-[LOG]: INFO:	Processing: ./simple.cpp [modified]
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./simple.cpp
+[LOG]: INFO:	Processing: ./simple.cpp [modified]
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 209 - 209
mainline/tests/general/test_basic/test_workflow_view_second_per_file_txt_touched_stdout.gold.txt

@@ -1,209 +1,209 @@
-./simple.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-836
-	Line numbers   : 1-78
-	Modified       : False
-	std.code.lines:code: 0 [+0]
-	std.code.lines:total: 0 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:4: info: Metrics per 'hmm' region
-	Region name    : hmm
-	Region type    : namespace
-	Offsets        : 2-835
-	Line numbers   : 3-77
-	Modified       : True
-	std.code.lines:code: 4 [+0]
-	std.code.lines:total: 7 [+1]
-	std.code.lines:preprocessor: 2 [+1]
-	std.code.lines:comments: 1 [+0]
-
-./simple.cpp:10: info: Metrics per 'A' region
-	Region name    : A
-	Region type    : class
-	Offsets        : 111-831
-	Line numbers   : 10-75
-	Modified       : True
-	std.code.lines:code: 4 [+0]
-	std.code.lines:total: 4 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:13: info: Metrics per 'A' region
-	Region name    : A
-	Region type    : function
-	Offsets        : 123-269
-	Line numbers   : 13-24
-	Modified       : False
-	std.code.complexity:cyclomatic: 3 [+0]
-	std.code.lines:code: 11 [+0]
-	std.code.lines:total: 12 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 2 [+0]
-
-./simple.cpp:26: info: Metrics per 'func' region
-	Region name    : func
-	Region type    : function
-	Offsets        : 272-455
-	Line numbers   : 26-42
-	Modified       : False
-	std.code.complexity:cyclomatic: 1 [+0]
-	std.code.lines:code: 5 [+0]
-	std.code.lines:total: 5 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:28: info: Metrics per 'embeded' region
-	Region name    : embeded
-	Region type    : class
-	Offsets        : 301-441
-	Line numbers   : 28-40
-	Modified       : False
-	std.code.lines:code: 3 [+0]
-	std.code.lines:total: 3 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 0 [+0]
-
-./simple.cpp:30: info: Metrics per 'embeded' region
-	Region name    : embeded
-	Region type    : function
-	Offsets        : 322-437
-	Line numbers   : 30-39
-	Modified       : True
-	std.code.complexity:cyclomatic: 2 [+1]
-	std.code.lines:code: 8 [+1]
-	std.code.lines:total: 9 [+1]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 2 [+1]
-
-./simple.cpp:44: info: Metrics per 'never' region
-	Region name    : never
-	Region type    : function
-	Offsets        : 458-549
-	Line numbers   : 44-51
-	Modified       : True
-	std.code.complexity:cyclomatic: 1 [+0]
-	std.code.lines:code: 7 [+0]
-	std.code.lines:total: 7 [+0]
-	std.code.lines:preprocessor: 0 [+0]
-	std.code.lines:comments: 1 [+1]
-
-./simple.cpp:53: info: Metrics per 'new_func' region
-	Region name    : new_func
-	Region type    : function
-	Offsets        : 552-585
-	Line numbers   : 53-56
-	Modified       : None
-	std.code.complexity:cyclomatic: 0
-	std.code.lines:code: 3
-	std.code.lines:total: 4
-	std.code.lines:preprocessor: 0
-	std.code.lines:comments: 1
-
-./simple.cpp:58: info: Metrics per 'new_func_complex' region
-	Region name    : new_func_complex
-	Region type    : function
-	Offsets        : 588-646
-	Line numbers   : 58-62
-	Modified       : None
-	std.code.complexity:cyclomatic: 1
-	std.code.lines:code: 5
-	std.code.lines:total: 5
-	std.code.lines:preprocessor: 0
-	std.code.lines:comments: 0
-
-./simple.cpp:65: info: Metrics per 'new_func_complex_but_suppressed' region
-	Region name    : new_func_complex_but_suppressed
-	Region type    : function
-	Offsets        : 649-808
-	Line numbers   : 64-72
-	Modified       : None
-	std.code.complexity:cyclomatic: 2
-	std.suppress:count: 1
-	std.suppress:list: [std.code.complexity:cyclomatic]
-	std.code.lines:code: 8
-	std.code.lines:total: 9
-	std.code.lines:preprocessor: 0
-	std.code.lines:comments: 1
-
-./simple.cpp:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.2 [-0.05]
-	Minimum        : 0 [-1]
-	Maximum        : 2 [+0]
-	Total          : 6.0 [+1.0]
-	Distribution   : 5 [+1] regions in total (including 1 [+1] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.200 : 0.200 : 1 [+1]	||||||||||||||||||||
-	             1 : 0.400 : 0.600 : 2 [-1]	||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.400 : 1.000 : 2 [+1]	||||||||||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.suppress.file:count' metric
-	Average        : None [+0] (excluding zero metric values)
-	Minimum        : None [+0]
-	Maximum        : None [+0]
-	Total          : 0.0 [+0.0]
-	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-
-./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
-	Average        : 1.0 [+1.0] (excluding zero metric values)
-	Minimum        : 1 [+1]
-	Maximum        : 1 [+1]
-	Total          : 1.0 [+1.0]
-	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 6.42857142857 [+0.571428571429]
-	Minimum        : 4 [+1]
-	Maximum        : 9 [+1]
-	Total          : 45.0 [+4.0]
-	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             3 : 0.000 : 0.000 : 0 [-1]	
-	             4 : 0.286 : 0.286 : 2 [+1]	|||||||||||||||||||||||||||||
-	             5 : 0.143 : 0.429 : 1 [+0]	||||||||||||||
-	             6 : 0.000 : 0.429 : 0 [-1]	
-	             7 : 0.286 : 0.714 : 2 [+1]	|||||||||||||||||||||||||||||
-	             8 : 0.000 : 0.714 : 0 [-2]	
-	             9 : 0.286 : 1.000 : 2 [+2]	|||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.57142857143 [+0.285714285714]
-	Minimum        : 3 [+0]
-	Maximum        : 8 [+1]
-	Total          : 39.0 [+2.0]
-	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             3 : 0.143 : 0.143 : 1 [+0]	||||||||||||||
-	             4 : 0.286 : 0.429 : 2 [+0]	|||||||||||||||||||||||||||||
-	             5 : 0.143 : 0.571 : 1 [+0]	||||||||||||||
-	             7 : 0.143 : 0.714 : 1 [-2]	||||||||||||||
-	             8 : 0.286 : 1.000 : 2 [+2]	|||||||||||||||||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.285714285714 [+0.142857142857]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+1]
-	Total          : 2.0 [+1.0]
-	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.857 : 0.857 : 6 [+0]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.000 : 0.857 : 0 [-1]	
-	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
-
-./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.857142857143 [+0.428571428571]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+1]
-	Total          : 6.0 [+3.0]
-	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.286 : 0.286 : 2 [-2]	|||||||||||||||||||||||||||||
-	             1 : 0.571 : 0.857 : 4 [+1]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
-
-
+./simple.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-836
+	Line numbers   : 1-78
+	Modified       : False
+	std.code.lines:code: 0 [+0]
+	std.code.lines:total: 0 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:4: info: Metrics per 'hmm' region
+	Region name    : hmm
+	Region type    : namespace
+	Offsets        : 2-835
+	Line numbers   : 3-77
+	Modified       : True
+	std.code.lines:code: 4 [+0]
+	std.code.lines:total: 7 [+1]
+	std.code.lines:preprocessor: 2 [+1]
+	std.code.lines:comments: 1 [+0]
+
+./simple.cpp:10: info: Metrics per 'A' region
+	Region name    : A
+	Region type    : class
+	Offsets        : 111-831
+	Line numbers   : 10-75
+	Modified       : True
+	std.code.lines:code: 4 [+0]
+	std.code.lines:total: 4 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:13: info: Metrics per 'A' region
+	Region name    : A
+	Region type    : function
+	Offsets        : 123-269
+	Line numbers   : 13-24
+	Modified       : False
+	std.code.complexity:cyclomatic: 3 [+0]
+	std.code.lines:code: 11 [+0]
+	std.code.lines:total: 12 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 2 [+0]
+
+./simple.cpp:26: info: Metrics per 'func' region
+	Region name    : func
+	Region type    : function
+	Offsets        : 272-455
+	Line numbers   : 26-42
+	Modified       : False
+	std.code.complexity:cyclomatic: 1 [+0]
+	std.code.lines:code: 5 [+0]
+	std.code.lines:total: 5 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:28: info: Metrics per 'embeded' region
+	Region name    : embeded
+	Region type    : class
+	Offsets        : 301-441
+	Line numbers   : 28-40
+	Modified       : False
+	std.code.lines:code: 3 [+0]
+	std.code.lines:total: 3 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 0 [+0]
+
+./simple.cpp:30: info: Metrics per 'embeded' region
+	Region name    : embeded
+	Region type    : function
+	Offsets        : 322-437
+	Line numbers   : 30-39
+	Modified       : True
+	std.code.complexity:cyclomatic: 2 [+1]
+	std.code.lines:code: 8 [+1]
+	std.code.lines:total: 9 [+1]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 2 [+1]
+
+./simple.cpp:44: info: Metrics per 'never' region
+	Region name    : never
+	Region type    : function
+	Offsets        : 458-549
+	Line numbers   : 44-51
+	Modified       : True
+	std.code.complexity:cyclomatic: 1 [+0]
+	std.code.lines:code: 7 [+0]
+	std.code.lines:total: 7 [+0]
+	std.code.lines:preprocessor: 0 [+0]
+	std.code.lines:comments: 1 [+1]
+
+./simple.cpp:53: info: Metrics per 'new_func' region
+	Region name    : new_func
+	Region type    : function
+	Offsets        : 552-585
+	Line numbers   : 53-56
+	Modified       : None
+	std.code.complexity:cyclomatic: 0
+	std.code.lines:code: 3
+	std.code.lines:total: 4
+	std.code.lines:preprocessor: 0
+	std.code.lines:comments: 1
+
+./simple.cpp:58: info: Metrics per 'new_func_complex' region
+	Region name    : new_func_complex
+	Region type    : function
+	Offsets        : 588-646
+	Line numbers   : 58-62
+	Modified       : None
+	std.code.complexity:cyclomatic: 1
+	std.code.lines:code: 5
+	std.code.lines:total: 5
+	std.code.lines:preprocessor: 0
+	std.code.lines:comments: 0
+
+./simple.cpp:65: info: Metrics per 'new_func_complex_but_suppressed' region
+	Region name    : new_func_complex_but_suppressed
+	Region type    : function
+	Offsets        : 649-808
+	Line numbers   : 64-72
+	Modified       : None
+	std.code.complexity:cyclomatic: 2
+	std.suppress:count: 1
+	std.suppress:list: [std.code.complexity:cyclomatic]
+	std.code.lines:code: 8
+	std.code.lines:total: 9
+	std.code.lines:preprocessor: 0
+	std.code.lines:comments: 1
+
+./simple.cpp:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 1.2 [-0.05]
+	Minimum        : 0 [-1]
+	Maximum        : 2 [+0]
+	Total          : 6.0 [+1.0]
+	Distribution   : 5 [+1] regions in total (including 1 [+1] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.200 : 0.200 : 1 [+1]	||||||||||||||||||||
+	             1 : 0.400 : 0.600 : 2 [-1]	||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.400 : 1.000 : 2 [+1]	||||||||||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.suppress.file:count' metric
+	Average        : None [+0] (excluding zero metric values)
+	Minimum        : None [+0]
+	Maximum        : None [+0]
+	Total          : 0.0 [+0.0]
+	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+
+./simple.cpp:: info: Overall metrics for 'std.suppress:count' metric
+	Average        : 1.0 [+1.0] (excluding zero metric values)
+	Minimum        : 1 [+1]
+	Maximum        : 1 [+1]
+	Total          : 1.0 [+1.0]
+	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:total' metric
+	Average        : 6.42857142857 [+0.571428571429]
+	Minimum        : 4 [+1]
+	Maximum        : 9 [+1]
+	Total          : 45.0 [+4.0]
+	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             3 : 0.000 : 0.000 : 0 [-1]	
+	             4 : 0.286 : 0.286 : 2 [+1]	|||||||||||||||||||||||||||||
+	             5 : 0.143 : 0.429 : 1 [+0]	||||||||||||||
+	             6 : 0.000 : 0.429 : 0 [-1]	
+	             7 : 0.286 : 0.714 : 2 [+1]	|||||||||||||||||||||||||||||
+	             8 : 0.000 : 0.714 : 0 [-2]	
+	             9 : 0.286 : 1.000 : 2 [+2]	|||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:code' metric
+	Average        : 5.57142857143 [+0.285714285714]
+	Minimum        : 3 [+0]
+	Maximum        : 8 [+1]
+	Total          : 39.0 [+2.0]
+	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             3 : 0.143 : 0.143 : 1 [+0]	||||||||||||||
+	             4 : 0.286 : 0.429 : 2 [+0]	|||||||||||||||||||||||||||||
+	             5 : 0.143 : 0.571 : 1 [+0]	||||||||||||||
+	             7 : 0.143 : 0.714 : 1 [-2]	||||||||||||||
+	             8 : 0.286 : 1.000 : 2 [+2]	|||||||||||||||||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.285714285714 [+0.142857142857]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+1]
+	Total          : 2.0 [+1.0]
+	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.857 : 0.857 : 6 [+0]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.000 : 0.857 : 0 [-1]	
+	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
+
+./simple.cpp:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.857142857143 [+0.428571428571]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+1]
+	Total          : 6.0 [+3.0]
+	Distribution   : 7 [+0] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.286 : 0.286 : 2 [-2]	|||||||||||||||||||||||||||||
+	             1 : 0.571 : 0.857 : 4 [+1]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
+
+

+ 3 - 3
mainline/tests/general/test_basic/test_workflow_view_second_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 87 - 87
mainline/tests/general/test_basic/test_workflow_view_second_stdout.gold.txt

@@ -1,87 +1,87 @@
-<view>
-
-    <data>
-        <info path="./" id="1" />
-        <file-data />
-        <subfiles>
-            <subfile>file_deleted_in_new_sources.cpp</subfile>
-            <subfile>simple2.cpp</subfile>
-            <subfile>simple.cpp</subfile>
-        </subfiles>
-        <subdirs>
-        </subdirs>
-        <aggregated-data>
-            <std.code.complexity>
-                <cyclomatic count="8" nonzero="False" total="13.0" min="0" max="3" avg="1.625" sup="1">
-                    <__diff__ count="0" nonzero="0" avg="0.25" min="-1" max="0" total="2.0" sup="1" />
-                    <distribution-bars>
-                        <distribution-bar count="1" __diff__="1" metric="0" ratio="0.125" />
-                        <distribution-bar count="3" __diff__="-3" metric="1" ratio="0.375" />
-                        <distribution-bar count="2" __diff__="1" metric="2" ratio="0.25" />
-                        <distribution-bar count="2" __diff__="1" metric="3" ratio="0.25" />
-                    </distribution-bars>
-                </cyclomatic>
-            </std.code.complexity>
-            <std.suppress.file>
-                <count count="0" nonzero="True" total="0.0" min="None" max="None" avg="None" sup="0">
-                    <__diff__ count="0" nonzero="0" avg="0" min="0" max="0" total="0.0" sup="0" />
-                    <distribution-bars>
-                    </distribution-bars>
-                </count>
-            </std.suppress.file>
-            <std.suppress>
-                <count count="1" nonzero="True" total="1.0" min="1" max="1" avg="1.0" sup="0">
-                    <__diff__ count="1" nonzero="0" avg="1.0" min="1" max="1" total="1.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="1" __diff__="1" metric="1" ratio="1.0" />
-                    </distribution-bars>
-                </count>
-            </std.suppress>
-            <std.code.lines>
-                <total count="15" nonzero="False" total="85.0" min="0" max="12" avg="5.66666666667" sup="0">
-                    <__diff__ count="-1" nonzero="0" avg="0.229166666667" min="0" max="0" total="-2.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="2" __diff__="0" metric="0" ratio="0.133333333333" />
-                        <distribution-bar count="2" __diff__="-1" metric="3" ratio="0.133333333333" />
-                        <distribution-bar count="2" __diff__="1" metric="4" ratio="0.133333333333" />
-                        <distribution-bar count="3" __diff__="1" metric="5" ratio="0.2" />
-                        <distribution-bar count="0" __diff__="-1" metric="6" ratio="0" />
-                        <distribution-bar count="2" __diff__="-1" metric="7" ratio="0.133333333333" />
-                        <distribution-bar count="0" __diff__="-2" metric="8" ratio="0" />
-                        <distribution-bar count="2" __diff__="1" metric="9" ratio="0.133333333333" />
-                        <distribution-bar count="2" __diff__="1" metric="12" ratio="0.133333333333" />
-                    </distribution-bars>
-                </total>
-                <code count="15" nonzero="False" total="75.0" min="0" max="11" avg="5.0" sup="0">
-                    <__diff__ count="-1" nonzero="0" avg="0.125" min="0" max="0" total="-3.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="2" __diff__="0" metric="0" ratio="0.133333333333" />
-                        <distribution-bar count="3" __diff__="0" metric="3" ratio="0.2" />
-                        <distribution-bar count="3" __diff__="0" metric="4" ratio="0.2" />
-                        <distribution-bar count="2" __diff__="0" metric="5" ratio="0.133333333333" />
-                        <distribution-bar count="1" __diff__="-3" metric="7" ratio="0.0666666666667" />
-                        <distribution-bar count="2" __diff__="1" metric="8" ratio="0.133333333333" />
-                        <distribution-bar count="1" __diff__="1" metric="10" ratio="0.0666666666667" />
-                        <distribution-bar count="1" __diff__="0" metric="11" ratio="0.0666666666667" />
-                    </distribution-bars>
-                </code>
-                <preprocessor count="15" nonzero="False" total="2.0" min="0" max="2" avg="0.133333333333" sup="0">
-                    <__diff__ count="-1" nonzero="0" avg="0.0708333333333" min="0" max="1" total="1.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="14" __diff__="-1" metric="0" ratio="0.933333333333" />
-                        <distribution-bar count="0" __diff__="-1" metric="1" ratio="0" />
-                        <distribution-bar count="1" __diff__="1" metric="2" ratio="0.0666666666667" />
-                    </distribution-bars>
-                </preprocessor>
-                <comments count="15" nonzero="False" total="11.0" min="0" max="2" avg="0.733333333333" sup="0">
-                    <__diff__ count="-1" nonzero="0" avg="0.108333333333" min="0" max="-1" total="1.0" sup="0" />
-                    <distribution-bars>
-                        <distribution-bar count="7" __diff__="-3" metric="0" ratio="0.466666666667" />
-                        <distribution-bar count="5" __diff__="2" metric="1" ratio="0.333333333333" />
-                        <distribution-bar count="3" __diff__="1" metric="2" ratio="0.2" />
-                    </distribution-bars>
-                </comments>
-            </std.code.lines>
-        </aggregated-data>
-    </data>
-</view>
+<view>
+
+    <data>
+        <info id="1" path="./" />
+        <file-data />
+        <subfiles>
+            <subfile>file_deleted_in_new_sources.cpp</subfile>
+            <subfile>simple2.cpp</subfile>
+            <subfile>simple.cpp</subfile>
+        </subfiles>
+        <subdirs>
+        </subdirs>
+        <aggregated-data>
+            <std.code.complexity>
+                <cyclomatic avg="1.625" count="8" max="3" min="0" nonzero="False" sup="1" total="13.0">
+                    <__diff__ avg="0.25" count="0" max="0" min="-1" nonzero="0" sup="1" total="2.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="1" count="1" metric="0" ratio="0.125" />
+                        <distribution-bar __diff__="-3" count="3" metric="1" ratio="0.375" />
+                        <distribution-bar __diff__="1" count="2" metric="2" ratio="0.25" />
+                        <distribution-bar __diff__="1" count="2" metric="3" ratio="0.25" />
+                    </distribution-bars>
+                </cyclomatic>
+            </std.code.complexity>
+            <std.suppress.file>
+                <count avg="None" count="0" max="None" min="None" nonzero="True" sup="0" total="0.0">
+                    <__diff__ avg="0" count="0" max="0" min="0" nonzero="0" sup="0" total="0.0" />
+                    <distribution-bars>
+                    </distribution-bars>
+                </count>
+            </std.suppress.file>
+            <std.suppress>
+                <count avg="1.0" count="1" max="1" min="1" nonzero="True" sup="0" total="1.0">
+                    <__diff__ avg="1.0" count="1" max="1" min="1" nonzero="0" sup="0" total="1.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="1" count="1" metric="1" ratio="1.0" />
+                    </distribution-bars>
+                </count>
+            </std.suppress>
+            <std.code.lines>
+                <total avg="5.66666666667" count="15" max="12" min="0" nonzero="False" sup="0" total="85.0">
+                    <__diff__ avg="0.229166666667" count="-1" max="0" min="0" nonzero="0" sup="0" total="-2.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="0" count="2" metric="0" ratio="0.133333333333" />
+                        <distribution-bar __diff__="-1" count="2" metric="3" ratio="0.133333333333" />
+                        <distribution-bar __diff__="1" count="2" metric="4" ratio="0.133333333333" />
+                        <distribution-bar __diff__="1" count="3" metric="5" ratio="0.2" />
+                        <distribution-bar __diff__="-1" count="0" metric="6" ratio="0" />
+                        <distribution-bar __diff__="-1" count="2" metric="7" ratio="0.133333333333" />
+                        <distribution-bar __diff__="-2" count="0" metric="8" ratio="0" />
+                        <distribution-bar __diff__="1" count="2" metric="9" ratio="0.133333333333" />
+                        <distribution-bar __diff__="1" count="2" metric="12" ratio="0.133333333333" />
+                    </distribution-bars>
+                </total>
+                <code avg="5.0" count="15" max="11" min="0" nonzero="False" sup="0" total="75.0">
+                    <__diff__ avg="0.125" count="-1" max="0" min="0" nonzero="0" sup="0" total="-3.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="0" count="2" metric="0" ratio="0.133333333333" />
+                        <distribution-bar __diff__="0" count="3" metric="3" ratio="0.2" />
+                        <distribution-bar __diff__="0" count="3" metric="4" ratio="0.2" />
+                        <distribution-bar __diff__="0" count="2" metric="5" ratio="0.133333333333" />
+                        <distribution-bar __diff__="-3" count="1" metric="7" ratio="0.0666666666667" />
+                        <distribution-bar __diff__="1" count="2" metric="8" ratio="0.133333333333" />
+                        <distribution-bar __diff__="1" count="1" metric="10" ratio="0.0666666666667" />
+                        <distribution-bar __diff__="0" count="1" metric="11" ratio="0.0666666666667" />
+                    </distribution-bars>
+                </code>
+                <preprocessor avg="0.133333333333" count="15" max="2" min="0" nonzero="False" sup="0" total="2.0">
+                    <__diff__ avg="0.0708333333333" count="-1" max="1" min="0" nonzero="0" sup="0" total="1.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="-1" count="14" metric="0" ratio="0.933333333333" />
+                        <distribution-bar __diff__="-1" count="0" metric="1" ratio="0" />
+                        <distribution-bar __diff__="1" count="1" metric="2" ratio="0.0666666666667" />
+                    </distribution-bars>
+                </preprocessor>
+                <comments avg="0.733333333333" count="15" max="2" min="0" nonzero="False" sup="0" total="11.0">
+                    <__diff__ avg="0.108333333333" count="-1" max="-1" min="0" nonzero="0" sup="0" total="1.0" />
+                    <distribution-bars>
+                        <distribution-bar __diff__="-3" count="7" metric="0" ratio="0.466666666667" />
+                        <distribution-bar __diff__="2" count="5" metric="1" ratio="0.333333333333" />
+                        <distribution-bar __diff__="1" count="3" metric="2" ratio="0.2" />
+                    </distribution-bars>
+                </comments>
+            </std.code.lines>
+        </aggregated-data>
+    </data>
+</view>

+ 3 - 3
mainline/tests/general/test_basic/test_workflow_view_second_txt_all_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 90 - 90
mainline/tests/general/test_basic/test_workflow_view_second_txt_all_stdout.gold.txt

@@ -1,90 +1,90 @@
-./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.625 [+0.25]
-	Minimum        : 0 [-1]
-	Maximum        : 3 [+0]
-	Total          : 13.0 [+2.0]
-	Distribution   : 8 [+0] regions in total (including 1 [+1] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.125 : 0.125 : 1 [+1]	|||||||||||||
-	             1 : 0.375 : 0.500 : 3 [-3]	||||||||||||||||||||||||||||||||||||||
-	             2 : 0.250 : 0.750 : 2 [+1]	|||||||||||||||||||||||||
-	             3 : 0.250 : 1.000 : 2 [+1]	|||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.suppress.file:count' metric
-	Average        : None [+0] (excluding zero metric values)
-	Minimum        : None [+0]
-	Maximum        : None [+0]
-	Total          : 0.0 [+0.0]
-	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-
-./:: info: Overall metrics for 'std.suppress:count' metric
-	Average        : 1.0 [+1.0] (excluding zero metric values)
-	Minimum        : 1 [+1]
-	Maximum        : 1 [+1]
-	Total          : 1.0 [+1.0]
-	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.66666666667 [+0.229166666667]
-	Minimum        : 0 [+0]
-	Maximum        : 12 [+0]
-	Total          : 85.0 [-2.0]
-	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.133 : 0.133 :  2 [+0 ]	|||||||||||||
-	             3 : 0.133 : 0.267 :  2 [-1 ]	|||||||||||||
-	             4 : 0.133 : 0.400 :  2 [+1 ]	|||||||||||||
-	             5 : 0.200 : 0.600 :  3 [+1 ]	||||||||||||||||||||
-	             6 : 0.000 : 0.600 :  0 [-1 ]	
-	             7 : 0.133 : 0.733 :  2 [-1 ]	|||||||||||||
-	             8 : 0.000 : 0.733 :  0 [-2 ]	
-	             9 : 0.133 : 0.867 :  2 [+1 ]	|||||||||||||
-	            12 : 0.133 : 1.000 :  2 [+1 ]	|||||||||||||
-
-./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.0 [+0.125]
-	Minimum        : 0 [+0]
-	Maximum        : 11 [+0]
-	Total          : 75.0 [-3.0]
-	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.133 : 0.133 :  2 [+0 ]	|||||||||||||
-	             3 : 0.200 : 0.333 :  3 [+0 ]	||||||||||||||||||||
-	             4 : 0.200 : 0.533 :  3 [+0 ]	||||||||||||||||||||
-	             5 : 0.133 : 0.667 :  2 [+0 ]	|||||||||||||
-	             7 : 0.067 : 0.733 :  1 [-3 ]	|||||||
-	             8 : 0.133 : 0.867 :  2 [+1 ]	|||||||||||||
-	            10 : 0.067 : 0.933 :  1 [+1 ]	|||||||
-	            11 : 0.067 : 1.000 :  1 [+0 ]	|||||||
-
-./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.133333333333 [+0.0708333333333]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+1]
-	Total          : 2.0 [+1.0]
-	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.933 : 0.933 : 14 [-1 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.000 : 0.933 :  0 [-1 ]	
-	             2 : 0.067 : 1.000 :  1 [+1 ]	|||||||
-
-./:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.733333333333 [+0.108333333333]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [-1]
-	Total          : 11.0 [+1.0]
-	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.467 : 0.467 :  7 [-3 ]	|||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.333 : 0.800 :  5 [+2 ]	|||||||||||||||||||||||||||||||||
-	             2 : 0.200 : 1.000 :  3 [+1 ]	||||||||||||||||||||
-
-./:: info: Directory content:
-	File           : file_deleted_in_new_sources.cpp
-	File           : simple2.cpp
-	File           : simple.cpp
-
-
+./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 1.625 [+0.25]
+	Minimum        : 0 [-1]
+	Maximum        : 3 [+0]
+	Total          : 13.0 [+2.0]
+	Distribution   : 8 [+0] regions in total (including 1 [+1] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.125 : 0.125 : 1 [+1]	|||||||||||||
+	             1 : 0.375 : 0.500 : 3 [-3]	||||||||||||||||||||||||||||||||||||||
+	             2 : 0.250 : 0.750 : 2 [+1]	|||||||||||||||||||||||||
+	             3 : 0.250 : 1.000 : 2 [+1]	|||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.suppress.file:count' metric
+	Average        : None [+0] (excluding zero metric values)
+	Minimum        : None [+0]
+	Maximum        : None [+0]
+	Total          : 0.0 [+0.0]
+	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+
+./:: info: Overall metrics for 'std.suppress:count' metric
+	Average        : 1.0 [+1.0] (excluding zero metric values)
+	Minimum        : 1 [+1]
+	Maximum        : 1 [+1]
+	Total          : 1.0 [+1.0]
+	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.code.lines:total' metric
+	Average        : 5.66666666667 [+0.229166666667]
+	Minimum        : 0 [+0]
+	Maximum        : 12 [+0]
+	Total          : 85.0 [-2.0]
+	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.133 : 0.133 :  2 [+0 ]	|||||||||||||
+	             3 : 0.133 : 0.267 :  2 [-1 ]	|||||||||||||
+	             4 : 0.133 : 0.400 :  2 [+1 ]	|||||||||||||
+	             5 : 0.200 : 0.600 :  3 [+1 ]	||||||||||||||||||||
+	             6 : 0.000 : 0.600 :  0 [-1 ]	
+	             7 : 0.133 : 0.733 :  2 [-1 ]	|||||||||||||
+	             8 : 0.000 : 0.733 :  0 [-2 ]	
+	             9 : 0.133 : 0.867 :  2 [+1 ]	|||||||||||||
+	            12 : 0.133 : 1.000 :  2 [+1 ]	|||||||||||||
+
+./:: info: Overall metrics for 'std.code.lines:code' metric
+	Average        : 5.0 [+0.125]
+	Minimum        : 0 [+0]
+	Maximum        : 11 [+0]
+	Total          : 75.0 [-3.0]
+	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.133 : 0.133 :  2 [+0 ]	|||||||||||||
+	             3 : 0.200 : 0.333 :  3 [+0 ]	||||||||||||||||||||
+	             4 : 0.200 : 0.533 :  3 [+0 ]	||||||||||||||||||||
+	             5 : 0.133 : 0.667 :  2 [+0 ]	|||||||||||||
+	             7 : 0.067 : 0.733 :  1 [-3 ]	|||||||
+	             8 : 0.133 : 0.867 :  2 [+1 ]	|||||||||||||
+	            10 : 0.067 : 0.933 :  1 [+1 ]	|||||||
+	            11 : 0.067 : 1.000 :  1 [+0 ]	|||||||
+
+./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.133333333333 [+0.0708333333333]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+1]
+	Total          : 2.0 [+1.0]
+	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.933 : 0.933 : 14 [-1 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.000 : 0.933 :  0 [-1 ]	
+	             2 : 0.067 : 1.000 :  1 [+1 ]	|||||||
+
+./:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.733333333333 [+0.108333333333]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [-1]
+	Total          : 11.0 [+1.0]
+	Distribution   : 15 [-1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.467 : 0.467 :  7 [-3 ]	|||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.333 : 0.800 :  5 [+2 ]	|||||||||||||||||||||||||||||||||
+	             2 : 0.200 : 1.000 :  3 [+1 ]	||||||||||||||||||||
+
+./:: info: Directory content:
+	File           : file_deleted_in_new_sources.cpp
+	File           : simple2.cpp
+	File           : simple.cpp
+
+

+ 5 - 5
mainline/tests/general/test_basic/test_workflow_view_second_txt_new_stderr.gold.txt

@@ -1,5 +1,5 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: INFO:	Processing: ./simple.cpp [modified]
-[LOG]: INFO:	Processing: ./simple2.cpp [new]
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: INFO:	Processing: ./simple.cpp [modified]
+[LOG]: INFO:	Processing: ./simple2.cpp [new]
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 83 - 83
mainline/tests/general/test_basic/test_workflow_view_second_txt_new_stdout.gold.txt

@@ -1,83 +1,83 @@
-./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.5 [+1.5]
-	Minimum        : 0 [+0]
-	Maximum        : 3 [+3]
-	Total          : 6.0 [+6.0]
-	Distribution   : 4 [+4] regions in total (including 1 [+1] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.250 : 0.250 : 1 [+1]	|||||||||||||||||||||||||
-	             1 : 0.250 : 0.500 : 1 [+1]	|||||||||||||||||||||||||
-	             2 : 0.250 : 0.750 : 1 [+1]	|||||||||||||||||||||||||
-	             3 : 0.250 : 1.000 : 1 [+1]	|||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.suppress.file:count' metric
-	Average        : None [+0] (excluding zero metric values)
-	Minimum        : None [+0]
-	Maximum        : None [+0]
-	Total          : 0.0 [+0.0]
-	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-
-./:: info: Overall metrics for 'std.suppress:count' metric
-	Average        : 1.0 [+1.0] (excluding zero metric values)
-	Minimum        : 1 [+1]
-	Maximum        : 1 [+1]
-	Total          : 1.0 [+1.0]
-	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.42857142857 [+5.42857142857]
-	Minimum        : 0 [+0]
-	Maximum        : 12 [+12]
-	Total          : 38.0 [+38.0]
-	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.143 : 0.143 : 1 [+1]	||||||||||||||
-	             3 : 0.143 : 0.286 : 1 [+1]	||||||||||||||
-	             4 : 0.143 : 0.429 : 1 [+1]	||||||||||||||
-	             5 : 0.286 : 0.714 : 2 [+2]	|||||||||||||||||||||||||||||
-	             9 : 0.143 : 0.857 : 1 [+1]	||||||||||||||
-	            12 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
-
-./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 4.71428571429 [+4.71428571429]
-	Minimum        : 0 [+0]
-	Maximum        : 10 [+10]
-	Total          : 33.0 [+33.0]
-	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.143 : 0.143 : 1 [+1]	||||||||||||||
-	             3 : 0.286 : 0.429 : 2 [+2]	|||||||||||||||||||||||||||||
-	             4 : 0.143 : 0.571 : 1 [+1]	||||||||||||||
-	             5 : 0.143 : 0.714 : 1 [+1]	||||||||||||||
-	             8 : 0.143 : 0.857 : 1 [+1]	||||||||||||||
-	            10 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
-
-./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.0 [+0.0]
-	Minimum        : 0 [+0]
-	Maximum        : 0 [+0]
-	Total          : 0.0 [+0.0]
-	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 1.000 : 1.000 : 7 [+7]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.714285714286 [+0.714285714286]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+2]
-	Total          : 5.0 [+5.0]
-	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.429 : 0.429 : 3 [+3]	|||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.429 : 0.857 : 3 [+3]	|||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
-
-./:: info: Directory content:
-	File           : file_deleted_in_new_sources.cpp
-	File           : simple2.cpp
-	File           : simple.cpp
-
-
+./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 1.5 [+1.5]
+	Minimum        : 0 [+0]
+	Maximum        : 3 [+3]
+	Total          : 6.0 [+6.0]
+	Distribution   : 4 [+4] regions in total (including 1 [+1] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.250 : 0.250 : 1 [+1]	|||||||||||||||||||||||||
+	             1 : 0.250 : 0.500 : 1 [+1]	|||||||||||||||||||||||||
+	             2 : 0.250 : 0.750 : 1 [+1]	|||||||||||||||||||||||||
+	             3 : 0.250 : 1.000 : 1 [+1]	|||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.suppress.file:count' metric
+	Average        : None [+0] (excluding zero metric values)
+	Minimum        : None [+0]
+	Maximum        : None [+0]
+	Total          : 0.0 [+0.0]
+	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+
+./:: info: Overall metrics for 'std.suppress:count' metric
+	Average        : 1.0 [+1.0] (excluding zero metric values)
+	Minimum        : 1 [+1]
+	Maximum        : 1 [+1]
+	Total          : 1.0 [+1.0]
+	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.code.lines:total' metric
+	Average        : 5.42857142857 [+5.42857142857]
+	Minimum        : 0 [+0]
+	Maximum        : 12 [+12]
+	Total          : 38.0 [+38.0]
+	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.143 : 0.143 : 1 [+1]	||||||||||||||
+	             3 : 0.143 : 0.286 : 1 [+1]	||||||||||||||
+	             4 : 0.143 : 0.429 : 1 [+1]	||||||||||||||
+	             5 : 0.286 : 0.714 : 2 [+2]	|||||||||||||||||||||||||||||
+	             9 : 0.143 : 0.857 : 1 [+1]	||||||||||||||
+	            12 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
+
+./:: info: Overall metrics for 'std.code.lines:code' metric
+	Average        : 4.71428571429 [+4.71428571429]
+	Minimum        : 0 [+0]
+	Maximum        : 10 [+10]
+	Total          : 33.0 [+33.0]
+	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.143 : 0.143 : 1 [+1]	||||||||||||||
+	             3 : 0.286 : 0.429 : 2 [+2]	|||||||||||||||||||||||||||||
+	             4 : 0.143 : 0.571 : 1 [+1]	||||||||||||||
+	             5 : 0.143 : 0.714 : 1 [+1]	||||||||||||||
+	             8 : 0.143 : 0.857 : 1 [+1]	||||||||||||||
+	            10 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
+
+./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.0 [+0.0]
+	Minimum        : 0 [+0]
+	Maximum        : 0 [+0]
+	Total          : 0.0 [+0.0]
+	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 1.000 : 1.000 : 7 [+7]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.714285714286 [+0.714285714286]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+2]
+	Total          : 5.0 [+5.0]
+	Distribution   : 7 [+7] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.429 : 0.429 : 3 [+3]	|||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.429 : 0.857 : 3 [+3]	|||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.143 : 1.000 : 1 [+1]	||||||||||||||
+
+./:: info: Directory content:
+	File           : file_deleted_in_new_sources.cpp
+	File           : simple2.cpp
+	File           : simple.cpp
+
+

+ 6 - 6
mainline/tests/general/test_basic/test_workflow_view_second_txt_touched_stderr.gold.txt

@@ -1,6 +1,6 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./
-[LOG]: INFO:	Processing: ./simple.cpp [modified]
-[LOG]: INFO:	Processing: ./simple2.cpp [new]
-[LOG]: INFO:	Processing: ./file_deleted_in_new_sources.cpp [deleted]
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./
+[LOG]: INFO:	Processing: ./simple.cpp [modified]
+[LOG]: INFO:	Processing: ./simple2.cpp [new]
+[LOG]: INFO:	Processing: ./file_deleted_in_new_sources.cpp [deleted]
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 89 - 89
mainline/tests/general/test_basic/test_workflow_view_second_txt_touched_stdout.gold.txt

@@ -1,89 +1,89 @@
-./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 1.5 [+0.333333333333]
-	Minimum        : 0 [-1]
-	Maximum        : 3 [+1]
-	Total          : 9.0 [+2.0]
-	Distribution   : 6 [+0] regions in total (including 1 [+1] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.167 : 0.167 : 1 [+1]	|||||||||||||||||
-	             1 : 0.333 : 0.500 : 2 [-3]	|||||||||||||||||||||||||||||||||
-	             2 : 0.333 : 0.833 : 2 [+1]	|||||||||||||||||||||||||||||||||
-	             3 : 0.167 : 1.000 : 1 [+1]	|||||||||||||||||
-
-./:: info: Overall metrics for 'std.suppress.file:count' metric
-	Average        : None [+0] (excluding zero metric values)
-	Minimum        : None [+0]
-	Maximum        : None [+0]
-	Total          : 0.0 [+0.0]
-	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-
-./:: info: Overall metrics for 'std.suppress:count' metric
-	Average        : 1.0 [+1.0] (excluding zero metric values)
-	Minimum        : 1 [+1]
-	Maximum        : 1 [+1]
-	Total          : 1.0 [+1.0]
-	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.code.lines:total' metric
-	Average        : 5.90909090909 [+0.325757575758]
-	Minimum        : 0 [+0]
-	Maximum        : 12 [+3]
-	Total          : 65.0 [-2.0]
-	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
-	             3 : 0.091 : 0.182 :  1 [-1 ]	|||||||||
-	             4 : 0.182 : 0.364 :  2 [+1 ]	||||||||||||||||||
-	             5 : 0.182 : 0.545 :  2 [+1 ]	||||||||||||||||||
-	             6 : 0.000 : 0.545 :  0 [-1 ]	
-	             7 : 0.182 : 0.727 :  2 [-1 ]	||||||||||||||||||
-	             8 : 0.000 : 0.727 :  0 [-2 ]	
-	             9 : 0.182 : 0.909 :  2 [+1 ]	||||||||||||||||||
-	            12 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
-
-./:: info: Overall metrics for 'std.code.lines:code' metric
-	Average        : 5.09090909091 [+0.174242424242]
-	Minimum        : 0 [+0]
-	Maximum        : 10 [+2]
-	Total          : 56.0 [-3.0]
-	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
-	             3 : 0.182 : 0.273 :  2 [+0 ]	||||||||||||||||||
-	             4 : 0.273 : 0.545 :  3 [+0 ]	|||||||||||||||||||||||||||
-	             5 : 0.091 : 0.636 :  1 [+0 ]	|||||||||
-	             7 : 0.091 : 0.727 :  1 [-3 ]	|||||||||
-	             8 : 0.182 : 0.909 :  2 [+1 ]	||||||||||||||||||
-	            10 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
-
-./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
-	Average        : 0.181818181818 [+0.0984848484848]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [+1]
-	Total          : 2.0 [+1.0]
-	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.909 : 0.909 : 10 [-1 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.000 : 0.909 :  0 [-1 ]	
-	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
-
-./:: info: Overall metrics for 'std.code.lines:comments' metric
-	Average        : 0.818181818182 [+0.151515151515]
-	Minimum        : 0 [+0]
-	Maximum        : 2 [-1]
-	Total          : 9.0 [+1.0]
-	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.364 : 0.364 :  4 [-3 ]	||||||||||||||||||||||||||||||||||||
-	             1 : 0.455 : 0.818 :  5 [+2 ]	|||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.182 : 1.000 :  2 [+1 ]	||||||||||||||||||
-
-./:: info: Directory content:
-	File           : file_deleted_in_new_sources.cpp
-	File           : simple2.cpp
-	File           : simple.cpp
-
-
+./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 1.5 [+0.333333333333]
+	Minimum        : 0 [-1]
+	Maximum        : 3 [+1]
+	Total          : 9.0 [+2.0]
+	Distribution   : 6 [+0] regions in total (including 1 [+1] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.167 : 0.167 : 1 [+1]	|||||||||||||||||
+	             1 : 0.333 : 0.500 : 2 [-3]	|||||||||||||||||||||||||||||||||
+	             2 : 0.333 : 0.833 : 2 [+1]	|||||||||||||||||||||||||||||||||
+	             3 : 0.167 : 1.000 : 1 [+1]	|||||||||||||||||
+
+./:: info: Overall metrics for 'std.suppress.file:count' metric
+	Average        : None [+0] (excluding zero metric values)
+	Minimum        : None [+0]
+	Maximum        : None [+0]
+	Total          : 0.0 [+0.0]
+	Distribution   : 0 [+0] files in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+
+./:: info: Overall metrics for 'std.suppress:count' metric
+	Average        : 1.0 [+1.0] (excluding zero metric values)
+	Minimum        : 1 [+1]
+	Maximum        : 1 [+1]
+	Total          : 1.0 [+1.0]
+	Distribution   : 1 [+1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 1 [+1]	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.code.lines:total' metric
+	Average        : 5.90909090909 [+0.325757575758]
+	Minimum        : 0 [+0]
+	Maximum        : 12 [+3]
+	Total          : 65.0 [-2.0]
+	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
+	             3 : 0.091 : 0.182 :  1 [-1 ]	|||||||||
+	             4 : 0.182 : 0.364 :  2 [+1 ]	||||||||||||||||||
+	             5 : 0.182 : 0.545 :  2 [+1 ]	||||||||||||||||||
+	             6 : 0.000 : 0.545 :  0 [-1 ]	
+	             7 : 0.182 : 0.727 :  2 [-1 ]	||||||||||||||||||
+	             8 : 0.000 : 0.727 :  0 [-2 ]	
+	             9 : 0.182 : 0.909 :  2 [+1 ]	||||||||||||||||||
+	            12 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
+
+./:: info: Overall metrics for 'std.code.lines:code' metric
+	Average        : 5.09090909091 [+0.174242424242]
+	Minimum        : 0 [+0]
+	Maximum        : 10 [+2]
+	Total          : 56.0 [-3.0]
+	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.091 : 0.091 :  1 [+0 ]	|||||||||
+	             3 : 0.182 : 0.273 :  2 [+0 ]	||||||||||||||||||
+	             4 : 0.273 : 0.545 :  3 [+0 ]	|||||||||||||||||||||||||||
+	             5 : 0.091 : 0.636 :  1 [+0 ]	|||||||||
+	             7 : 0.091 : 0.727 :  1 [-3 ]	|||||||||
+	             8 : 0.182 : 0.909 :  2 [+1 ]	||||||||||||||||||
+	            10 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
+
+./:: info: Overall metrics for 'std.code.lines:preprocessor' metric
+	Average        : 0.181818181818 [+0.0984848484848]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [+1]
+	Total          : 2.0 [+1.0]
+	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.909 : 0.909 : 10 [-1 ]	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.000 : 0.909 :  0 [-1 ]	
+	             2 : 0.091 : 1.000 :  1 [+1 ]	|||||||||
+
+./:: info: Overall metrics for 'std.code.lines:comments' metric
+	Average        : 0.818181818182 [+0.151515151515]
+	Minimum        : 0 [+0]
+	Maximum        : 2 [-1]
+	Total          : 9.0 [+1.0]
+	Distribution   : 11 [-1] regions in total (including 0 [+0] suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.364 : 0.364 :  4 [-3 ]	||||||||||||||||||||||||||||||||||||
+	             1 : 0.455 : 0.818 :  5 [+2 ]	|||||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.182 : 1.000 :  2 [+1 ]	||||||||||||||||||
+
+./:: info: Directory content:
+	File           : file_deleted_in_new_sources.cpp
+	File           : simple2.cpp
+	File           : simple.cpp
+
+

+ 6 - 6
mainline/tests/general/test_std_code_cpp/test_parser_collect_default_stdout.gold.txt

@@ -1,6 +1,6 @@
-./test3.cpp:68: warning: Non-matching closing bracket '}' detected.
-
-./test3.cpp:88: warning: Non-matching closing bracket '}' detected.
-
-./test3.cpp:110: warning: Non-matching opening bracket '{' detected.
-
+./test3.cpp:68: warning: Non-matching closing bracket '}' detected.
+
+./test3.cpp:88: warning: Non-matching closing bracket '}' detected.
+
+./test3.cpp:110: warning: Non-matching opening bracket '{' detected.
+

+ 108 - 108
mainline/tests/general/test_std_code_cpp/test_parser_limit_default_stdout.gold.txt

@@ -1,108 +1,108 @@
-./operator_test.hpp:6: warning: Metric 'std.code.complexity:cyclomatic' for region 'policy_mcr' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : policy_mcr
-	Metric value   : 2
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./operator_test.hpp:71: warning: Metric 'std.code.complexity:cyclomatic' for region 'operator &&' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : operator &&
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./operator_test.hpp:72: warning: Metric 'std.code.complexity:cyclomatic' for region 'operator ||' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : operator ||
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:147: warning: Metric 'std.code.complexity:cyclomatic' for region 'uppercase' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : uppercase
-	Metric value   : 2
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:216: warning: Metric 'std.code.complexity:cyclomatic' for region 'reset' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : reset
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:296: warning: Metric 'std.code.complexity:cyclomatic' for region 'save' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : save
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:332: warning: Metric 'std.code.complexity:cyclomatic' for region 'main' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : main
-	Metric value   : 2
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test2.cpp:7: warning: Metric 'std.code.complexity:cyclomatic' for region 'A' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : A
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test2.cpp:23: warning: Metric 'std.code.complexity:cyclomatic' for region 'main' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : main
-	Metric value   : 2
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test3.cpp:39: warning: Metric 'std.code.complexity:cyclomatic' for region 'doColor' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : doColor
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test3.cpp:53: warning: Metric 'std.code.complexity:cyclomatic' for region 'doFont' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : doFont
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test3.cpp:72: warning: Metric 'std.code.complexity:cyclomatic' for region 'doFont222' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : doFont222
-	Metric value   : 2
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./operator_test.hpp:6: warning: Metric 'std.code.complexity:cyclomatic' for region 'policy_mcr' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : policy_mcr
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./operator_test.hpp:71: warning: Metric 'std.code.complexity:cyclomatic' for region 'operator &&' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : operator &&
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./operator_test.hpp:72: warning: Metric 'std.code.complexity:cyclomatic' for region 'operator ||' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : operator ||
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:147: warning: Metric 'std.code.complexity:cyclomatic' for region 'uppercase' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : uppercase
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:216: warning: Metric 'std.code.complexity:cyclomatic' for region 'reset' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : reset
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:296: warning: Metric 'std.code.complexity:cyclomatic' for region 'save' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : save
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:332: warning: Metric 'std.code.complexity:cyclomatic' for region 'main' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : main
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test2.cpp:7: warning: Metric 'std.code.complexity:cyclomatic' for region 'A' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : A
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test2.cpp:23: warning: Metric 'std.code.complexity:cyclomatic' for region 'main' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : main
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test3.cpp:39: warning: Metric 'std.code.complexity:cyclomatic' for region 'doColor' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : doColor
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test3.cpp:53: warning: Metric 'std.code.complexity:cyclomatic' for region 'doFont' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : doFont
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test3.cpp:72: warning: Metric 'std.code.complexity:cyclomatic' for region 'doFont222' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : doFont222
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 27 - 27
mainline/tests/general/test_std_code_cpp/test_parser_view_default_stdout.gold.txt

@@ -1,27 +1,27 @@
-<view>
-
-    <data>
-        <info path="./" id="1" />
-        <file-data />
-        <subfiles>
-            <subfile>operator_test.hpp</subfile>
-            <subfile>function_ends_on_class.cpp</subfile>
-            <subfile>test.c</subfile>
-            <subfile>test2.cpp</subfile>
-            <subfile>test3.cpp</subfile>
-        </subfiles>
-        <subdirs>
-        </subdirs>
-        <aggregated-data>
-            <std.code.complexity>
-                <cyclomatic count="86" nonzero="False" total="17.0" min="0" max="2" avg="0.197674418605" sup="0">
-                    <distribution-bars>
-                        <distribution-bar count="74" metric="0" ratio="0.860465116279" />
-                        <distribution-bar count="7" metric="1" ratio="0.0813953488372" />
-                        <distribution-bar count="5" metric="2" ratio="0.0581395348837" />
-                    </distribution-bars>
-                </cyclomatic>
-            </std.code.complexity>
-        </aggregated-data>
-    </data>
-</view>
+<view>
+
+    <data>
+        <info id="1" path="./" />
+        <file-data />
+        <subfiles>
+            <subfile>operator_test.hpp</subfile>
+            <subfile>function_ends_on_class.cpp</subfile>
+            <subfile>test.c</subfile>
+            <subfile>test2.cpp</subfile>
+            <subfile>test3.cpp</subfile>
+        </subfiles>
+        <subdirs>
+        </subdirs>
+        <aggregated-data>
+            <std.code.complexity>
+                <cyclomatic avg="0.197674418605" count="86" max="2" min="0" nonzero="False" sup="0" total="17.0">
+                    <distribution-bars>
+                        <distribution-bar count="74" metric="0" ratio="0.860465116279" />
+                        <distribution-bar count="7" metric="1" ratio="0.0813953488372" />
+                        <distribution-bar count="5" metric="2" ratio="0.0581395348837" />
+                    </distribution-bars>
+                </cyclomatic>
+            </std.code.complexity>
+        </aggregated-data>
+    </data>
+</view>

Різницю між файлами не показано, бо вона завелика
+ 889 - 889
mainline/tests/general/test_std_code_cpp/test_parser_view_files_stdout.gold.txt


+ 144 - 144
mainline/tests/general/test_std_code_cs/test_parser_limit_default_stdout.gold.txt

@@ -1,144 +1,144 @@
-./File.cs:74: warning: Metric 'std.code.complexity:cyclomatic' for region 'get' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : get
-	Metric value   : 3
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:95: warning: Metric 'std.code.complexity:cyclomatic' for region 'get' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : get
-	Metric value   : 2
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:120: warning: Metric 'std.code.complexity:cyclomatic' for region 'get' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : get
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:134: warning: Metric 'std.code.complexity:cyclomatic' for region 'get' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : get
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:148: warning: Metric 'std.code.complexity:cyclomatic' for region 'get' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : get
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:160: warning: Metric 'std.code.complexity:cyclomatic' for region 'Close' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : Close
-	Metric value   : 4
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:190: warning: Metric 'std.code.complexity:cyclomatic' for region 'SetRecord' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : SetRecord
-	Metric value   : 6
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:245: warning: Metric 'std.code.complexity:cyclomatic' for region 'GetFile' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : GetFile
-	Metric value   : 5
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:277: warning: Metric 'std.code.complexity:cyclomatic' for region 'GetFile' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : GetFile
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:288: warning: Metric 'std.code.complexity:cyclomatic' for region 'AllocateFile' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : AllocateFile
-	Metric value   : 5
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:327: warning: Metric 'std.code.complexity:cyclomatic' for region 'FindFreeFile' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : FindFreeFile
-	Metric value   : 5
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:361: warning: Metric 'std.code.complexity:cyclomatic' for region 'CloseAll' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : CloseAll
-	Metric value   : 4
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./File.cs:426: warning: Metric 'std.code.complexity:cyclomatic' for region 'Unlock' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : Unlock
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./Generics.cs:50: warning: Metric 'std.code.complexity:cyclomatic' for region 'Grow' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : Grow
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./interface.cs:135: warning: Metric 'std.code.complexity:cyclomatic' for region 'Equals' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : Equals
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./interface.cs:169: warning: Metric 'std.code.complexity:cyclomatic' for region 'ToTitleCase' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : ToTitleCase
-	Metric value   : 4
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./File.cs:74: warning: Metric 'std.code.complexity:cyclomatic' for region 'get' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : get
+	Metric value   : 3
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:95: warning: Metric 'std.code.complexity:cyclomatic' for region 'get' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : get
+	Metric value   : 2
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:120: warning: Metric 'std.code.complexity:cyclomatic' for region 'get' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : get
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:134: warning: Metric 'std.code.complexity:cyclomatic' for region 'get' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : get
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:148: warning: Metric 'std.code.complexity:cyclomatic' for region 'get' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : get
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:160: warning: Metric 'std.code.complexity:cyclomatic' for region 'Close' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : Close
+	Metric value   : 4
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:190: warning: Metric 'std.code.complexity:cyclomatic' for region 'SetRecord' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : SetRecord
+	Metric value   : 6
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:245: warning: Metric 'std.code.complexity:cyclomatic' for region 'GetFile' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : GetFile
+	Metric value   : 5
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:277: warning: Metric 'std.code.complexity:cyclomatic' for region 'GetFile' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : GetFile
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:288: warning: Metric 'std.code.complexity:cyclomatic' for region 'AllocateFile' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : AllocateFile
+	Metric value   : 5
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:327: warning: Metric 'std.code.complexity:cyclomatic' for region 'FindFreeFile' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : FindFreeFile
+	Metric value   : 5
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:361: warning: Metric 'std.code.complexity:cyclomatic' for region 'CloseAll' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : CloseAll
+	Metric value   : 4
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./File.cs:426: warning: Metric 'std.code.complexity:cyclomatic' for region 'Unlock' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : Unlock
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./Generics.cs:50: warning: Metric 'std.code.complexity:cyclomatic' for region 'Grow' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : Grow
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./interface.cs:135: warning: Metric 'std.code.complexity:cyclomatic' for region 'Equals' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : Equals
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./interface.cs:169: warning: Metric 'std.code.complexity:cyclomatic' for region 'ToTitleCase' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : ToTitleCase
+	Metric value   : 4
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 29 - 29
mainline/tests/general/test_std_code_cs/test_parser_view_default_stdout.gold.txt

@@ -1,29 +1,29 @@
-<view>
-
-    <data>
-        <info path="./" id="1" />
-        <file-data />
-        <subfiles>
-            <subfile>interface.cs</subfile>
-            <subfile>File.cs</subfile>
-            <subfile>Generics.cs</subfile>
-        </subfiles>
-        <subdirs>
-        </subdirs>
-        <aggregated-data>
-            <std.code.complexity>
-                <cyclomatic count="39" nonzero="False" total="45.0" min="0" max="6" avg="1.15384615385" sup="0">
-                    <distribution-bars>
-                        <distribution-bar count="23" metric="0" ratio="0.589743589744" />
-                        <distribution-bar count="7" metric="1" ratio="0.179487179487" />
-                        <distribution-bar count="1" metric="2" ratio="0.025641025641" />
-                        <distribution-bar count="1" metric="3" ratio="0.025641025641" />
-                        <distribution-bar count="3" metric="4" ratio="0.0769230769231" />
-                        <distribution-bar count="3" metric="5" ratio="0.0769230769231" />
-                        <distribution-bar count="1" metric="6" ratio="0.025641025641" />
-                    </distribution-bars>
-                </cyclomatic>
-            </std.code.complexity>
-        </aggregated-data>
-    </data>
-</view>
+<view>
+
+    <data>
+        <info id="1" path="./" />
+        <file-data />
+        <subfiles>
+            <subfile>interface.cs</subfile>
+            <subfile>File.cs</subfile>
+            <subfile>Generics.cs</subfile>
+        </subfiles>
+        <subdirs>
+        </subdirs>
+        <aggregated-data>
+            <std.code.complexity>
+                <cyclomatic avg="1.15384615385" count="39" max="6" min="0" nonzero="False" sup="0" total="45.0">
+                    <distribution-bars>
+                        <distribution-bar count="23" metric="0" ratio="0.589743589744" />
+                        <distribution-bar count="7" metric="1" ratio="0.179487179487" />
+                        <distribution-bar count="1" metric="2" ratio="0.025641025641" />
+                        <distribution-bar count="1" metric="3" ratio="0.025641025641" />
+                        <distribution-bar count="3" metric="4" ratio="0.0769230769231" />
+                        <distribution-bar count="3" metric="5" ratio="0.0769230769231" />
+                        <distribution-bar count="1" metric="6" ratio="0.025641025641" />
+                    </distribution-bars>
+                </cyclomatic>
+            </std.code.complexity>
+        </aggregated-data>
+    </data>
+</view>

+ 461 - 461
mainline/tests/general/test_std_code_cs/test_parser_view_files_stdout.gold.txt

@@ -1,461 +1,461 @@
-./interface.cs:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-6584
-	Line numbers   : 1-219
-	Modified       : None
-
-.   ./interface.cs:22: info: Metrics per 'System.Runtime.Serialization' region
-    	Region name    : System.Runtime.Serialization
-    	Region type    : namespace
-    	Offsets        : 918-1139
-    	Line numbers   : 22-37
-    	Modified       : None
-
-.   .   ./interface.cs:30: info: Metrics per 'IDeserializationCallback' region
-        	Region name    : IDeserializationCallback
-        	Region type    : interface
-        	Offsets        : 960-1097
-        	Line numbers   : 25-35
-        	Modified       : None
-
-.   ./interface.cs:61: info: Metrics per 'System.Globalization' region
-    	Region name    : System.Globalization
-    	Region type    : namespace
-    	Offsets        : 2040-6548
-    	Line numbers   : 61-218
-    	Modified       : None
-
-.   .   ./interface.cs:69: info: Metrics per 'TextInfo' region
-        	Region name    : TextInfo
-        	Region type    : class
-        	Offsets        : 2183-6526
-        	Line numbers   : 69-216
-        	Modified       : None
-
-.   .   .   ./interface.cs:80: info: Metrics per 'TextInfo' region
-            	Region name    : TextInfo
-            	Region type    : function
-            	Offsets        : 2288-2687
-            	Line numbers   : 75-83
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./interface.cs:88: info: Metrics per 'get' region
-            	Region name    : get
-            	Region type    : function
-            	Offsets        : 2802-2940
-            	Line numbers   : 88-92
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./interface.cs:98: info: Metrics per 'get' region
-            	Region name    : get
-            	Region type    : function
-            	Offsets        : 3073-3209
-            	Line numbers   : 98-102
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./interface.cs:108: info: Metrics per 'get' region
-            	Region name    : get
-            	Region type    : function
-            	Offsets        : 3336-3475
-            	Line numbers   : 108-112
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./interface.cs:118: info: Metrics per 'get' region
-            	Region name    : get
-            	Region type    : function
-            	Offsets        : 3602-3739
-            	Line numbers   : 118-122
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./interface.cs:128: info: Metrics per 'get' region
-            	Region name    : get
-            	Region type    : function
-            	Offsets        : 3863-3934
-            	Line numbers   : 128-131
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./interface.cs:135: info: Metrics per 'Equals' region
-            	Region name    : Equals
-            	Region type    : function
-            	Offsets        : 3954-4348
-            	Line numbers   : 134-146
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 1
-
-.   .   .   ./interface.cs:149: info: Metrics per 'GetHashCode' region
-            	Region name    : GetHashCode
-            	Region type    : function
-            	Offsets        : 4354-4489
-            	Line numbers   : 148-152
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./interface.cs:169: info: Metrics per 'ToTitleCase' region
-            	Region name    : ToTitleCase
-            	Region type    : function
-            	Offsets        : 5003-5940
-            	Line numbers   : 168-195
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 4
-
-.   .   .   ./interface.cs:198: info: Metrics per 'I.Deserialization.Callback.OnDeserialization' region
-            	Region name    : I.Deserialization.Callback.OnDeserialization
-            	Region type    : function
-            	Offsets        : 5946-6128
-            	Line numbers   : 197-201
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./interface.cs:204: info: Metrics per 'ToString' region
-            	Region name    : ToString
-            	Region type    : function
-            	Offsets        : 6134-6296
-            	Line numbers   : 203-207
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./interface.cs:211: info: Metrics per 'IDeserializationCallback.OnDeserialization' region
-            	Region name    : IDeserializationCallback.OnDeserialization
-            	Region type    : function
-            	Offsets        : 6302-6523
-            	Line numbers   : 209-214
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-./interface.cs:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.416666666667
-	Minimum        : 0
-	Maximum        : 4
-	Total          : 5.0
-	Distribution   : 12 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.833 : 0.833 : 10	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.083 : 0.917 :  1	||||||||
-	             4 : 0.083 : 1.000 :  1	||||||||
-
-./File.cs:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-9141
-	Line numbers   : 1-448
-	Modified       : None
-
-.   ./File.cs:21: info: Metrics per 'Microsoft.VisualBasic' region
-    	Region name    : Microsoft.VisualBasic
-    	Region type    : namespace
-    	Offsets        : 855-9104
-    	Line numbers   : 21-447
-    	Modified       : None
-
-.   .   ./File.cs:30: info: Metrics per 'File' region
-        	Region name    : File
-        	Region type    : class
-        	Offsets        : 1012-9037
-        	Line numbers   : 30-437
-        	Modified       : None
-
-.   .   .   ./File.cs:74: info: Metrics per 'get' region
-            	Region name    : get
-            	Region type    : function
-            	Offsets        : 1961-2222
-            	Line numbers   : 74-89
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 3
-
-.   .   .   ./File.cs:95: info: Metrics per 'get' region
-            	Region name    : get
-            	Region type    : function
-            	Offsets        : 2295-2781
-            	Line numbers   : 95-114
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 2
-
-.   .   .   ./File.cs:120: info: Metrics per 'get' region
-            	Region name    : get
-            	Region type    : function
-            	Offsets        : 2888-3022
-            	Line numbers   : 120-128
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 1
-
-.   .   .   ./File.cs:134: info: Metrics per 'get' region
-            	Region name    : get
-            	Region type    : function
-            	Offsets        : 3129-3263
-            	Line numbers   : 134-142
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 1
-
-.   .   .   ./File.cs:148: info: Metrics per 'get' region
-            	Region name    : get
-            	Region type    : function
-            	Offsets        : 3355-3489
-            	Line numbers   : 148-156
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 1
-
-.   .   .   ./File.cs:160: info: Metrics per 'Close' region
-            	Region name    : Close
-            	Region type    : function
-            	Offsets        : 3497-4076
-            	Line numbers   : 159-187
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 4
-
-.   .   .   ./File.cs:190: info: Metrics per 'SetRecord' region
-            	Region name    : SetRecord
-            	Region type    : function
-            	Offsets        : 4079-4794
-            	Line numbers   : 189-226
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 6
-
-.   .   .   ./File.cs:229: info: Metrics per 'FileTable' region
-            	Region name    : FileTable
-            	Region type    : class
-            	Offsets        : 4797-5103
-            	Line numbers   : 228-242
-            	Modified       : None
-
-.   .   .   .   ./File.cs:235: info: Metrics per 'FileTable' region
-                	Region name    : FileTable
-                	Region type    : function
-                	Offsets        : 4943-5099
-                	Line numbers   : 235-240
-                	Modified       : None
-                	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./File.cs:245: info: Metrics per 'GetFile' region
-            	Region name    : GetFile
-            	Region type    : function
-            	Offsets        : 5126-5822
-            	Line numbers   : 244-274
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 5
-
-.   .   .   ./File.cs:277: info: Metrics per 'GetFile' region
-            	Region name    : GetFile
-            	Region type    : function
-            	Offsets        : 5825-6140
-            	Line numbers   : 276-285
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 1
-
-.   .   .   ./File.cs:288: info: Metrics per 'AllocateFile' region
-            	Region name    : AllocateFile
-            	Region type    : function
-            	Offsets        : 6143-7049
-            	Line numbers   : 287-324
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 5
-
-.   .   .   ./File.cs:327: info: Metrics per 'FindFreeFile' region
-            	Region name    : FindFreeFile
-            	Region type    : function
-            	Offsets        : 7052-7735
-            	Line numbers   : 326-358
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 5
-
-.   .   .   ./File.cs:361: info: Metrics per 'CloseAll' region
-            	Region name    : CloseAll
-            	Region type    : function
-            	Offsets        : 7738-8342
-            	Line numbers   : 360-387
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 4
-
-.   .   .   ./File.cs:391: info: Metrics per 'Write' region
-            	Region name    : Write
-            	Region type    : function
-            	Offsets        : 8345-8437
-            	Line numbers   : 389-394
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./File.cs:398: info: Metrics per 'WriteLine' region
-            	Region name    : WriteLine
-            	Region type    : function
-            	Offsets        : 8440-8541
-            	Line numbers   : 396-401
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./File.cs:405: info: Metrics per 'Tab' region
-            	Region name    : Tab
-            	Region type    : function
-            	Offsets        : 8544-8631
-            	Line numbers   : 403-408
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./File.cs:412: info: Metrics per 'Space' region
-            	Region name    : Space
-            	Region type    : function
-            	Offsets        : 8634-8726
-            	Line numbers   : 410-415
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./File.cs:419: info: Metrics per 'Lock' region
-            	Region name    : Lock
-            	Region type    : function
-            	Offsets        : 8729-8839
-            	Line numbers   : 417-422
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./File.cs:426: info: Metrics per 'Unlock' region
-            	Region name    : Unlock
-            	Region type    : function
-            	Offsets        : 8842-9034
-            	Line numbers   : 424-435
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 1
-
-./File.cs:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 2.05263157895
-	Minimum        : 0
-	Maximum        : 6
-	Total          : 39.0
-	Distribution   : 19 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.316 : 0.316 :  6	||||||||||||||||||||||||||||||||
-	             1 : 0.263 : 0.579 :  5	||||||||||||||||||||||||||
-	             2 : 0.053 : 0.632 :  1	|||||
-	             3 : 0.053 : 0.684 :  1	|||||
-	             4 : 0.105 : 0.789 :  2	|||||||||||
-	             5 : 0.158 : 0.947 :  3	||||||||||||||||
-	             6 : 0.053 : 1.000 :  1	|||||
-
-./Generics.cs:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-3134
-	Line numbers   : 1-106
-	Modified       : None
-
-.   ./Generics.cs:22: info: Metrics per 'Generics' region
-    	Region name    : Generics
-    	Region type    : class
-    	Offsets        : 1182-3133
-    	Line numbers   : 22-105
-    	Modified       : None
-
-.   .   ./Generics.cs:24: info: Metrics per 'MyArray' region
-        	Region name    : MyArray
-        	Region type    : class
-        	Offsets        : 1214-1664
-        	Line numbers   : 24-57
-        	Modified       : None
-
-.   .   .   ./Generics.cs:26: info: Metrics per 'NestedClass' region
-            	Region name    : NestedClass
-            	Region type    : class
-            	Offsets        : 1243-1316
-            	Line numbers   : 26-30
-            	Modified       : None
-
-.   .   .   ./Generics.cs:40: info: Metrics per 'MyArray' region
-            	Region name    : MyArray
-            	Region type    : function
-            	Offsets        : 1391-1458
-            	Line numbers   : 40-43
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./Generics.cs:45: info: Metrics per 'Size' region
-            	Region name    : Size
-            	Region type    : function
-            	Offsets        : 1464-1546
-            	Line numbers   : 45-48
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   .   ./Generics.cs:50: info: Metrics per 'Grow' region
-            	Region name    : Grow
-            	Region type    : function
-            	Offsets        : 1552-1661
-            	Line numbers   : 50-56
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 1
-
-.   .   ./Generics.cs:59: info: Metrics per 'IInterface' region
-        	Region name    : IInterface
-        	Region type    : interface
-        	Offsets        : 1668-1775
-        	Line numbers   : 59-63
-        	Modified       : None
-
-.   .   ./Generics.cs:65: info: Metrics per 'Base' region
-        	Region name    : Base
-        	Region type    : class
-        	Offsets        : 1779-2084
-        	Line numbers   : 65-74
-        	Modified       : None
-
-.   .   .   ./Generics.cs:71: info: Metrics per 'Generics.IInterface.Method2' region
-            	Region name    : Generics.IInterface.Method2
-            	Region type    : function
-            	Offsets        : 1960-2081
-            	Line numbers   : 70-73
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   ./Generics.cs:76: info: Metrics per 'Derived' region
-        	Region name    : Derived
-        	Region type    : class
-        	Offsets        : 2088-2245
-        	Line numbers   : 76-82
-        	Modified       : None
-
-.   .   .   ./Generics.cs:79: info: Metrics per 'Method1' region
-            	Region name    : Method1
-            	Region type    : function
-            	Offsets        : 2130-2242
-            	Line numbers   : 78-81
-            	Modified       : None
-            	std.code.complexity:cyclomatic: 0
-
-.   .   ./Generics.cs:92: info: Metrics per 'MethodWithConstraint' region
-        	Region name    : MethodWithConstraint
-        	Region type    : function
-        	Offsets        : 2698-2798
-        	Line numbers   : 92-94
-        	Modified       : None
-        	std.code.complexity:cyclomatic: 0
-
-.   .   ./Generics.cs:96: info: Metrics per 'MethodWithStructConstraint' region
-        	Region name    : MethodWithStructConstraint
-        	Region type    : function
-        	Offsets        : 2802-2875
-        	Line numbers   : 96-98
-        	Modified       : None
-        	std.code.complexity:cyclomatic: 0
-
-.   .   ./Generics.cs:100: info: Metrics per 'Dictionary' region
-        	Region name    : Dictionary
-        	Region type    : function
-        	Offsets        : 2879-3131
-        	Line numbers   : 100-104
-        	Modified       : None
-        	std.code.complexity:cyclomatic: 0
-
-./Generics.cs:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.125
-	Minimum        : 0
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 8 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.875 : 0.875 : 7	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.125 : 1.000 : 1	|||||||||||||
-
-
+./File.cs:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-9141
+	Line numbers   : 1-448
+	Modified       : None
+
+.   ./File.cs:21: info: Metrics per 'Microsoft.VisualBasic' region
+    	Region name    : Microsoft.VisualBasic
+    	Region type    : namespace
+    	Offsets        : 855-9104
+    	Line numbers   : 21-447
+    	Modified       : None
+
+.   .   ./File.cs:30: info: Metrics per 'File' region
+        	Region name    : File
+        	Region type    : class
+        	Offsets        : 1012-9037
+        	Line numbers   : 30-437
+        	Modified       : None
+
+.   .   .   ./File.cs:74: info: Metrics per 'get' region
+            	Region name    : get
+            	Region type    : function
+            	Offsets        : 1961-2222
+            	Line numbers   : 74-89
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 3
+
+.   .   .   ./File.cs:95: info: Metrics per 'get' region
+            	Region name    : get
+            	Region type    : function
+            	Offsets        : 2295-2781
+            	Line numbers   : 95-114
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 2
+
+.   .   .   ./File.cs:120: info: Metrics per 'get' region
+            	Region name    : get
+            	Region type    : function
+            	Offsets        : 2888-3022
+            	Line numbers   : 120-128
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 1
+
+.   .   .   ./File.cs:134: info: Metrics per 'get' region
+            	Region name    : get
+            	Region type    : function
+            	Offsets        : 3129-3263
+            	Line numbers   : 134-142
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 1
+
+.   .   .   ./File.cs:148: info: Metrics per 'get' region
+            	Region name    : get
+            	Region type    : function
+            	Offsets        : 3355-3489
+            	Line numbers   : 148-156
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 1
+
+.   .   .   ./File.cs:160: info: Metrics per 'Close' region
+            	Region name    : Close
+            	Region type    : function
+            	Offsets        : 3497-4076
+            	Line numbers   : 159-187
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 4
+
+.   .   .   ./File.cs:190: info: Metrics per 'SetRecord' region
+            	Region name    : SetRecord
+            	Region type    : function
+            	Offsets        : 4079-4794
+            	Line numbers   : 189-226
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 6
+
+.   .   .   ./File.cs:229: info: Metrics per 'FileTable' region
+            	Region name    : FileTable
+            	Region type    : class
+            	Offsets        : 4797-5103
+            	Line numbers   : 228-242
+            	Modified       : None
+
+.   .   .   .   ./File.cs:235: info: Metrics per 'FileTable' region
+                	Region name    : FileTable
+                	Region type    : function
+                	Offsets        : 4943-5099
+                	Line numbers   : 235-240
+                	Modified       : None
+                	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./File.cs:245: info: Metrics per 'GetFile' region
+            	Region name    : GetFile
+            	Region type    : function
+            	Offsets        : 5126-5822
+            	Line numbers   : 244-274
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 5
+
+.   .   .   ./File.cs:277: info: Metrics per 'GetFile' region
+            	Region name    : GetFile
+            	Region type    : function
+            	Offsets        : 5825-6140
+            	Line numbers   : 276-285
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 1
+
+.   .   .   ./File.cs:288: info: Metrics per 'AllocateFile' region
+            	Region name    : AllocateFile
+            	Region type    : function
+            	Offsets        : 6143-7049
+            	Line numbers   : 287-324
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 5
+
+.   .   .   ./File.cs:327: info: Metrics per 'FindFreeFile' region
+            	Region name    : FindFreeFile
+            	Region type    : function
+            	Offsets        : 7052-7735
+            	Line numbers   : 326-358
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 5
+
+.   .   .   ./File.cs:361: info: Metrics per 'CloseAll' region
+            	Region name    : CloseAll
+            	Region type    : function
+            	Offsets        : 7738-8342
+            	Line numbers   : 360-387
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 4
+
+.   .   .   ./File.cs:391: info: Metrics per 'Write' region
+            	Region name    : Write
+            	Region type    : function
+            	Offsets        : 8345-8437
+            	Line numbers   : 389-394
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./File.cs:398: info: Metrics per 'WriteLine' region
+            	Region name    : WriteLine
+            	Region type    : function
+            	Offsets        : 8440-8541
+            	Line numbers   : 396-401
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./File.cs:405: info: Metrics per 'Tab' region
+            	Region name    : Tab
+            	Region type    : function
+            	Offsets        : 8544-8631
+            	Line numbers   : 403-408
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./File.cs:412: info: Metrics per 'Space' region
+            	Region name    : Space
+            	Region type    : function
+            	Offsets        : 8634-8726
+            	Line numbers   : 410-415
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./File.cs:419: info: Metrics per 'Lock' region
+            	Region name    : Lock
+            	Region type    : function
+            	Offsets        : 8729-8839
+            	Line numbers   : 417-422
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./File.cs:426: info: Metrics per 'Unlock' region
+            	Region name    : Unlock
+            	Region type    : function
+            	Offsets        : 8842-9034
+            	Line numbers   : 424-435
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 1
+
+./File.cs:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 2.05263157895
+	Minimum        : 0
+	Maximum        : 6
+	Total          : 39.0
+	Distribution   : 19 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.316 : 0.316 :  6	||||||||||||||||||||||||||||||||
+	             1 : 0.263 : 0.579 :  5	||||||||||||||||||||||||||
+	             2 : 0.053 : 0.632 :  1	|||||
+	             3 : 0.053 : 0.684 :  1	|||||
+	             4 : 0.105 : 0.789 :  2	|||||||||||
+	             5 : 0.158 : 0.947 :  3	||||||||||||||||
+	             6 : 0.053 : 1.000 :  1	|||||
+
+./Generics.cs:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-3134
+	Line numbers   : 1-106
+	Modified       : None
+
+.   ./Generics.cs:22: info: Metrics per 'Generics' region
+    	Region name    : Generics
+    	Region type    : class
+    	Offsets        : 1182-3133
+    	Line numbers   : 22-105
+    	Modified       : None
+
+.   .   ./Generics.cs:24: info: Metrics per 'MyArray' region
+        	Region name    : MyArray
+        	Region type    : class
+        	Offsets        : 1214-1664
+        	Line numbers   : 24-57
+        	Modified       : None
+
+.   .   .   ./Generics.cs:26: info: Metrics per 'NestedClass' region
+            	Region name    : NestedClass
+            	Region type    : class
+            	Offsets        : 1243-1316
+            	Line numbers   : 26-30
+            	Modified       : None
+
+.   .   .   ./Generics.cs:40: info: Metrics per 'MyArray' region
+            	Region name    : MyArray
+            	Region type    : function
+            	Offsets        : 1391-1458
+            	Line numbers   : 40-43
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./Generics.cs:45: info: Metrics per 'Size' region
+            	Region name    : Size
+            	Region type    : function
+            	Offsets        : 1464-1546
+            	Line numbers   : 45-48
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./Generics.cs:50: info: Metrics per 'Grow' region
+            	Region name    : Grow
+            	Region type    : function
+            	Offsets        : 1552-1661
+            	Line numbers   : 50-56
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 1
+
+.   .   ./Generics.cs:59: info: Metrics per 'IInterface' region
+        	Region name    : IInterface
+        	Region type    : interface
+        	Offsets        : 1668-1775
+        	Line numbers   : 59-63
+        	Modified       : None
+
+.   .   ./Generics.cs:65: info: Metrics per 'Base' region
+        	Region name    : Base
+        	Region type    : class
+        	Offsets        : 1779-2084
+        	Line numbers   : 65-74
+        	Modified       : None
+
+.   .   .   ./Generics.cs:71: info: Metrics per 'Generics.IInterface.Method2' region
+            	Region name    : Generics.IInterface.Method2
+            	Region type    : function
+            	Offsets        : 1960-2081
+            	Line numbers   : 70-73
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   ./Generics.cs:76: info: Metrics per 'Derived' region
+        	Region name    : Derived
+        	Region type    : class
+        	Offsets        : 2088-2245
+        	Line numbers   : 76-82
+        	Modified       : None
+
+.   .   .   ./Generics.cs:79: info: Metrics per 'Method1' region
+            	Region name    : Method1
+            	Region type    : function
+            	Offsets        : 2130-2242
+            	Line numbers   : 78-81
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   ./Generics.cs:92: info: Metrics per 'MethodWithConstraint' region
+        	Region name    : MethodWithConstraint
+        	Region type    : function
+        	Offsets        : 2698-2798
+        	Line numbers   : 92-94
+        	Modified       : None
+        	std.code.complexity:cyclomatic: 0
+
+.   .   ./Generics.cs:96: info: Metrics per 'MethodWithStructConstraint' region
+        	Region name    : MethodWithStructConstraint
+        	Region type    : function
+        	Offsets        : 2802-2875
+        	Line numbers   : 96-98
+        	Modified       : None
+        	std.code.complexity:cyclomatic: 0
+
+.   .   ./Generics.cs:100: info: Metrics per 'Dictionary' region
+        	Region name    : Dictionary
+        	Region type    : function
+        	Offsets        : 2879-3131
+        	Line numbers   : 100-104
+        	Modified       : None
+        	std.code.complexity:cyclomatic: 0
+
+./Generics.cs:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 0.125
+	Minimum        : 0
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 8 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.875 : 0.875 : 7	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.125 : 1.000 : 1	|||||||||||||
+
+./interface.cs:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-6584
+	Line numbers   : 1-219
+	Modified       : None
+
+.   ./interface.cs:22: info: Metrics per 'System.Runtime.Serialization' region
+    	Region name    : System.Runtime.Serialization
+    	Region type    : namespace
+    	Offsets        : 918-1139
+    	Line numbers   : 22-37
+    	Modified       : None
+
+.   .   ./interface.cs:30: info: Metrics per 'IDeserializationCallback' region
+        	Region name    : IDeserializationCallback
+        	Region type    : interface
+        	Offsets        : 960-1097
+        	Line numbers   : 25-35
+        	Modified       : None
+
+.   ./interface.cs:61: info: Metrics per 'System.Globalization' region
+    	Region name    : System.Globalization
+    	Region type    : namespace
+    	Offsets        : 2040-6548
+    	Line numbers   : 61-218
+    	Modified       : None
+
+.   .   ./interface.cs:69: info: Metrics per 'TextInfo' region
+        	Region name    : TextInfo
+        	Region type    : class
+        	Offsets        : 2183-6526
+        	Line numbers   : 69-216
+        	Modified       : None
+
+.   .   .   ./interface.cs:80: info: Metrics per 'TextInfo' region
+            	Region name    : TextInfo
+            	Region type    : function
+            	Offsets        : 2288-2687
+            	Line numbers   : 75-83
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./interface.cs:88: info: Metrics per 'get' region
+            	Region name    : get
+            	Region type    : function
+            	Offsets        : 2802-2940
+            	Line numbers   : 88-92
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./interface.cs:98: info: Metrics per 'get' region
+            	Region name    : get
+            	Region type    : function
+            	Offsets        : 3073-3209
+            	Line numbers   : 98-102
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./interface.cs:108: info: Metrics per 'get' region
+            	Region name    : get
+            	Region type    : function
+            	Offsets        : 3336-3475
+            	Line numbers   : 108-112
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./interface.cs:118: info: Metrics per 'get' region
+            	Region name    : get
+            	Region type    : function
+            	Offsets        : 3602-3739
+            	Line numbers   : 118-122
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./interface.cs:128: info: Metrics per 'get' region
+            	Region name    : get
+            	Region type    : function
+            	Offsets        : 3863-3934
+            	Line numbers   : 128-131
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./interface.cs:135: info: Metrics per 'Equals' region
+            	Region name    : Equals
+            	Region type    : function
+            	Offsets        : 3954-4348
+            	Line numbers   : 134-146
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 1
+
+.   .   .   ./interface.cs:149: info: Metrics per 'GetHashCode' region
+            	Region name    : GetHashCode
+            	Region type    : function
+            	Offsets        : 4354-4489
+            	Line numbers   : 148-152
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./interface.cs:169: info: Metrics per 'ToTitleCase' region
+            	Region name    : ToTitleCase
+            	Region type    : function
+            	Offsets        : 5003-5940
+            	Line numbers   : 168-195
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 4
+
+.   .   .   ./interface.cs:198: info: Metrics per 'I.Deserialization.Callback.OnDeserialization' region
+            	Region name    : I.Deserialization.Callback.OnDeserialization
+            	Region type    : function
+            	Offsets        : 5946-6128
+            	Line numbers   : 197-201
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./interface.cs:204: info: Metrics per 'ToString' region
+            	Region name    : ToString
+            	Region type    : function
+            	Offsets        : 6134-6296
+            	Line numbers   : 203-207
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+.   .   .   ./interface.cs:211: info: Metrics per 'IDeserializationCallback.OnDeserialization' region
+            	Region name    : IDeserializationCallback.OnDeserialization
+            	Region type    : function
+            	Offsets        : 6302-6523
+            	Line numbers   : 209-214
+            	Modified       : None
+            	std.code.complexity:cyclomatic: 0
+
+./interface.cs:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 0.416666666667
+	Minimum        : 0
+	Maximum        : 4
+	Total          : 5.0
+	Distribution   : 12 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.833 : 0.833 : 10	|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.083 : 0.917 :  1	||||||||
+	             4 : 0.083 : 1.000 :  1	||||||||
+
+

+ 54 - 54
mainline/tests/general/test_std_code_java/test_parser_limit_default_stdout.gold.txt

@@ -1,54 +1,54 @@
-./ArrayUtils.java:59: warning: Metric 'std.code.complexity:cyclomatic' for region 'removeAt' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : removeAt
-	Metric value   : 6
-	Modified       : None
-	Change trend   : None
-	Limit          : 5.0
-	Suppressed     : False
-
-./ArrayUtils.java:84: warning: Metric 'std.code.complexity:cyclomatic' for region 'removeAt' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : removeAt
-	Metric value   : 6
-	Modified       : None
-	Change trend   : None
-	Limit          : 5.0
-	Suppressed     : False
-
-./ArrayUtils.java:120: warning: Metric 'std.code.complexity:cyclomatic' for region 'equalContents' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : equalContents
-	Metric value   : 6
-	Modified       : None
-	Change trend   : None
-	Limit          : 5.0
-	Suppressed     : False
-
-./ArrayUtils.java:140: warning: Metric 'std.code.complexity:cyclomatic' for region 'equals' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : equals
-	Metric value   : 6
-	Modified       : None
-	Change trend   : None
-	Limit          : 5.0
-	Suppressed     : False
-
-./ArrayUtils.java:177: warning: Metric 'std.code.complexity:cyclomatic' for region 'equals' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : equals
-	Metric value   : 6
-	Modified       : None
-	Change trend   : None
-	Limit          : 5.0
-	Suppressed     : False
-
-./BinaryHeapPriorityQueue.java:156: warning: Metric 'std.code.complexity:cyclomatic' for region 'heapifyDown' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : heapifyDown
-	Metric value   : 6
-	Modified       : None
-	Change trend   : None
-	Limit          : 5.0
-	Suppressed     : False
-
+./ArrayUtils.java:59: warning: Metric 'std.code.complexity:cyclomatic' for region 'removeAt' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : removeAt
+	Metric value   : 6
+	Modified       : None
+	Change trend   : None
+	Limit          : 5.0
+	Suppressed     : False
+
+./ArrayUtils.java:84: warning: Metric 'std.code.complexity:cyclomatic' for region 'removeAt' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : removeAt
+	Metric value   : 6
+	Modified       : None
+	Change trend   : None
+	Limit          : 5.0
+	Suppressed     : False
+
+./ArrayUtils.java:120: warning: Metric 'std.code.complexity:cyclomatic' for region 'equalContents' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : equalContents
+	Metric value   : 6
+	Modified       : None
+	Change trend   : None
+	Limit          : 5.0
+	Suppressed     : False
+
+./ArrayUtils.java:140: warning: Metric 'std.code.complexity:cyclomatic' for region 'equals' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : equals
+	Metric value   : 6
+	Modified       : None
+	Change trend   : None
+	Limit          : 5.0
+	Suppressed     : False
+
+./ArrayUtils.java:177: warning: Metric 'std.code.complexity:cyclomatic' for region 'equals' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : equals
+	Metric value   : 6
+	Modified       : None
+	Change trend   : None
+	Limit          : 5.0
+	Suppressed     : False
+
+./BinaryHeapPriorityQueue.java:156: warning: Metric 'std.code.complexity:cyclomatic' for region 'heapifyDown' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : heapifyDown
+	Metric value   : 6
+	Modified       : None
+	Change trend   : None
+	Limit          : 5.0
+	Suppressed     : False
+

+ 29 - 29
mainline/tests/general/test_std_code_java/test_parser_view_default_stdout.gold.txt

@@ -1,29 +1,29 @@
-<view>
-
-    <data>
-        <info path="./" id="1" />
-        <file-data />
-        <subfiles>
-            <subfile>Generics.java</subfile>
-            <subfile>attrs.java</subfile>
-            <subfile>BinaryHeapPriorityQueue.java</subfile>
-            <subfile>ArrayUtils.java</subfile>
-        </subfiles>
-        <subdirs>
-        </subdirs>
-        <aggregated-data>
-            <std.code.complexity>
-                <cyclomatic count="119" nonzero="False" total="126.0" min="0" max="6" avg="1.05882352941" sup="0">
-                    <distribution-bars>
-                        <distribution-bar count="58" metric="0" ratio="0.487394957983" />
-                        <distribution-bar count="31" metric="1" ratio="0.260504201681" />
-                        <distribution-bar count="15" metric="2" ratio="0.126050420168" />
-                        <distribution-bar count="8" metric="3" ratio="0.0672268907563" />
-                        <distribution-bar count="1" metric="5" ratio="0.00840336134454" />
-                        <distribution-bar count="6" metric="6" ratio="0.0504201680672" />
-                    </distribution-bars>
-                </cyclomatic>
-            </std.code.complexity>
-        </aggregated-data>
-    </data>
-</view>
+<view>
+
+    <data>
+        <info id="1" path="./" />
+        <file-data />
+        <subfiles>
+            <subfile>Generics.java</subfile>
+            <subfile>attrs.java</subfile>
+            <subfile>BinaryHeapPriorityQueue.java</subfile>
+            <subfile>ArrayUtils.java</subfile>
+        </subfiles>
+        <subdirs>
+        </subdirs>
+        <aggregated-data>
+            <std.code.complexity>
+                <cyclomatic avg="1.05882352941" count="119" max="6" min="0" nonzero="False" sup="0" total="126.0">
+                    <distribution-bars>
+                        <distribution-bar count="58" metric="0" ratio="0.487394957983" />
+                        <distribution-bar count="31" metric="1" ratio="0.260504201681" />
+                        <distribution-bar count="15" metric="2" ratio="0.126050420168" />
+                        <distribution-bar count="8" metric="3" ratio="0.0672268907563" />
+                        <distribution-bar count="1" metric="5" ratio="0.00840336134454" />
+                        <distribution-bar count="6" metric="6" ratio="0.0504201680672" />
+                    </distribution-bars>
+                </cyclomatic>
+            </std.code.complexity>
+        </aggregated-data>
+    </data>
+</view>

Різницю між файлами не показано, бо вона завелика
+ 1077 - 1077
mainline/tests/general/test_std_code_java/test_parser_view_files_stdout.gold.txt


+ 57 - 57
mainline/tests/general/test_std_code_todo/test_comments_view_files_stdout.gold.txt

@@ -1,57 +1,57 @@
-./test.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-273
-	Line numbers   : 1-18
-	Modified       : None
-
-.   ./test.cpp:2: info: Metrics per 'main' region
-    	Region name    : main
-    	Region type    : function
-    	Offsets        : 1-272
-    	Line numbers   : 2-17
-    	Modified       : None
-    	std.code.todo:comments: 14
-
-./test.cpp:: info: Overall metrics for 'std.code.todo:comments' metric
-	Average        : 14.0 (excluding zero metric values)
-	Minimum        : 14
-	Maximum        : 14
-	Total          : 14.0
-	Distribution   : 1 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	            14 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./test.cs:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-547
-	Line numbers   : 1-36
-	Modified       : None
-
-.   ./test.cs:2: info: Metrics per 'MainClass' region
-    	Region name    : MainClass
-    	Region type    : class
-    	Offsets        : 1-546
-    	Line numbers   : 2-35
-    	Modified       : None
-    	std.code.todo:comments: 14
-
-.   .   ./test.cs:12: info: Metrics per 'main' region
-        	Region name    : main
-        	Region type    : function
-        	Offsets        : 141-430
-        	Line numbers   : 12-28
-        	Modified       : None
-        	std.code.todo:comments: 14
-
-./test.cs:: info: Overall metrics for 'std.code.todo:comments' metric
-	Average        : 14.0 (excluding zero metric values)
-	Minimum        : 14
-	Maximum        : 14
-	Total          : 28.0
-	Distribution   : 2 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	            14 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-
+./test.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-273
+	Line numbers   : 1-18
+	Modified       : None
+
+.   ./test.cpp:2: info: Metrics per 'main' region
+    	Region name    : main
+    	Region type    : function
+    	Offsets        : 1-272
+    	Line numbers   : 2-17
+    	Modified       : None
+    	std.code.todo:comments: 14
+
+./test.cpp:: info: Overall metrics for 'std.code.todo:comments' metric
+	Average        : 14.0 (excluding zero metric values)
+	Minimum        : 14
+	Maximum        : 14
+	Total          : 14.0
+	Distribution   : 1 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	            14 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./test.cs:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-547
+	Line numbers   : 1-36
+	Modified       : None
+
+.   ./test.cs:2: info: Metrics per 'MainClass' region
+    	Region name    : MainClass
+    	Region type    : class
+    	Offsets        : 1-546
+    	Line numbers   : 2-35
+    	Modified       : None
+    	std.code.todo:comments: 14
+
+.   .   ./test.cs:12: info: Metrics per 'main' region
+        	Region name    : main
+        	Region type    : function
+        	Offsets        : 141-430
+        	Line numbers   : 12-28
+        	Modified       : None
+        	std.code.todo:comments: 14
+
+./test.cs:: info: Overall metrics for 'std.code.todo:comments' metric
+	Average        : 14.0 (excluding zero metric values)
+	Minimum        : 14
+	Maximum        : 14
+	Total          : 28.0
+	Distribution   : 2 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	            14 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+

+ 56 - 56
mainline/tests/general/test_std_code_todo/test_strings_view_files_stdout.gold.txt

@@ -1,56 +1,56 @@
-./test.cpp:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-273
-	Line numbers   : 1-18
-	Modified       : None
-
-.   ./test.cpp:2: info: Metrics per 'main' region
-    	Region name    : main
-    	Region type    : function
-    	Offsets        : 1-272
-    	Line numbers   : 2-17
-    	Modified       : None
-    	std.code.todo:strings: 1
-
-./test.cpp:: info: Overall metrics for 'std.code.todo:strings' metric
-	Average        : 1.0 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 1 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./test.cs:0: info: Metrics per '__global__' region
-	Region name    : __global__
-	Region type    : global
-	Offsets        : 0-547
-	Line numbers   : 1-36
-	Modified       : None
-
-.   ./test.cs:2: info: Metrics per 'MainClass' region
-    	Region name    : MainClass
-    	Region type    : class
-    	Offsets        : 1-546
-    	Line numbers   : 2-35
-    	Modified       : None
-
-.   .   ./test.cs:12: info: Metrics per 'main' region
-        	Region name    : main
-        	Region type    : function
-        	Offsets        : 141-430
-        	Line numbers   : 12-28
-        	Modified       : None
-        	std.code.todo:strings: 1
-
-./test.cs:: info: Overall metrics for 'std.code.todo:strings' metric
-	Average        : 1.0 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 1 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-
+./test.cpp:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-273
+	Line numbers   : 1-18
+	Modified       : None
+
+.   ./test.cpp:2: info: Metrics per 'main' region
+    	Region name    : main
+    	Region type    : function
+    	Offsets        : 1-272
+    	Line numbers   : 2-17
+    	Modified       : None
+    	std.code.todo:strings: 1
+
+./test.cpp:: info: Overall metrics for 'std.code.todo:strings' metric
+	Average        : 1.0 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 1 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./test.cs:0: info: Metrics per '__global__' region
+	Region name    : __global__
+	Region type    : global
+	Offsets        : 0-547
+	Line numbers   : 1-36
+	Modified       : None
+
+.   ./test.cs:2: info: Metrics per 'MainClass' region
+    	Region name    : MainClass
+    	Region type    : class
+    	Offsets        : 1-546
+    	Line numbers   : 2-35
+    	Modified       : None
+
+.   .   ./test.cs:12: info: Metrics per 'main' region
+        	Region name    : main
+        	Region type    : function
+        	Offsets        : 141-430
+        	Line numbers   : 12-28
+        	Modified       : None
+        	std.code.todo:strings: 1
+
+./test.cs:: info: Overall metrics for 'std.code.todo:strings' metric
+	Average        : 1.0 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 1 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+

+ 6 - 6
mainline/tests/general/test_std_code_todo/test_tags_collect_badtag_stderr.gold.txt

@@ -1,6 +1,6 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-Usage: python metrix++.py --help
-       python metrix++.py collect --help
-       python metrix++.py collect [options] -- [path 1] ... [path N]
-
-metrix++.py: error: option --std.code.todo.tags: tag FIX-ME includes not allowed symbols
+[LOG]: WARNING:	Logging enabled with INFO level
+Usage: python metrix++.py --help
+       python metrix++.py collect --help
+       python metrix++.py collect [options] -- [path 1] ... [path N]
+
+metrix++.py: error: option --std.code.todo.tags: tag FIX-ME includes not allowed symbols

+ 23 - 23
mainline/tests/general/test_std_code_todo/test_tags_view_default_stdout.gold.txt

@@ -1,23 +1,23 @@
-./:: info: Overall metrics for 'std.code.todo:strings' metric
-	Average        : 2.0 (excluding zero metric values)
-	Minimum        : 2
-	Maximum        : 2
-	Total          : 4.0
-	Distribution   : 2 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             2 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.code.todo:comments' metric
-	Average        : 5.0 (excluding zero metric values)
-	Minimum        : 5
-	Maximum        : 5
-	Total          : 15.0
-	Distribution   : 3 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             5 : 1.000 : 1.000 : 3	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Directory content:
-	File           : test.cs
-	File           : test.cpp
-
-
+./:: info: Overall metrics for 'std.code.todo:strings' metric
+	Average        : 2.0 (excluding zero metric values)
+	Minimum        : 2
+	Maximum        : 2
+	Total          : 4.0
+	Distribution   : 2 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             2 : 1.000 : 1.000 : 2	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.code.todo:comments' metric
+	Average        : 5.0 (excluding zero metric values)
+	Minimum        : 5
+	Maximum        : 5
+	Total          : 15.0
+	Distribution   : 3 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             5 : 1.000 : 1.000 : 3	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Directory content:
+	File           : test.cs
+	File           : test.cpp
+
+

+ 28 - 28
mainline/tests/general/test_std_suppress/test_basic_collect_default_stdout.gold.txt

@@ -1,28 +1,28 @@
-./test.c:0: warning: Duplicate suppression of the metric 'std.general:size'
-	Metric name    : std.general:size
-	Region name    : None
-
-./test.c:84: warning: Suppressed metric 'invalid:metric' is not being collected
-	Metric name    : invalid:metric
-	Region name    : suppresed_for_invalid_metric
-
-./test.c:90: warning: Suppressed metric 'std.code.length:invlaid_metric' is not being collected
-	Metric name    : std.code.length:invlaid_metric
-	Region name    : suppresed_for_invalid_metric
-
-./test.c:97: warning: Suppressed metric 'invalid:metric' is not being collected
-	Metric name    : invalid:metric
-	Region name    : suppressed_for_size_and_invalid_metric
-
-./test.c:105: warning: Suppressed metric 'invalid:metric' is not being collected
-	Metric name    : invalid:metric
-	Region name    : suppressed_for_size_and_complexity_and_invalid_metric
-
-./test.c:163: warning: Duplicate suppression of the metric 'std.code.length:total'
-	Metric name    : std.code.length:total
-	Region name    : duplicate_suppression_of_size
-
-./test.c:169: warning: Suppressed metric 'std.general:size' is attributed to a file, not a region. Remove it or move to the beginning of the file.
-	Metric name    : std.general:size
-	Region name    : bad_suppression_of_file_size
-
+./test.c:0: warning: Duplicate suppression of the metric 'std.general:size'
+	Metric name    : std.general:size
+	Region name    : None
+
+./test.c:84: warning: Suppressed metric 'invalid:metric' is not being collected
+	Metric name    : invalid:metric
+	Region name    : suppresed_for_invalid_metric
+
+./test.c:90: warning: Suppressed metric 'std.code.length:invlaid_metric' is not being collected
+	Metric name    : std.code.length:invlaid_metric
+	Region name    : suppresed_for_invalid_metric
+
+./test.c:97: warning: Suppressed metric 'invalid:metric' is not being collected
+	Metric name    : invalid:metric
+	Region name    : suppressed_for_size_and_invalid_metric
+
+./test.c:105: warning: Suppressed metric 'invalid:metric' is not being collected
+	Metric name    : invalid:metric
+	Region name    : suppressed_for_size_and_complexity_and_invalid_metric
+
+./test.c:163: warning: Duplicate suppression of the metric 'std.code.length:total'
+	Metric name    : std.code.length:total
+	Region name    : duplicate_suppression_of_size
+
+./test.c:169: warning: Suppressed metric 'std.general:size' is attributed to a file, not a region. Remove it or move to the beginning of the file.
+	Metric name    : std.general:size
+	Region name    : bad_suppression_of_file_size
+

+ 9 - 9
mainline/tests/general/test_std_suppress/test_basic_limit_1_stdout.gold.txt

@@ -1,9 +1,9 @@
-./test.c:124: warning: Metric 'std.code.complexity:cyclomatic' for region 'no_suppress_for_cyclomatic_complexity' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : no_suppress_for_cyclomatic_complexity
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./test.c:124: warning: Metric 'std.code.complexity:cyclomatic' for region 'no_suppress_for_cyclomatic_complexity' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : no_suppress_for_cyclomatic_complexity
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 72 - 72
mainline/tests/general/test_std_suppress/test_basic_limit_2_stdout.gold.txt

@@ -1,72 +1,72 @@
-./test.c:105: warning: Metric 'std.code.complexity:cyclomatic' for region 'suppressed_for_size_and_complexity_and_invalid_metric' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : suppressed_for_size_and_complexity_and_invalid_metric
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:112: warning: Metric 'std.code.complexity:cyclomatic' for region 'func7' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : func7
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:118: warning: Metric 'std.code.complexity:cyclomatic' for region 'nu_suppress_for_size' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : nu_suppress_for_size
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:124: warning: Metric 'std.code.complexity:cyclomatic' for region 'no_suppress_for_cyclomatic_complexity' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : no_suppress_for_cyclomatic_complexity
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:132: warning: Metric 'std.code.complexity:cyclomatic' for region 'func8' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : func8
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:140: warning: Metric 'std.code.complexity:cyclomatic' for region 'func9' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : func9
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:146: warning: Metric 'std.code.complexity:cyclomatic' for region 'bad_suppress_for_size' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : bad_suppress_for_size
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:156: warning: Metric 'std.code.complexity:cyclomatic' for region 'func10' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : func10
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
+./test.c:105: warning: Metric 'std.code.complexity:cyclomatic' for region 'suppressed_for_size_and_complexity_and_invalid_metric' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : suppressed_for_size_and_complexity_and_invalid_metric
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:112: warning: Metric 'std.code.complexity:cyclomatic' for region 'func7' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : func7
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:118: warning: Metric 'std.code.complexity:cyclomatic' for region 'nu_suppress_for_size' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : nu_suppress_for_size
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:124: warning: Metric 'std.code.complexity:cyclomatic' for region 'no_suppress_for_cyclomatic_complexity' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : no_suppress_for_cyclomatic_complexity
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:132: warning: Metric 'std.code.complexity:cyclomatic' for region 'func8' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : func8
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:140: warning: Metric 'std.code.complexity:cyclomatic' for region 'func9' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : func9
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:146: warning: Metric 'std.code.complexity:cyclomatic' for region 'bad_suppress_for_size' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : bad_suppress_for_size
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:156: warning: Metric 'std.code.complexity:cyclomatic' for region 'func10' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : func10
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+

+ 63 - 63
mainline/tests/general/test_std_suppress/test_basic_limit_3_stdout.gold.txt

@@ -1,63 +1,63 @@
-./test.c:56: warning: Metric 'std.code.length:total' for region 'no_suppress_cl' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : no_suppress_cl
-	Metric value   : 44
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:62: warning: Metric 'std.code.length:total' for region 'nu_suppress_func' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : nu_suppress_func
-	Metric value   : 63
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:77: warning: Metric 'std.code.length:total' for region 'func_no_suppress_within_struct' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func_no_suppress_within_struct
-	Metric value   : 43
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:84: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : suppresed_for_invalid_metric
-	Metric value   : 80
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:90: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : suppresed_for_invalid_metric
-	Metric value   : 96
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:118: warning: Metric 'std.code.length:total' for region 'nu_suppress_for_size' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : nu_suppress_for_size
-	Metric value   : 105
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:146: warning: Metric 'std.code.length:total' for region 'bad_suppress_for_size' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : bad_suppress_for_size
-	Metric value   : 152
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./test.c:56: warning: Metric 'std.code.length:total' for region 'no_suppress_cl' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : no_suppress_cl
+	Metric value   : 44
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:62: warning: Metric 'std.code.length:total' for region 'nu_suppress_func' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : nu_suppress_func
+	Metric value   : 63
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:77: warning: Metric 'std.code.length:total' for region 'func_no_suppress_within_struct' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func_no_suppress_within_struct
+	Metric value   : 43
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:84: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : suppresed_for_invalid_metric
+	Metric value   : 80
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:90: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : suppresed_for_invalid_metric
+	Metric value   : 96
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:118: warning: Metric 'std.code.length:total' for region 'nu_suppress_for_size' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : nu_suppress_for_size
+	Metric value   : 105
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:146: warning: Metric 'std.code.length:total' for region 'bad_suppress_for_size' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : bad_suppress_for_size
+	Metric value   : 152
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 234 - 234
mainline/tests/general/test_std_suppress/test_basic_limit_4_stdout.gold.txt

@@ -1,234 +1,234 @@
-./test.c:0: warning: Metric 'std.code.length:total' for region '__global__' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : __global__
-	Metric value   : 242
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:10: warning: Metric 'std.code.length:total' for region 'func' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func
-	Metric value   : 79
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:15: warning: Metric 'std.code.length:total' for region 'func2' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func2
-	Metric value   : 61
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:21: warning: Metric 'std.code.length:total' for region 'func3' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func3
-	Metric value   : 109
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:30: warning: Metric 'std.code.length:total' for region 'func4' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func4
-	Metric value   : 144
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:36: warning: Metric 'std.code.length:total' for region 'cl1' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : cl1
-	Metric value   : 62
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:41: warning: Metric 'std.code.length:total' for region 'cl2' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : cl2
-	Metric value   : 62
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:50: warning: Metric 'std.code.length:total' for region 'cl3' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : cl3
-	Metric value   : 80
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:56: warning: Metric 'std.code.length:total' for region 'no_suppress_cl' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : no_suppress_cl
-	Metric value   : 44
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:62: warning: Metric 'std.code.length:total' for region 'nu_suppress_func' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : nu_suppress_func
-	Metric value   : 63
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:67: warning: Metric 'std.code.length:total' for region 'cl2' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : cl2
-	Metric value   : 78
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:72: warning: Metric 'std.code.length:total' for region 'func4' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func4
-	Metric value   : 79
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:77: warning: Metric 'std.code.length:total' for region 'func_no_suppress_within_struct' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func_no_suppress_within_struct
-	Metric value   : 43
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:84: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : suppresed_for_invalid_metric
-	Metric value   : 80
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:90: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : suppresed_for_invalid_metric
-	Metric value   : 96
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:97: warning: Metric 'std.code.length:total' for region 'suppressed_for_size_and_invalid_metric' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : suppressed_for_size_and_invalid_metric
-	Metric value   : 137
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:105: warning: Metric 'std.code.length:total' for region 'suppressed_for_size_and_complexity_and_invalid_metric' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : suppressed_for_size_and_complexity_and_invalid_metric
-	Metric value   : 222
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:112: warning: Metric 'std.code.length:total' for region 'func7' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func7
-	Metric value   : 140
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:118: warning: Metric 'std.code.length:total' for region 'nu_suppress_for_size' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : nu_suppress_for_size
-	Metric value   : 105
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:124: warning: Metric 'std.code.length:total' for region 'no_suppress_for_cyclomatic_complexity' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : no_suppress_for_cyclomatic_complexity
-	Metric value   : 113
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:132: warning: Metric 'std.code.length:total' for region 'func8' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func8
-	Metric value   : 175
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:140: warning: Metric 'std.code.length:total' for region 'func9' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func9
-	Metric value   : 184
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:146: warning: Metric 'std.code.length:total' for region 'bad_suppress_for_size' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : bad_suppress_for_size
-	Metric value   : 152
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:156: warning: Metric 'std.code.length:total' for region 'func10' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func10
-	Metric value   : 179
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:163: warning: Metric 'std.code.length:total' for region 'duplicate_suppression_of_size' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : duplicate_suppression_of_size
-	Metric value   : 130
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
-./test.c:169: warning: Metric 'std.code.length:total' for region 'bad_suppression_of_file_size' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : bad_suppression_of_file_size
-	Metric value   : 164
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
+./test.c:0: warning: Metric 'std.code.length:total' for region '__global__' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : __global__
+	Metric value   : 242
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:10: warning: Metric 'std.code.length:total' for region 'func' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func
+	Metric value   : 79
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:15: warning: Metric 'std.code.length:total' for region 'func2' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func2
+	Metric value   : 61
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:21: warning: Metric 'std.code.length:total' for region 'func3' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func3
+	Metric value   : 109
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:30: warning: Metric 'std.code.length:total' for region 'func4' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func4
+	Metric value   : 144
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:36: warning: Metric 'std.code.length:total' for region 'cl1' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : cl1
+	Metric value   : 62
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:41: warning: Metric 'std.code.length:total' for region 'cl2' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : cl2
+	Metric value   : 62
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:50: warning: Metric 'std.code.length:total' for region 'cl3' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : cl3
+	Metric value   : 80
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:56: warning: Metric 'std.code.length:total' for region 'no_suppress_cl' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : no_suppress_cl
+	Metric value   : 44
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:62: warning: Metric 'std.code.length:total' for region 'nu_suppress_func' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : nu_suppress_func
+	Metric value   : 63
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:67: warning: Metric 'std.code.length:total' for region 'cl2' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : cl2
+	Metric value   : 78
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:72: warning: Metric 'std.code.length:total' for region 'func4' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func4
+	Metric value   : 79
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:77: warning: Metric 'std.code.length:total' for region 'func_no_suppress_within_struct' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func_no_suppress_within_struct
+	Metric value   : 43
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:84: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : suppresed_for_invalid_metric
+	Metric value   : 80
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:90: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : suppresed_for_invalid_metric
+	Metric value   : 96
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:97: warning: Metric 'std.code.length:total' for region 'suppressed_for_size_and_invalid_metric' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : suppressed_for_size_and_invalid_metric
+	Metric value   : 137
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:105: warning: Metric 'std.code.length:total' for region 'suppressed_for_size_and_complexity_and_invalid_metric' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : suppressed_for_size_and_complexity_and_invalid_metric
+	Metric value   : 222
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:112: warning: Metric 'std.code.length:total' for region 'func7' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func7
+	Metric value   : 140
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:118: warning: Metric 'std.code.length:total' for region 'nu_suppress_for_size' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : nu_suppress_for_size
+	Metric value   : 105
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:124: warning: Metric 'std.code.length:total' for region 'no_suppress_for_cyclomatic_complexity' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : no_suppress_for_cyclomatic_complexity
+	Metric value   : 113
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:132: warning: Metric 'std.code.length:total' for region 'func8' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func8
+	Metric value   : 175
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:140: warning: Metric 'std.code.length:total' for region 'func9' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func9
+	Metric value   : 184
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:146: warning: Metric 'std.code.length:total' for region 'bad_suppress_for_size' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : bad_suppress_for_size
+	Metric value   : 152
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:156: warning: Metric 'std.code.length:total' for region 'func10' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func10
+	Metric value   : 179
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:163: warning: Metric 'std.code.length:total' for region 'duplicate_suppression_of_size' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : duplicate_suppression_of_size
+	Metric value   : 130
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+
+./test.c:169: warning: Metric 'std.code.length:total' for region 'bad_suppression_of_file_size' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : bad_suppression_of_file_size
+	Metric value   : 164
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+

+ 72 - 72
mainline/tests/general/test_std_suppress/test_basic_limit_5_stdout.gold.txt

@@ -1,72 +1,72 @@
-./test.c:124: warning: Metric 'std.code.complexity:cyclomatic' for region 'no_suppress_for_cyclomatic_complexity' exceeds the limit.
-	Metric name    : std.code.complexity:cyclomatic
-	Region name    : no_suppress_for_cyclomatic_complexity
-	Metric value   : 1
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:56: warning: Metric 'std.code.length:total' for region 'no_suppress_cl' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : no_suppress_cl
-	Metric value   : 44
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:62: warning: Metric 'std.code.length:total' for region 'nu_suppress_func' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : nu_suppress_func
-	Metric value   : 63
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:77: warning: Metric 'std.code.length:total' for region 'func_no_suppress_within_struct' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : func_no_suppress_within_struct
-	Metric value   : 43
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:84: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : suppresed_for_invalid_metric
-	Metric value   : 80
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:90: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : suppresed_for_invalid_metric
-	Metric value   : 96
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:118: warning: Metric 'std.code.length:total' for region 'nu_suppress_for_size' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : nu_suppress_for_size
-	Metric value   : 105
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
-./test.c:146: warning: Metric 'std.code.length:total' for region 'bad_suppress_for_size' exceeds the limit.
-	Metric name    : std.code.length:total
-	Region name    : bad_suppress_for_size
-	Metric value   : 152
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : False
-
+./test.c:124: warning: Metric 'std.code.complexity:cyclomatic' for region 'no_suppress_for_cyclomatic_complexity' exceeds the limit.
+	Metric name    : std.code.complexity:cyclomatic
+	Region name    : no_suppress_for_cyclomatic_complexity
+	Metric value   : 1
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:56: warning: Metric 'std.code.length:total' for region 'no_suppress_cl' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : no_suppress_cl
+	Metric value   : 44
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:62: warning: Metric 'std.code.length:total' for region 'nu_suppress_func' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : nu_suppress_func
+	Metric value   : 63
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:77: warning: Metric 'std.code.length:total' for region 'func_no_suppress_within_struct' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : func_no_suppress_within_struct
+	Metric value   : 43
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:84: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : suppresed_for_invalid_metric
+	Metric value   : 80
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:90: warning: Metric 'std.code.length:total' for region 'suppresed_for_invalid_metric' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : suppresed_for_invalid_metric
+	Metric value   : 96
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:118: warning: Metric 'std.code.length:total' for region 'nu_suppress_for_size' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : nu_suppress_for_size
+	Metric value   : 105
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+
+./test.c:146: warning: Metric 'std.code.length:total' for region 'bad_suppress_for_size' exceeds the limit.
+	Metric name    : std.code.length:total
+	Region name    : bad_suppress_for_size
+	Metric value   : 152
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : False
+

+ 9 - 9
mainline/tests/general/test_std_suppress/test_basic_limit_size_nosup_stdout.gold.txt

@@ -1,9 +1,9 @@
-./test.c:0: warning: Metric 'std.general:size' exceeds the limit.
-	Metric name    : std.general:size
-	Region name    : None
-	Metric value   : 3023
-	Modified       : None
-	Change trend   : None
-	Limit          : 0.0
-	Suppressed     : True
-
+./test.c:0: warning: Metric 'std.general:size' exceeds the limit.
+	Metric name    : std.general:size
+	Region name    : None
+	Metric value   : 3023
+	Modified       : None
+	Change trend   : None
+	Limit          : 0.0
+	Suppressed     : True
+

+ 66 - 66
mainline/tests/general/test_std_suppress/test_basic_view_default_stdout.gold.txt

@@ -1,66 +1,66 @@
-./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
-	Average        : 0.470588235294
-	Minimum        : 0
-	Maximum        : 1
-	Total          : 8.0
-	Distribution   : 17 regions in total (including 7 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             0 : 0.529 : 0.529 :  9	|||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             1 : 0.471 : 1.000 :  8	|||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.general:size' metric
-	Average        : 3023.0
-	Minimum        : 3023
-	Maximum        : 3023
-	Total          : 3023.0
-	Distribution   : 1 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	          3023 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.suppress.file:count' metric
-	Average        : 1.0 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 1
-	Total          : 1.0
-	Distribution   : 1 files in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of files
-	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.suppress:count' metric
-	Average        : 1.2380952381 (excluding zero metric values)
-	Minimum        : 1
-	Maximum        : 2
-	Total          : 26.0
-	Distribution   : 21 regions in total (including 0 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	             1 : 0.762 : 0.762 : 16	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-	             2 : 0.238 : 1.000 :  5	||||||||||||||||||||||||
-
-./:: info: Overall metrics for 'std.code.length:total' metric
-	Average        : 116.269230769
-	Minimum        : 43
-	Maximum        : 242
-	Total          : 3023.0
-	Distribution   : 26 regions in total (including 19 suppressed)
-	  Metric value : Ratio : R-sum : Number of regions
-	         43-53 : 0.115 : 0.115 :  3	||||||||||||
-	         53-63 : 0.115 : 0.231 :  3	||||||||||||
-	         63-73 : 0.038 : 0.269 :  1	||||
-	         73-83 : 0.192 : 0.462 :  5	|||||||||||||||||||
-	         83-93 : 0.038 : 0.500 :  1	||||
-	        93-103 : 0.038 : 0.538 :  1	||||
-	       103-113 : 0.038 : 0.577 :  1	||||
-	       113-123 : 0.038 : 0.615 :  1	||||
-	       123-133 : 0.038 : 0.654 :  1	||||
-	       133-143 : 0.077 : 0.731 :  2	||||||||
-	       143-153 : 0.077 : 0.808 :  2	||||||||
-	       153-163 : 0.038 : 0.846 :  1	||||
-	       163-173 : 0.038 : 0.885 :  1	||||
-	       173-183 : 0.038 : 0.923 :  1	||||
-	       183-193 : 0.038 : 0.962 :  1	||||
-	       193-242 : 0.038 : 1.000 :  1	||||
-
-./:: info: Directory content:
-	File           : test.c
-
-
+./:: info: Overall metrics for 'std.code.complexity:cyclomatic' metric
+	Average        : 0.470588235294
+	Minimum        : 0
+	Maximum        : 1
+	Total          : 8.0
+	Distribution   : 17 regions in total (including 7 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             0 : 0.529 : 0.529 :  9	|||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             1 : 0.471 : 1.000 :  8	|||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.general:size' metric
+	Average        : 3023.0
+	Minimum        : 3023
+	Maximum        : 3023
+	Total          : 3023.0
+	Distribution   : 1 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	          3023 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.suppress.file:count' metric
+	Average        : 1.0 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 1
+	Total          : 1.0
+	Distribution   : 1 files in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of files
+	             1 : 1.000 : 1.000 : 1	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.suppress:count' metric
+	Average        : 1.2380952381 (excluding zero metric values)
+	Minimum        : 1
+	Maximum        : 2
+	Total          : 26.0
+	Distribution   : 21 regions in total (including 0 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	             1 : 0.762 : 0.762 : 16	||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+	             2 : 0.238 : 1.000 :  5	||||||||||||||||||||||||
+
+./:: info: Overall metrics for 'std.code.length:total' metric
+	Average        : 116.269230769
+	Minimum        : 43
+	Maximum        : 242
+	Total          : 3023.0
+	Distribution   : 26 regions in total (including 19 suppressed)
+	  Metric value : Ratio : R-sum : Number of regions
+	         43-53 : 0.115 : 0.115 :  3	||||||||||||
+	         53-63 : 0.115 : 0.231 :  3	||||||||||||
+	         63-73 : 0.038 : 0.269 :  1	||||
+	         73-83 : 0.192 : 0.462 :  5	|||||||||||||||||||
+	         83-93 : 0.038 : 0.500 :  1	||||
+	        93-103 : 0.038 : 0.538 :  1	||||
+	       103-113 : 0.038 : 0.577 :  1	||||
+	       113-123 : 0.038 : 0.615 :  1	||||
+	       123-133 : 0.038 : 0.654 :  1	||||
+	       133-143 : 0.077 : 0.731 :  2	||||||||
+	       143-153 : 0.077 : 0.808 :  2	||||||||
+	       153-163 : 0.038 : 0.846 :  1	||||
+	       163-173 : 0.038 : 0.885 :  1	||||
+	       173-183 : 0.038 : 0.923 :  1	||||
+	       183-193 : 0.038 : 0.962 :  1	||||
+	       193-242 : 0.038 : 1.000 :  1	||||
+
+./:: info: Directory content:
+	File           : test.c
+
+

+ 3 - 3
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step0_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./test.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./test.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 3 - 3
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step1_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./test.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./test.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 1 - 1
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step1_stdout.gold.txt

@@ -1 +1 @@
-Hello world
+Hello world

+ 3 - 3
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step2_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./test.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./test.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 1 - 1
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step2_stdout.gold.txt

@@ -1 +1 @@
-Hello world
+Hello world

+ 3 - 3
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step3_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./test.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./test.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 1 - 1
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step3_stdout.gold.txt

@@ -1 +1 @@
-std.code.cpp ./test.cpp True
+std.code.cpp ./test.cpp True

+ 3 - 3
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step4_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./test.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./test.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 3 - 3
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step5_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./test.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./test.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 3 - 3
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step6_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./test.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./test.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 3 - 3
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step7_stderr.gold.txt

@@ -1,3 +1,3 @@
-[LOG]: WARNING:	Logging enabled with INFO level
-[LOG]: INFO:	Processing: ./test.cpp
-[LOG]: WARNING:	Done (1 seconds). Exit code: 0
+[LOG]: WARNING:	Logging enabled with INFO level
+[LOG]: INFO:	Processing: ./test.cpp
+[LOG]: WARNING:	Done (1 seconds). Exit code: 0

+ 0 - 0
mainline/tests/system/test_api_tutorial/test_metric_plugin_api_collect_step8_stderr.gold.txt


Деякі файли не було показано, через те що забагато файлів було змінено