From aaaaeeb0ebf8487db9c4cc45f1ece57503431983 Mon Sep 17 00:00:00 2001 From: Michael Vrable Date: Fri, 31 Jan 2014 07:40:24 -0800 Subject: [PATCH] Update tests to allow alternate Python versions (for py3 testing). --- tests/run-test | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/run-test b/tests/run-test index a1fd7c5..843585a 100755 --- a/tests/run-test +++ b/tests/run-test @@ -34,6 +34,9 @@ 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 "================================================================" @@ -68,8 +71,6 @@ cp -a "$BIN_DIR/third_party" "$TREE" log_action "Running second backup..." sleep 5 -BACKUP_DIR="$TMP_DIR/backups" -mkdir "$BACKUP_DIR" $VALGRIND "$BIN_DIR"/cumulus --dest="$BACKUP_DIR" --localdb="$LOCALDB" \ --scheme=test -v "$TREE" @@ -82,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 -- 2.20.1