diff options
| author | Ewan Mellor <ewan@xensource.com> | 2007-02-01 14:41:58 +0000 |
|---|---|---|
| committer | Ewan Mellor <ewan@xensource.com> | 2007-02-01 14:41:58 +0000 |
| commit | edb08a7488e85500f1b96e82965a99745e327f5d (patch) | |
| tree | 60c524a4f55d5f08395777ee9c36860305842cb1 /tools/xm-test | |
| parent | a84714b11ccd74c59d1034cf709e14e05ace4601 (diff) | |
| download | xen-edb08a7488e85500f1b96e82965a99745e327f5d.tar.gz xen-edb08a7488e85500f1b96e82965a99745e327f5d.tar.bz2 xen-edb08a7488e85500f1b96e82965a99745e327f5d.zip | |
Use the new xen-python-path to set PYTHONPATH, rather than trying to do it in
XmTestLib.__init__ (and getting it wrong).
Signed-off-by: Ewan Mellor <ewan@xensource.com>
Diffstat (limited to 'tools/xm-test')
| -rw-r--r-- | tools/xm-test/configure.ac | 4 | ||||
| -rw-r--r-- | tools/xm-test/lib/XmTestLib/__init__.py | 20 |
2 files changed, 3 insertions, 21 deletions
diff --git a/tools/xm-test/configure.ac b/tools/xm-test/configure.ac index ffbf146f34..d3c651a250 100644 --- a/tools/xm-test/configure.ac +++ b/tools/xm-test/configure.ac @@ -11,10 +11,12 @@ AC_PROG_CC #AC_PROG_INSTALL AC_CHECK_PROG([LILO], lilo, lilo, "no", [$PATH]) +XEN_PYTHON_PATH=$(/usr/sbin/xen-python-path) + # Right now, we can assume that the lib/ directory # is two levels above the tests TESTLIB=../../lib -TENV="PYTHONPATH=$PYTHONPATH:$TESTLIB" +TENV="PYTHONPATH=$PYTHONPATH:$TESTLIB:$XEN_PYTHON_PATH" AC_ARG_ENABLE(hvm-support, [[ --enable-hvm-support enable hardware virtual machine assist]], diff --git a/tools/xm-test/lib/XmTestLib/__init__.py b/tools/xm-test/lib/XmTestLib/__init__.py index f638003b08..40aacf7ecd 100644 --- a/tools/xm-test/lib/XmTestLib/__init__.py +++ b/tools/xm-test/lib/XmTestLib/__init__.py @@ -3,26 +3,6 @@ # Author: Dan Smith <danms@us.ibm.com> # -import os.path -import sys - -# Use the auxbin module in Xend to determine the correct Python path. We -# take the first installed instance of auxbin that we find, and then run it -# to determine the correct path, appending that to sys.path. - -AUXBIN = 'xen/util/auxbin.py' - -for p in ['python%s' % sys.version[:3], 'python']: - for l in ['/usr/lib64', '/usr/lib']: - d = os.path.join(l, p) - if os.path.exists(os.path.join(d, AUXBIN)): - sys.path.append(d) - import xen.util.auxbin - libpath = xen.util.auxbin.libpath() - sys.path = sys.path[:-1] - sys.path.append(libpath) - break - from Console import * from Test import * from Xm import * |