# HG changeset patch # User Robin Farine # Date 1133105838 -3600 # Node ID 651690fe6be3276f2890f70927953aa6349b9e42 # Parent f7d9823e65df150cc17f5af1970cb924ba4eefbe fix run-tests' PYTHONPATH Specify the installation directory for python modules so we can set PYTHONPATH without guessing. diff --git a/tests/run-tests b/tests/run-tests --- a/tests/run-tests +++ b/tests/run-tests @@ -40,16 +40,11 @@ HGTMP="${TMPDIR-/tmp}/hgtests.$RANDOM.$R } 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"