From 6369c67d37c40c312f5403a08a23e5da878688db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexandra=20H=C3=A1jkov=C3=A1?= Date: Tue, 23 Apr 2024 09:17:03 -0400 Subject: [PATCH] Add the tests for --track-fds=yes --xml=yes - none/tests/double_close_range_xml.vgtest - none/tests/fdleak_cmsg_xml.vgtest - none/tests/fdleak_creat_xml.vgtest - none/tests/fdleak_dup_xml.vgtest - none/tests/fdleak_dup2_xml.vgtest - none/tests/fdleak_fcntl_xml.vgtest - none/tests/fdleak_ipv4_xml.vgtest - none/tests/fdleak_open_xml.vgtest - none/tests/fdleak_pipe_xml.vgtest - none/tests/fdleak_socketpair_xml.vgtest - none/tests/file_dclose_xml.vgtest - none/tests/socket_close_xml.vgtest Add a new filter_xml. Note the use of --child-silent-after-fork=yes usage in two vgtests. Maybe this should be the default for --xml=yes? Otherwise xml output will be "corrupted" by output from a fork. https://bugs.kde.org/show_bug.cgi?id=488441 --- none/tests/Makefile.am | 15 ++ none/tests/double_close_range_xml.stderr.exp | 145 +++++++++++++++++ none/tests/double_close_range_xml.vgtest | 4 + none/tests/fdleak_cmsg_xml.stderr.exp | 155 +++++++++++++++++++ none/tests/fdleak_cmsg_xml.vgtest | 6 + none/tests/fdleak_creat_xml.stderr.exp | 93 +++++++++++ none/tests/fdleak_creat_xml.vgtest | 4 + none/tests/fdleak_dup2_xml.stderr.exp | 131 ++++++++++++++++ none/tests/fdleak_dup2_xml.vgtest | 4 + none/tests/fdleak_dup_xml.stderr.exp | 112 ++++++++++++++ none/tests/fdleak_dup_xml.vgtest | 4 + none/tests/fdleak_fcntl_xml.stderr.exp | 112 ++++++++++++++ none/tests/fdleak_fcntl_xml.vgtest | 4 + none/tests/fdleak_ipv4_xml.stderr.exp | 147 ++++++++++++++++++ none/tests/fdleak_ipv4_xml.stderr.exp-nomain | 123 +++++++++++++++ none/tests/fdleak_ipv4_xml.stdout.exp | 1 + none/tests/fdleak_ipv4_xml.vgtest | 6 + none/tests/fdleak_open_xml.stderr.exp | 66 ++++++++ none/tests/fdleak_open_xml.vgtest | 4 + none/tests/fdleak_pipe_xml.stderr.exp | 83 ++++++++++ none/tests/fdleak_pipe_xml.vgtest | 4 + none/tests/fdleak_socketpair_xml.stderr.exp | 83 ++++++++++ none/tests/fdleak_socketpair_xml.vgtest | 4 + none/tests/file_dclose_xml.stderr.exp | 114 ++++++++++++++ none/tests/file_dclose_xml.stderr.exp-nomain | 98 ++++++++++++ none/tests/file_dclose_xml.vgtest | 4 + none/tests/filter_xml | 19 +++ none/tests/socket_close_xml.stderr.exp | 106 +++++++++++++ none/tests/socket_close_xml.vgtest | 4 + 29 files changed, 1655 insertions(+) create mode 100644 none/tests/double_close_range_xml.stderr.exp create mode 100644 none/tests/double_close_range_xml.vgtest create mode 100644 none/tests/fdleak_cmsg_xml.stderr.exp create mode 100644 none/tests/fdleak_cmsg_xml.vgtest create mode 100644 none/tests/fdleak_creat_xml.stderr.exp create mode 100644 none/tests/fdleak_creat_xml.vgtest create mode 100644 none/tests/fdleak_dup2_xml.stderr.exp create mode 100644 none/tests/fdleak_dup2_xml.vgtest create mode 100644 none/tests/fdleak_dup_xml.stderr.exp create mode 100644 none/tests/fdleak_dup_xml.vgtest create mode 100644 none/tests/fdleak_fcntl_xml.stderr.exp create mode 100644 none/tests/fdleak_fcntl_xml.vgtest create mode 100644 none/tests/fdleak_ipv4_xml.stderr.exp create mode 100644 none/tests/fdleak_ipv4_xml.stderr.exp-nomain create mode 100644 none/tests/fdleak_ipv4_xml.stdout.exp create mode 100644 none/tests/fdleak_ipv4_xml.vgtest create mode 100644 none/tests/fdleak_open_xml.stderr.exp create mode 100644 none/tests/fdleak_open_xml.vgtest create mode 100644 none/tests/fdleak_pipe_xml.stderr.exp create mode 100644 none/tests/fdleak_pipe_xml.vgtest create mode 100644 none/tests/fdleak_socketpair_xml.stderr.exp create mode 100644 none/tests/fdleak_socketpair_xml.vgtest create mode 100644 none/tests/file_dclose_xml.stderr.exp create mode 100644 none/tests/file_dclose_xml.stderr.exp-nomain create mode 100644 none/tests/file_dclose_xml.vgtest create mode 100755 none/tests/filter_xml create mode 100644 none/tests/socket_close_xml.stderr.exp create mode 100644 none/tests/socket_close_xml.vgtest diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am index 185993f204..717baee332 100644 --- a/none/tests/Makefile.am +++ b/none/tests/Makefile.am @@ -86,6 +86,7 @@ dist_noinst_SCRIPTS = \ filter_none_discards \ filter_stderr \ filter_timestamp \ + filter_xml \ allexec_prepare_prereq noinst_HEADERS = fdleak.h @@ -122,6 +123,8 @@ EXTRA_DIST = \ coolo_strlen.stderr.exp coolo_strlen.vgtest \ discard.stderr.exp discard.stdout.exp \ discard.vgtest \ + double_close_range_xml.stderr.exp \ + double_close_range_xml.vgtest \ empty-exe.vgtest empty-exe.stderr.exp \ exec-sigmask.vgtest exec-sigmask.stdout.exp \ exec-sigmask.stdout.exp2 exec-sigmask.stdout.exp3 \ @@ -130,14 +133,24 @@ EXTRA_DIST = \ faultstatus.vgtest faultstatus.stderr.exp faultstatus.stderr.exp-s390x \ fcntl_setown.vgtest fcntl_setown.stdout.exp fcntl_setown.stderr.exp \ fdleak_cmsg.stderr.exp fdleak_cmsg.vgtest \ + fdleak_cmsg_xml.stderr.exp fdleak_cmsg_xml.vgtest \ fdleak_creat.stderr.exp fdleak_creat.vgtest \ + fdleak_creat_xml.stderr.exp fdleak_creat_xml.vgtest \ fdleak_dup.stderr.exp fdleak_dup.vgtest \ + fdleak_dup_xml.stderr.exp fdleak_dup_xml.vgtest \ fdleak_dup2.stderr.exp fdleak_dup2.vgtest \ + fdleak_dup2_xml.stderr.exp fdleak_dup2_xml.vgtest \ fdleak_fcntl.stderr.exp fdleak_fcntl.vgtest \ + fdleak_fcntl_xml.stderr.exp fdleak_fcntl_xml.vgtest \ fdleak_ipv4.stderr.exp fdleak_ipv4.stdout.exp fdleak_ipv4.vgtest \ + fdleak_ipv4_xml.stderr.exp fdleak_ipv4_xml.stdout.exp \ + fdleak_ipv4_xml.vgtest \ fdleak_open.stderr.exp fdleak_open.vgtest \ + fdleak_open_xml.stderr.exp fdleak_open_xml.vgtest \ fdleak_pipe.stderr.exp fdleak_pipe.vgtest \ + fdleak_pipe_xml.stderr.exp fdleak_pipe_xml.vgtest \ fdleak_socketpair.stderr.exp fdleak_socketpair.vgtest \ + fdleak_socketpair_xml.stderr.exp fdleak_socketpair_xml.vgtest \ floored.stderr.exp floored.stdout.exp floored.vgtest \ fork.stderr.exp fork.stdout.exp fork.vgtest \ fucomip.stderr.exp fucomip.vgtest \ @@ -228,7 +241,9 @@ EXTRA_DIST = \ process_vm_readv_writev.stderr.exp process_vm_readv_writev.vgtest \ sigprocmask.stderr.exp sigprocmask.vgtest \ socket_close.stderr.exp socket_close.vgtest \ + socket_close_xml.stderr.exp socket_close_xml.vgtest \ file_dclose.stderr.exp file_dclose.vgtest \ + file_dclose_xml.stderr.exp file_dclose_xml.vgtest \ double_close_range.stderr.exp double_close_range.vgtest diff --git a/none/tests/double_close_range_xml.stderr.exp b/none/tests/double_close_range_xml.stderr.exp new file mode 100644 index 0000000000..c21a2bcdd0 --- /dev/null +++ b/none/tests/double_close_range_xml.stderr.exp @@ -0,0 +1,145 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./double_close_range + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + -q + --track-fds=yes + --xml=yes + --xml-fd=2 + + + ... + + + + + RUNNING + + + +close fd 3 +Closing range (3, -1). +Closing range (5, 7). +Double closing range (5, 7). + + 0x........ + ... + FdBadClose + 5 + ... + ... + + + 0x........ + ... + main + ... + double_close_range.c + 33 + + + Previously closed + + + 0x........ + ... + main + ... + double_close_range.c + 29 + + + Originally opened + + + 0x........ + ... + main + ... + double_close_range.c + 26 + + + + + + 0x........ + ... + FdBadClose + 7 + ... + ... + + + 0x........ + ... + main + ... + double_close_range.c + 33 + + + Previously closed + + + 0x........ + ... + main + ... + double_close_range.c + 29 + + + Originally opened + + + 0x........ + ... + main + ... + double_close_range.c + 27 + + + + + + + FINISHED + + + + + + 1 + 0x........ + + + 1 + 0x........ + + + + + + diff --git a/none/tests/double_close_range_xml.vgtest b/none/tests/double_close_range_xml.vgtest new file mode 100644 index 0000000000..fc899af35f --- /dev/null +++ b/none/tests/double_close_range_xml.vgtest @@ -0,0 +1,4 @@ +prog: double_close_range +prereq: test -x double_close_range +vgopts: -q --track-fds=yes --xml=yes --xml-fd=2 +stderr_filter: filter_xml diff --git a/none/tests/fdleak_cmsg_xml.stderr.exp b/none/tests/fdleak_cmsg_xml.stderr.exp new file mode 100644 index 0000000000..39b739be70 --- /dev/null +++ b/none/tests/fdleak_cmsg_xml.stderr.exp @@ -0,0 +1,155 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./fdleak_cmsg + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + --track-fds=all + --xml=yes + --xml-fd=2 + --child-silent-after-fork=yes + + + ... + + + + + RUNNING + + + + + + FINISHED + + + + + 0x........ + ... + FdNotClosed + 5 + ... + ... + + + 0x........ + ... + client + ... + fdleak_cmsg.c + 133 + + + 0x........ + ... + main + ... + fdleak_cmsg.c + 174 + + + + + + 0x........ + ... + FdNotClosed + 4 + ... + ... + + + 0x........ + ... + client + ... + fdleak_cmsg.c + 133 + + + 0x........ + ... + main + ... + fdleak_cmsg.c + 174 + + + + + + 0x........ + ... + FdNotClosed + 3 + ... + + + 0x........ + ... + client + ... + fdleak_cmsg.c + 112 + + + 0x........ + ... + main + ... + fdleak_cmsg.c + 174 + + + + + + 0x........ + ... + FdNotClosed + 2 + ... + ... + + + + 0x........ + ... + FdNotClosed + 1 + ... + ... + + + + 0x........ + ... + FdNotClosed + 0 + ... + ... + + + + + diff --git a/none/tests/fdleak_cmsg_xml.vgtest b/none/tests/fdleak_cmsg_xml.vgtest new file mode 100644 index 0000000000..a012522c70 --- /dev/null +++ b/none/tests/fdleak_cmsg_xml.vgtest @@ -0,0 +1,6 @@ +prog: fdleak_cmsg +# Program forks, so don't output anything after fork/child. +# Should maybe be default for xml output? +vgopts: --track-fds=all --xml=yes --xml-fd=2 --child-silent-after-fork=yes +args: < /dev/null +stderr_filter: filter_xml diff --git a/none/tests/fdleak_creat_xml.stderr.exp b/none/tests/fdleak_creat_xml.stderr.exp new file mode 100644 index 0000000000..fbdc261d61 --- /dev/null +++ b/none/tests/fdleak_creat_xml.stderr.exp @@ -0,0 +1,93 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./fdleak_creat + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + --track-fds=all + --xml=yes + --xml-fd=2 + + + ... + + + + + RUNNING + + + + + + FINISHED + + + + + 0x........ + ... + FdNotClosed + 3 + ... + ... + + + 0x........ + ... + main + ... + fdleak_creat.c + 13 + + + + + + 0x........ + ... + FdNotClosed + 2 + ... + ... + + + + 0x........ + ... + FdNotClosed + 1 + ... + ... + + + + 0x........ + ... + FdNotClosed + 0 + ... + ... + + + + + diff --git a/none/tests/fdleak_creat_xml.vgtest b/none/tests/fdleak_creat_xml.vgtest new file mode 100644 index 0000000000..97fc5fedfb --- /dev/null +++ b/none/tests/fdleak_creat_xml.vgtest @@ -0,0 +1,4 @@ +prog: fdleak_creat +vgopts: --track-fds=all --xml=yes --xml-fd=2 +args: < /dev/null +stderr_filter: filter_xml diff --git a/none/tests/fdleak_dup2_xml.stderr.exp b/none/tests/fdleak_dup2_xml.stderr.exp new file mode 100644 index 0000000000..318093bd39 --- /dev/null +++ b/none/tests/fdleak_dup2_xml.stderr.exp @@ -0,0 +1,131 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./fdleak_dup2 + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + --track-fds=all + --xml=yes + --xml-fd=2 + + + ... + + + + + RUNNING + + + + + + FINISHED + + + + + 0x........ + ... + FdNotClosed + 20 + ... + ... + + + 0x........ + ... + main + ... + fdleak_dup2.c + 15 + + + + + + 0x........ + ... + FdNotClosed + 4 + ... + ... + + + 0x........ + ... + main + ... + fdleak_dup2.c + 16 + + + + + + 0x........ + ... + FdNotClosed + 3 + ... + ... + + + 0x........ + ... + main + ... + fdleak_dup2.c + 12 + + + + + + 0x........ + ... + FdNotClosed + 2 + ... + ... + + + + 0x........ + ... + FdNotClosed + 1 + ... + ... + + + + 0x........ + ... + FdNotClosed + 0 + ... + ... + + + + + diff --git a/none/tests/fdleak_dup2_xml.vgtest b/none/tests/fdleak_dup2_xml.vgtest new file mode 100644 index 0000000000..41fcb36674 --- /dev/null +++ b/none/tests/fdleak_dup2_xml.vgtest @@ -0,0 +1,4 @@ +prog: fdleak_dup2 +vgopts: --track-fds=all --xml=yes --xml-fd=2 +args: < /dev/null +stderr_filter: filter_xml diff --git a/none/tests/fdleak_dup_xml.stderr.exp b/none/tests/fdleak_dup_xml.stderr.exp new file mode 100644 index 0000000000..3fc08d342e --- /dev/null +++ b/none/tests/fdleak_dup_xml.stderr.exp @@ -0,0 +1,112 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./fdleak_dup + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + --track-fds=all + --xml=yes + --xml-fd=2 + + + ... + + + + + RUNNING + + + + + + FINISHED + + + + + 0x........ + ... + FdNotClosed + 4 + ... + ... + + + 0x........ + ... + main + ... + fdleak_dup.c + 12 + + + + + + 0x........ + ... + FdNotClosed + 3 + ... + ... + + + 0x........ + ... + main + ... + fdleak_dup.c + 11 + + + + + + 0x........ + ... + FdNotClosed + 2 + ... + ... + + + + 0x........ + ... + FdNotClosed + 1 + ... + ... + + + + 0x........ + ... + FdNotClosed + 0 + ... + ... + + + + + diff --git a/none/tests/fdleak_dup_xml.vgtest b/none/tests/fdleak_dup_xml.vgtest new file mode 100644 index 0000000000..9b895491ee --- /dev/null +++ b/none/tests/fdleak_dup_xml.vgtest @@ -0,0 +1,4 @@ +prog: fdleak_dup +vgopts: --track-fds=all --xml=yes --xml-fd=2 +args: < /dev/null +stderr_filter: filter_xml diff --git a/none/tests/fdleak_fcntl_xml.stderr.exp b/none/tests/fdleak_fcntl_xml.stderr.exp new file mode 100644 index 0000000000..4f33dc9e36 --- /dev/null +++ b/none/tests/fdleak_fcntl_xml.stderr.exp @@ -0,0 +1,112 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./fdleak_fcntl + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + --track-fds=all + --xml=yes + --xml-fd=2 + + + ... + + + + + RUNNING + + + + + + FINISHED + + + + + 0x........ + ... + FdNotClosed + 4 + ... + ... + + + 0x........ + ... + main + ... + fdleak_fcntl.c + 13 + + + + + + 0x........ + ... + FdNotClosed + 3 + ... + ... + + + 0x........ + ... + main + ... + fdleak_fcntl.c + 12 + + + + + + 0x........ + ... + FdNotClosed + 2 + ... + ... + + + + 0x........ + ... + FdNotClosed + 1 + ... + ... + + + + 0x........ + ... + FdNotClosed + 0 + ... + ... + + + + + diff --git a/none/tests/fdleak_fcntl_xml.vgtest b/none/tests/fdleak_fcntl_xml.vgtest new file mode 100644 index 0000000000..5d629b5b59 --- /dev/null +++ b/none/tests/fdleak_fcntl_xml.vgtest @@ -0,0 +1,4 @@ +prog: fdleak_fcntl +vgopts: --track-fds=all --xml=yes --xml-fd=2 +args: < /dev/null +stderr_filter: filter_xml diff --git a/none/tests/fdleak_ipv4_xml.stderr.exp b/none/tests/fdleak_ipv4_xml.stderr.exp new file mode 100644 index 0000000000..38797041a1 --- /dev/null +++ b/none/tests/fdleak_ipv4_xml.stderr.exp @@ -0,0 +1,147 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./fdleak_ipv4 + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + --track-fds=yes + --xml=yes + --xml-fd=2 + --child-silent-after-fork=yes + + + ... + + + + + RUNNING + + + + + 0x........ + ... + FdBadClose + 4 + ... + + + 0x........ + ... + client + ... + fdleak_ipv4.c + 70 + + + 0x........ + ... + main + ... + fdleak_ipv4.c + 90 + + + Previously closed + + + 0x........ + ... + client + ... + fdleak_ipv4.c + 69 + + + 0x........ + ... + main + ... + fdleak_ipv4.c + 90 + + + Originally opened + + + 0x........ + ... + client + ... + fdleak_ipv4.c + 68 + + + 0x........ + ... + main + ... + fdleak_ipv4.c + 90 + + + + + + + FINISHED + + + + + 0x........ + ... + FdNotClosed + 3 + ... + + + 0x........ + ... + client + ... + fdleak_ipv4.c + 51 + + + 0x........ + ... + main + ... + fdleak_ipv4.c + 90 + + + + + + + 1 + 0x........ + + + + + + + + diff --git a/none/tests/fdleak_ipv4_xml.stderr.exp-nomain b/none/tests/fdleak_ipv4_xml.stderr.exp-nomain new file mode 100644 index 0000000000..8eaa4f20fa --- /dev/null +++ b/none/tests/fdleak_ipv4_xml.stderr.exp-nomain @@ -0,0 +1,123 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./fdleak_ipv4 + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + --track-fds=yes + --xml=yes + --xml-fd=2 + --child-silent-after-fork=yes + + + ... + + + + + RUNNING + + + + + 0x........ + ... + FdBadClose + 4 + ... + + + 0x........ + ... + client + ... + fdleak_ipv4.c + 70 + + + Previously closed + + + 0x........ + ... + client + ... + fdleak_ipv4.c + 69 + + + Originally opened + + + 0x........ + ... + client + ... + fdleak_ipv4.c + 68 + + + + + + + FINISHED + + + + + 0x........ + ... + FdNotClosed + 3 + ... + + + 0x........ + ... + client + ... + fdleak_ipv4.c + 51 + + + 0x........ + ... + main + ... + fdleak_ipv4.c + 90 + + + + + + + 1 + 0x........ + + + + + + + + diff --git a/none/tests/fdleak_ipv4_xml.stdout.exp b/none/tests/fdleak_ipv4_xml.stdout.exp new file mode 100644 index 0000000000..ce01362503 --- /dev/null +++ b/none/tests/fdleak_ipv4_xml.stdout.exp @@ -0,0 +1 @@ +hello diff --git a/none/tests/fdleak_ipv4_xml.vgtest b/none/tests/fdleak_ipv4_xml.vgtest new file mode 100644 index 0000000000..3dd65f6144 --- /dev/null +++ b/none/tests/fdleak_ipv4_xml.vgtest @@ -0,0 +1,6 @@ +prog: fdleak_ipv4 +# Program forks, so don't output anything after fork/child. +# Should maybe be default for xml output? +vgopts: --track-fds=yes --xml=yes --xml-fd=2 --child-silent-after-fork=yes +args: < /dev/null +stderr_filter: filter_xml diff --git a/none/tests/fdleak_open_xml.stderr.exp b/none/tests/fdleak_open_xml.stderr.exp new file mode 100644 index 0000000000..2cde2d1904 --- /dev/null +++ b/none/tests/fdleak_open_xml.stderr.exp @@ -0,0 +1,66 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./fdleak_open + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + --track-fds=yes + --xml=yes + --xml-fd=2 + + + ... + + + + + RUNNING + + + + + + FINISHED + + + + + 0x........ + ... + FdNotClosed + 3 + ... + ... + + + 0x........ + ... + main + ... + fdleak_open.c + 9 + + + + + + + diff --git a/none/tests/fdleak_open_xml.vgtest b/none/tests/fdleak_open_xml.vgtest new file mode 100644 index 0000000000..84a09291c6 --- /dev/null +++ b/none/tests/fdleak_open_xml.vgtest @@ -0,0 +1,4 @@ +prog: fdleak_open +vgopts: --track-fds=yes --xml=yes --xml-fd=2 +args: < /dev/null +stderr_filter: filter_xml diff --git a/none/tests/fdleak_pipe_xml.stderr.exp b/none/tests/fdleak_pipe_xml.stderr.exp new file mode 100644 index 0000000000..2abb5a2660 --- /dev/null +++ b/none/tests/fdleak_pipe_xml.stderr.exp @@ -0,0 +1,83 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./fdleak_pipe + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + --track-fds=yes + --xml=yes + --xml-fd=2 + + + ... + + + + + RUNNING + + + + + + FINISHED + + + + + 0x........ + ... + FdNotClosed + 4 + ... + + + 0x........ + ... + main + ... + fdleak_pipe.c + 10 + + + + + + 0x........ + ... + FdNotClosed + 3 + ... + + + 0x........ + ... + main + ... + fdleak_pipe.c + 10 + + + + + + + diff --git a/none/tests/fdleak_pipe_xml.vgtest b/none/tests/fdleak_pipe_xml.vgtest new file mode 100644 index 0000000000..34ee765f60 --- /dev/null +++ b/none/tests/fdleak_pipe_xml.vgtest @@ -0,0 +1,4 @@ +prog: fdleak_pipe +vgopts: --track-fds=yes --xml=yes --xml-fd=2 +args: < /dev/null +stderr_filter: filter_xml diff --git a/none/tests/fdleak_socketpair_xml.stderr.exp b/none/tests/fdleak_socketpair_xml.stderr.exp new file mode 100644 index 0000000000..bdd31860d8 --- /dev/null +++ b/none/tests/fdleak_socketpair_xml.stderr.exp @@ -0,0 +1,83 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./fdleak_socketpair + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + --track-fds=yes + --xml=yes + --xml-fd=2 + + + ... + + + + + RUNNING + + + + + + FINISHED + + + + + 0x........ + ... + FdNotClosed + 4 + ... + + + 0x........ + ... + main + ... + fdleak_socketpair.c + 13 + + + + + + 0x........ + ... + FdNotClosed + 3 + ... + + + 0x........ + ... + main + ... + fdleak_socketpair.c + 13 + + + + + + + diff --git a/none/tests/fdleak_socketpair_xml.vgtest b/none/tests/fdleak_socketpair_xml.vgtest new file mode 100644 index 0000000000..791c22ec28 --- /dev/null +++ b/none/tests/fdleak_socketpair_xml.vgtest @@ -0,0 +1,4 @@ +prog: fdleak_socketpair +vgopts: --track-fds=yes --xml=yes --xml-fd=2 +args: < /dev/null +stderr_filter: filter_xml diff --git a/none/tests/file_dclose_xml.stderr.exp b/none/tests/file_dclose_xml.stderr.exp new file mode 100644 index 0000000000..4e4bd773cb --- /dev/null +++ b/none/tests/file_dclose_xml.stderr.exp @@ -0,0 +1,114 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./file_dclose + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + -q + --track-fds=yes + --xml=yes + --xml-fd=2 + + + ... + + + + + RUNNING + + + +close 3 +time passes and we close 3 again + + 0x........ + ... + FdBadClose + 3 + ... + ... + + + 0x........ + ... + closefile + ... + file_dclose.c + 17 + + + 0x........ + ... + main + ... + file_dclose.c + 35 + + + Previously closed + + + 0x........ + ... + main + ... + file_dclose.c + 31 + + + Originally opened + + + 0x........ + ... + openfile + ... + file_dclose.c + 11 + + + 0x........ + ... + main + ... + file_dclose.c + 28 + + + + + + + FINISHED + + + + + + 1 + 0x........ + + + + + + diff --git a/none/tests/file_dclose_xml.stderr.exp-nomain b/none/tests/file_dclose_xml.stderr.exp-nomain new file mode 100644 index 0000000000..b0cfc10c5f --- /dev/null +++ b/none/tests/file_dclose_xml.stderr.exp-nomain @@ -0,0 +1,98 @@ + + + + +5 +none + + + Nulgrind, the minimal Valgrind tool + Copyright... + Using Valgrind... + Command: ./file_dclose + + +... +... +none + + + + ... + --command-line-only=yes + --memcheck:leak-check=no + --tool=none + -q + --track-fds=yes + --xml=yes + --xml-fd=2 + + + ... + + + + + RUNNING + + + +close 3 +time passes and we close 3 again + + 0x........ + ... + FdBadClose + 3 + ... + ... + + + 0x........ + ... + closefile + ... + file_dclose.c + 17 + + + Previously closed + + + 0x........ + ... + main + ... + file_dclose.c + 31 + + + Originally opened + + + 0x........ + ... + openfile + ... + file_dclose.c + 11 + + + + + + + FINISHED + + + + + + 1 + 0x........ + + + + + + diff --git a/none/tests/file_dclose_xml.vgtest b/none/tests/file_dclose_xml.vgtest new file mode 100644 index 0000000000..ceddc12d12 --- /dev/null +++ b/none/tests/file_dclose_xml.vgtest @@ -0,0 +1,4 @@ +prog: file_dclose +prereq: test -x file_dclose +vgopts: -q --track-fds=yes --xml=yes --xml-fd=2 +stderr_filter: filter_xml diff --git a/none/tests/filter_xml b/none/tests/filter_xml new file mode 100755 index 0000000000..70fdb65791 --- /dev/null +++ b/none/tests/filter_xml @@ -0,0 +1,19 @@ +#! /bin/sh + +dir=`dirname $0` + +$dir/../../tests/filter_xml_frames | +perl -p -e "s/