diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-09-08 00:07:16 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2023-09-08 11:50:41 +0200 |
| commit | 92abca4c3b8bde5f862bb3b724c3577a25f742af (patch) | |
| tree | 06d3a9bc87353460e27c916819e29ac4112e2eb0 /tests/shell/helpers/nft-valgrind-wrapper.sh | |
| parent | 0529cc744b08dc4e63be8787c0ba9020e172e738 (diff) | |
tests/shell: fix handling failures with VALGRIND=y
With VALGRIND=y, on memleaks the tests did not fail. Fix that by passing
"--error-exitcode=122" to valgrind.
But just returning 122 from $NFT command may not correctly fail the test.
Instead, ensure to write a "rc-failed-valrind" file, which is picked up
by "test-wrapper.sh" to properly handle the valgrind failure (and fail
with error code 122 itself).
Also, accept NFT_TEST_VALGRIND_OPTS variable to a pass additional
arguments to valgrind. For example a "--suppressions" file.
Also show the special error code [VALGRIND] in "run-test.sh".
Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/shell/helpers/nft-valgrind-wrapper.sh')
| -rwxr-xr-x | tests/shell/helpers/nft-valgrind-wrapper.sh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/shell/helpers/nft-valgrind-wrapper.sh b/tests/shell/helpers/nft-valgrind-wrapper.sh index 9da50d4d..ad8cc74b 100755 --- a/tests/shell/helpers/nft-valgrind-wrapper.sh +++ b/tests/shell/helpers/nft-valgrind-wrapper.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -SUFFIX="$(date '+%Y%m%d-%H%M%S.%6N')" +SUFFIX="$(date "+%Y%m%d-%H%M%S.%6N.$$")" rc=0 libtool \ @@ -10,8 +10,21 @@ libtool \ --trace-children=yes \ --leak-check=full \ --show-leak-kinds=all \ + --num-callers=100 \ + --error-exitcode=122 \ + $NFT_TEST_VALGRIND_OPTS \ "$NFT_REAL" \ "$@" \ || rc=$? +if [ "$rc" -eq 122 ] ; then + shopt -s nullglob + FILES=( "$NFT_TEST_TESTTMPDIR/valgrind.$SUFFIX."*".log" ) + shopt -u nullglob + ( + printf '%s\n' "args: $*" + printf '%s\n' "${FILES[*]}" + ) >> "$NFT_TEST_TESTTMPDIR/rc-failed-valgrind" +fi + exit $rc |