qa: rbd valgrind tests should use failure exit code

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/qa/suites/rbd/valgrind/validator/memcheck.yaml b/qa/suites/rbd/valgrind/validator/memcheck.yaml
index 4ee49f16eb8e8a7970f61859a5e5a135cfe94542..c5348269a89b261a9d24049a6dd4ae8da54dcffe 100644 (file)
--- a/qa/suites/rbd/valgrind/validator/memcheck.yaml
+++ b/qa/suites/rbd/valgrind/validator/memcheck.yaml
@@ -8,4 +8,4 @@ overrides:
     valgrind: ["--tool=memcheck"]
   workunit:
     env:
-      VALGRIND: "memcheck"
+      VALGRIND: "--tool=memcheck --leak-check=full"

diff --git a/qa/workunits/rbd/test_librbd.sh b/qa/workunits/rbd/test_librbd.sh
index f3999f4bba4a651535d4d62dfbdf36d35dd83115..447306bb41c97e6d0b22989d895fd52fbdfa16bb 100755 (executable)
--- a/qa/workunits/rbd/test_librbd.sh
+++ b/qa/workunits/rbd/test_librbd.sh
@@ -1,8 +1,8 @@
 #!/bin/sh -e
 
 if [ -n "${VALGRIND}" ]; then
-  valgrind --tool=${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \
-    ceph_test_librbd
+  valgrind ${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \
+    --error-exitcode=1 ceph_test_librbd
 else
   ceph_test_librbd
 fi

diff --git a/qa/workunits/rbd/test_librbd_python.sh b/qa/workunits/rbd/test_librbd_python.sh
index 9bef91b4ebfec0adacda1f878e80c0022c242eb8..656a5bd165739d913c4d10529eb4e2ed7c63c639 100755 (executable)
--- a/qa/workunits/rbd/test_librbd_python.sh
+++ b/qa/workunits/rbd/test_librbd_python.sh
@@ -3,7 +3,8 @@
 relpath=$(dirname $0)/../../../src/test/pybind
 
 if [ -n "${VALGRIND}" ]; then
-  valgrind --tool=${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \
+  valgrind ${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \
+    --errors-for-leak-kinds=definite --error-exitcode=1 \
     nosetests -v $relpath/test_rbd.py
 else
   nosetests -v $relpath/test_rbd.py

diff --git a/qa/workunits/rbd/test_rbd_mirror.sh b/qa/workunits/rbd/test_rbd_mirror.sh
index 725e1d3df53e64ca8f081991236e203b48848705..e139dd7e450459f0c41bd6980ccd1fd008c7452a 100755 (executable)
--- a/qa/workunits/rbd/test_rbd_mirror.sh
+++ b/qa/workunits/rbd/test_rbd_mirror.sh
@@ -1,8 +1,8 @@
 #!/bin/sh -e
 
 if [ -n "${VALGRIND}" ]; then
-  valgrind --tool=${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \
-    ceph_test_rbd_mirror
+  valgrind ${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \
+    --error-exitcode=1 ceph_test_rbd_mirror
 else
   ceph_test_rbd_mirror
 fi

diff --git a/src/valgrind.supp b/src/valgrind.supp
index f9c9c717313fe5b11244d4696bfdb03fa0db25ba..369d7b821b440c8c3480af75918bf0bee781945b 100644 (file)
--- a/src/valgrind.supp
+++ b/src/valgrind.supp
@@ -223,3 +223,41 @@
    fun:pthread_create@*
    ...
 }
+
+# rados cython constants
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:PyObject_Malloc
+   fun:PyCode_New
+   fun:__Pyx_InitCachedConstants
+   fun:initrados
+   fun:_PyImport_LoadDynamicModule
+   ...
+   fun:PyImport_ImportModuleLevel
+   ...
+   fun:PyObject_Call
+   fun:PyEval_CallObjectWithKeywords
+   fun:PyEval_EvalFrameEx
+}
+
+# rbd cython constants
+{
+   <insert_a_suppression_name_here>
+   Memcheck:Leak
+   match-leak-kinds: definite
+   fun:malloc
+   fun:PyObject_Malloc
+   fun:PyCode_New
+   fun:__Pyx_InitCachedConstants
+   fun:initrbd
+   fun:_PyImport_LoadDynamicModule
+   ...
+   fun:PyImport_ImportModuleLevel
+   ...
+   fun:PyObject_Call
+   fun:PyEval_CallObjectWithKeywords
+   fun:PyEval_EvalFrameEx
+}