[libvirt] [PATCH] tests: correct PATH in new test, for when running manually

Jim Meyering jim at meyering.net
Tue May 11 15:45:12 UTC 2010


I'd prepended a *file* to PATH, not the containing directory.
The bug would have shown up only when running this test manually.

>From 9339dec535beeeb18c96380f0163d3aeb604a0dc Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Tue, 11 May 2010 17:43:16 +0200
Subject: [PATCH] tests: correct PATH in new test, for when running manually

* tests/virsh-schedinfo: This test sets PATH internally, just in
case you're running it manually.  Normally, the PATH setting from
tests/Makefile.am's TESTS_ENVIRONMENT is sufficient.  Prepend the
correct directory, and take advantage of the PATH setting in one
more case.
---
 tests/virsh-schedinfo |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/virsh-schedinfo b/tests/virsh-schedinfo
index b276a2e..a2ec193 100755
--- a/tests/virsh-schedinfo
+++ b/tests/virsh-schedinfo
@@ -20,17 +20,17 @@
 : ${abs_top_srcdir=$(pwd)/..}
 : ${abs_top_builddir=$(pwd)/..}

-# If $abs_top_builddir/tools/virsh is not early in $PATH, put it there,
+# If $abs_top_builddir/tools is not early in $PATH, put it there,
 # so that we can safely invoke "virsh" simply with its name.
 case $PATH in
-  $abs_top_builddir/tools/src:$abs_top_builddir/tools/virsh:*) ;;
-  $abs_top_builddir/tools/virsh:*) ;;
-  *) PATH=$abs_top_builddir/tools/virsh:$PATH; export PATH ;;
+  $abs_top_builddir/tools/src:$abs_top_builddir/tools:*) ;;
+  $abs_top_builddir/tools:*) ;;
+  *) PATH=$abs_top_builddir/tools:$PATH; export PATH ;;
 esac

 if test "$VERBOSE" = yes; then
   set -x
-  $abs_top_builddir/tools/virsh --version
+  virsh --version
 fi

 . "$srcdir/test-lib.sh"
--
1.7.1.189.g07419




More information about the libvir-list mailing list