diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-31 15:18:24 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-03-31 15:18:24 +0000 |
| commit | 2ff443c918d1f708d739a167488ace48c61dce75 (patch) | |
| tree | 79429246167a06afe199b37908d8c7b8ada6a867 /gcc/testsuite/lib/gcov.exp | |
| parent | cc403f28bb913c02de306103efb99632d4bc128a (diff) | |
| download | gcc-2ff443c918d1f708d739a167488ace48c61dce75.tar.gz | |
* gcov.c: Add -a & -u options.
(struct arc_info): Add local_span, is_call_non_return,
is_nonlocal_return, is_unconditional flags, remove is_call flag.
(struct block_info): Add flags, is_call_site, is_nonlocal_return
members. Make encodings a union with span member.
(struct function_info): Add blocks_executed, line, src, line_next
members.
(struct coverage_info): Make branches a union with blocks member.
(struct source_info): Add functions member.
(object_summary, program_count): New global variables.
(flag_all_blocks, flag_unconditional): New flags.
(find_source, output_branch_count): New functions.
(print_usage): Adjust.
(options): Adjust.
(process_args): Adjust.
(read_graph_file) <GCOV_TAG_FUNCTION>: Adjust.
<GCOV_TAG_BLOCKS>: Read flags.
<GCOV_TAG_LINES>: Adjust.
(read_count_file): Process SUMMARY tags.
(solve_flow_graph): Set is_unconditional and clear is_call_site
appropriately.
(add_branch_counts): Adjust. Don't count unconditional branches.
(add_line_counts): Deal with all-blocks mode, accumulate block
coverage.
(accumulate_line_counts): Adjust, generate local spanning tree for
all-blocks mode.
(output_lines): Adjust.
* profile.c (branch_prob): Alter GCOV_FUNCTION_TAG record.
* doc/gcov.texi: Document.
testsuite:
* lib/gcov.exp: Adjust call return testing strings.
* g77.dg/gcov/gcov-1.f: Don't expect unconditional branches.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@65090 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/lib/gcov.exp')
| -rw-r--r-- | gcc/testsuite/lib/gcov.exp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/testsuite/lib/gcov.exp b/gcc/testsuite/lib/gcov.exp index a6c70c4e42f..3350d288c04 100644 --- a/gcc/testsuite/lib/gcov.exp +++ b/gcc/testsuite/lib/gcov.exp @@ -168,7 +168,7 @@ proc verify-calls { testcase file } { set n 0 while { [gets $fd line] >= 0 } { regexp "^\[^:\]+: *(\[0-9\]+):" "$line" all n - if [regexp "returns" $line] { + if [regexp "return" $line] { verbose "Processing returns line $n: $line" 3 if [regexp "returns\\((\[0-9 \]+)\\)" "$line" all new_shouldbe] { # All percentages in the current list should have been seen. @@ -179,12 +179,12 @@ proc verify-calls { testcase file } { } # Record the percentages to check for. set shouldbe $new_shouldbe - } elseif [regexp "call +\[0-9\]+ returns (-\[0-9\]+)%" "$line" \ + } elseif [regexp "call +\[0-9\]+ returned (-\[0-9\]+)%" "$line" \ all returns] { # Percentages should never be negative. fail "$n: negative percentage: $returns" incr failed - } elseif [regexp "call +\[0-9\]+ returns (\[0-9\]+)%" "$line" \ + } elseif [regexp "call +\[0-9\]+ returned (\[0-9\]+)%" "$line" \ all returns] { # For branches we check that percentages are not greater than # 100 but call return percentages can be, as for setjmp(), so |