comparison tests/run-tests @ 1558:651690fe6be3

fix run-tests' PYTHONPATH Specify the installation directory for python modules so we can set PYTHONPATH without guessing.
author Robin Farine <robin.farine@terminus.org>
date Sun, 27 Nov 2005 16:37:18 +0100
parents 2073e5a71008
children a5c46cff620f 7d83a351a936
comparison
equal deleted inserted replaced
1557:f7d9823e65df 1558:651690fe6be3
38 echo "Could not create temporary directory! Exiting." 1>&2 38 echo "Could not create temporary directory! Exiting." 1>&2
39 exit 1 39 exit 1
40 } 40 }
41 41
42 TESTDIR="$PWD" 42 TESTDIR="$PWD"
43
44 if [ -d /usr/lib64 ]; then
45 lib=lib64
46 else
47 lib=lib
48 fi
49
50 INST="$HGTMP/install" 43 INST="$HGTMP/install"
44 PYTHONDIR="$INST/lib/python"
51 cd .. 45 cd ..
52 if ${PYTHON-python} setup.py install --home="$INST" > tests/install.err 2>&1 46 if ${PYTHON-python} setup.py install --home="$INST" \
47 --install-lib="$PYTHONDIR" > tests/install.err 2>&1
53 then 48 then
54 rm tests/install.err 49 rm tests/install.err
55 else 50 else
56 cat tests/install.err 51 cat tests/install.err
57 exit 1 52 exit 1
58 fi 53 fi
59 cd "$TESTDIR" 54 cd "$TESTDIR"
60 55
61 PATH="$INST/bin:$PATH"; export PATH 56 PATH="$INST/bin:$PATH"; export PATH
62 PYTHONPATH="$INST/$lib/python"; export PYTHONPATH 57 PYTHONPATH="$PYTHONDIR"; export PYTHONPATH
63
64 58
65 run_one() { 59 run_one() {
66 rm -f "$1.err" 60 rm -f "$1.err"
67 61
68 mkdir "$HGTMP/$1" 62 mkdir "$HGTMP/$1"