X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=tests%2Frun-test;h=843585a579014f122957ebde50197aab32d97ba7;hp=7d3ec0cb116899be96ed08e09cf546d66093a637;hb=HEAD;hpb=fbe7425ae37564a99eb49133561eea5f1a6c7877

diff --git a/tests/run-test b/tests/run-test
index 7d3ec0c..843585a 100755
--- a/tests/run-test
+++ b/tests/run-test
@@ -31,6 +31,12 @@ BIN_DIR="$(readlink -f "$TEST_DIR/..")"
 # Directory where temporary files used for the tests can be stored.
 TMP_DIR="$(readlink -f "$(mktemp -d cumulus-tests.XXXXXX)")"
 
+# Command to use for running memory leak tests.
+VALGRIND="valgrind --tool=memcheck --leak-check=full --log-file=$TMP_DIR/valgrind.log"
+
+# Python interpreter to test with.
+PYTHON="${PYTHON:-python2}"
+
 log_action() {
     echo
     echo "================================================================"
@@ -65,9 +71,7 @@ cp -a "$BIN_DIR/third_party" "$TREE"
 
 log_action "Running second backup..."
 sleep 5
-BACKUP_DIR="$TMP_DIR/backups"
-mkdir "$BACKUP_DIR"
-"$BIN_DIR"/cumulus --dest="$BACKUP_DIR" --localdb="$LOCALDB" \
+$VALGRIND "$BIN_DIR"/cumulus --dest="$BACKUP_DIR" --localdb="$LOCALDB" \
     --scheme=test -v "$TREE"
 
 log_action "Restoring snapshots"
@@ -79,5 +83,6 @@ for s in $snapshots; do
     i=$((i + 1))
     dest="$TMP_DIR/restore-$i"
     mkdir -p "$dest"
-    "$BIN_DIR"/cumulus-util --store="$BACKUP_DIR" restore-snapshot $s "$dest"
+    "$PYTHON" "$BIN_DIR"/cumulus-util --store="$BACKUP_DIR" \
+        restore-snapshot $s "$dest"
 done