[Xen-changelog] [xen-unstable] Use the new xen-python-path to set PYTHONPATH, rather than trying to do it in

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Date 1170340918 0
# Node ID a9f30d8eea7554845b18e75518d5b4c4fc97481f
# Parent  afb41f6bc30a9bde738f355b401f7ae6bcaf3d7d
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@xxxxxxxxxxxxx>
---
 tools/xm-test/configure.ac              |    4 +++-
 tools/xm-test/lib/XmTestLib/__init__.py |   20 --------------------
 2 files changed, 3 insertions(+), 21 deletions(-)

diff -r afb41f6bc30a -r a9f30d8eea75 tools/xm-test/configure.ac
--- a/tools/xm-test/configure.ac        Thu Feb 01 12:48:53 2007 +0000
+++ b/tools/xm-test/configure.ac        Thu Feb 01 14:41:58 2007 +0000
@@ -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 -r afb41f6bc30a -r a9f30d8eea75 tools/xm-test/lib/XmTestLib/__init__.py
--- a/tools/xm-test/lib/XmTestLib/__init__.py   Thu Feb 01 12:48:53 2007 +0000
+++ b/tools/xm-test/lib/XmTestLib/__init__.py   Thu Feb 01 14:41:58 2007 +0000
@@ -2,26 +2,6 @@
 # Copyright (C) International Business Machines Corp., 2005
 # Author: Dan Smith <danms@xxxxxxxxxx>
 #
-
-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 *

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog