From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 27 Apr 2015 09:00:39 +0000 (-0400)
Subject: qa/workunits/rbd: add support for running API tests under valgrind
X-Git-Tag: v9.0.1~47^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30b762bc137e546b41570f01e2676c25aaea9f7f;p=ceph.git

qa/workunits/rbd: add support for running API tests under valgrind

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

diff --git a/qa/workunits/rbd/test_librbd.sh b/qa/workunits/rbd/test_librbd.sh
index d35cfafb1594..f3999f4bba4a 100755
--- a/qa/workunits/rbd/test_librbd.sh
+++ b/qa/workunits/rbd/test_librbd.sh
@@ -1,5 +1,9 @@
 #!/bin/sh -e
 
-ceph_test_librbd
-
+if [ -n "${VALGRIND}" ]; then
+  valgrind --tool=${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \
+    ceph_test_librbd
+else
+  ceph_test_librbd
+fi
 exit 0
diff --git a/qa/workunits/rbd/test_librbd_python.sh b/qa/workunits/rbd/test_librbd_python.sh
index 0d89b369d024..eba66bab6035 100755
--- a/qa/workunits/rbd/test_librbd_python.sh
+++ b/qa/workunits/rbd/test_librbd_python.sh
@@ -4,5 +4,11 @@ CEPH_REF=${CEPH_REF:-master}
 #wget -q https://raw.github.com/ceph/ceph/$CEPH_REF/src/test/pybind/test_rbd.py
 wget -O test_rbd.py "https://ceph.com/git/?p=ceph.git;a=blob_plain;hb=$CEPH_REF;f=src/test/pybind/test_rbd.py" || \
     wget -O test_rbd.py "https://ceph.com/git/?p=ceph.git;a=blob_plain;hb=ref/heads/$CEPH_REF;f=src/test/pybind/test_rbd.py"
-nosetests -v test_rbd
+
+if [ -n "${VALGRIND}" ]; then
+  valgrind --tool=${VALGRIND} --suppressions=${TESTDIR}/valgrind.supp \
+    nosetests -v test_rbd
+else
+  nosetests -v test_rbd
+fi
 exit 0