[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] xl: allow check-xl-disk-parse to run against installed xl as well as build dir
# HG changeset patch # User Ian Campbell <ian.campbell@xxxxxxxxxx> # Date 1317981947 -3600 # Node ID 3581fff36a3d0efa60347e5104f8b8565258719f # Parent 1d21a34e0e296b2f3ebdd557d6515348b192cecd xl: allow check-xl-disk-parse to run against installed xl as well as build dir I can't run from the current directory since my build box isn't running Xen so if ./xl doesn't exist use the installed version on the assumption that I've copied the script to a test host. I think running from the build dir needs the blktap2 libraries, so update LD_LIBRARY_PATH as appropriate. Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> Acked-by: Ian Jackson <ian.jackson.citrix.com> Committed-by: Ian Jackson <ian.jackson.citrix.com> --- diff -r 1d21a34e0e29 -r 3581fff36a3d tools/libxl/check-xl-disk-parse --- a/tools/libxl/check-xl-disk-parse Fri Oct 07 11:05:45 2011 +0100 +++ b/tools/libxl/check-xl-disk-parse Fri Oct 07 11:05:47 2011 +0100 @@ -2,6 +2,13 @@ set -e +if [ -x ./xl ] ; then + export LD_LIBRARY_PATH=.:../libxc:../xenstore:../blktap2/control + XL=./xl +else + XL=xl +fi + fprefix=tmp.check-xl-disk-parse expected () { @@ -14,8 +21,7 @@ expected_rc=$1; shift printf "test case %s...\n" "$*" set +e - LD_LIBRARY_PATH=.:../libxc:../xenstore \ - ./xl -N block-attach 0 "$@" </dev/null >$fprefix.actual 2>/dev/null + ${XL} -N block-attach 0 "$@" </dev/null >$fprefix.actual 2>/dev/null actual_rc=$? diff -u $fprefix.expected $fprefix.actual diff_rc=$? _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |