From da486586a75f56cdc2e6c7e47ef5334c0e14e24a Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Thu, 16 Aug 2012 16:35:30 -0700 Subject: [PATCH] run-cli-tests: Check that virtualenv is found. Commit 343cc792e847ca8901f6c08e41799a2fbbd2ca92 switched us from pip -E to virtualenv, to keep up with the Python ecosystem, but left in this old check for existence of "pip" as a command. We don't strictly need that; what we need is a "virtualenv" command. PIP will be available inside the virtualenv, by the time we get around to running it. Check for virtualenv instead. Signed-off-by: Tommi Virtanen --- src/test/run-cli-tests | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/run-cli-tests b/src/test/run-cli-tests index 1218b8b3a6a82..d8195d4a8b82d 100755 --- a/src/test/run-cli-tests +++ b/src/test/run-cli-tests @@ -1,8 +1,8 @@ #!/bin/sh set -e -if ! command -v pip >/dev/null; then - echo "$0: PIP not installed, skipping python-using tests." 1>&2 +if ! command -v virtualenv >/dev/null; then + echo "$0: virtualenv not installed, skipping python-using tests." 1>&2 exit 1 fi @@ -26,7 +26,6 @@ esac VENV="$BUILDDIR/virtualenv" CRAM_BIN="$VENV/bin/cram" if [ ! -e "$CRAM_BIN" ]; then -# pip -E "$VENV" install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz" virtualenv "$VENV" && $VENV/bin/pip install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz" fi -- 2.39.5