From d77e2bfa80ca021202bf9f0cb0fdc0d87ded60b3 Mon Sep 17 00:00:00 2001 From: Robin Farine Date: Sun, 27 Nov 2005 16:37:18 +0100 Subject: [PATCH] fix run-tests' PYTHONPATH Specify the installation directory for python modules so we can set PYTHONPATH without guessing. --- tests/run-tests | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tests/run-tests b/tests/run-tests index 12cd855749..36568002cf 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -40,16 +40,11 @@ HGTMP="${TMPDIR-/tmp}/hgtests.$RANDOM.$RANDOM.$RANDOM.$$" } TESTDIR="$PWD" - -if [ -d /usr/lib64 ]; then - lib=lib64 -else - lib=lib -fi - INST="$HGTMP/install" +PYTHONDIR="$INST/lib/python" cd .. -if ${PYTHON-python} setup.py install --home="$INST" > tests/install.err 2>&1 +if ${PYTHON-python} setup.py install --home="$INST" \ + --install-lib="$PYTHONDIR" > tests/install.err 2>&1 then rm tests/install.err else @@ -59,8 +54,7 @@ fi cd "$TESTDIR" PATH="$INST/bin:$PATH"; export PATH -PYTHONPATH="$INST/$lib/python"; export PYTHONPATH - +PYTHONPATH="$PYTHONDIR"; export PYTHONPATH run_one() { rm -f "$1.err"