aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2023-06-28 21:40:43 +0200
committerEgor Tensin <Egor.Tensin@gmail.com>2023-06-28 21:41:23 +0200
commitb954d86bafcfbb75fa49edd0589b979d86785e98 (patch)
tree5b702eaa01b1da1106d269e96d51ab91ce87f4d3
parentvalgrind: exit with an error after leak detection (diff)
downloadcimple-b954d86bafcfbb75fa49edd0589b979d86785e98.tar.gz
cimple-b954d86bafcfbb75fa49edd0589b979d86785e98.zip
test: skip ci.sh w/ Valgrind
-rwxr-xr-xsrc/valgrind.sh2
-rw-r--r--test/conftest.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/valgrind.sh b/src/valgrind.sh
index 160b573..db05a1d 100755
--- a/src/valgrind.sh
+++ b/src/valgrind.sh
@@ -15,4 +15,4 @@ exec valgrind -q \
--track-origins=yes \
--track-fds=yes \
--trace-children=yes \
- -- "$@"
+ "$@"
diff --git a/test/conftest.py b/test/conftest.py
index b96f08f..9e81afd 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -102,7 +102,9 @@ def base_cmd_line(pytestconfig):
cmd_line = CmdLine.unbuffered()
valgrind = pytestconfig.getoption(PARAM_VALGRIND.codename)
if valgrind is not None:
- cmd_line = CmdLine.wrap(CmdLine(valgrind), cmd_line)
+ # Signal to Valgrind that ci.sh should obviously be exempt from memory
+ # leak checking:
+ cmd_line = CmdLine.wrap(CmdLine(valgrind, '--trace-children-skip=*/ci.sh', '--'), cmd_line)
return cmd_line