mirror of
https://github.com/libvirt/libvirt.git
synced 2026-08-11 13:34:45 -05:00
Fix up "make check"
While running make check, I noticed that it was actually using the virsh binary from my system, in /usr/bin/virsh, and not the one that was just compiled. This is actually caused by a bug in Makefile.am, where we didn't update the PATH to include tools. While here, I also updated all of the scripts to properly define the srcdir, abs_top_srcdir, and abs_top_builddir environment variables. This is required if you want to be able to run the tests standalone (i.e. ./test instead of from make check). I've tested this on both RHEL-5 and Fedora-10 machines, and make check works on both, as does running the individual tests by hand. Signed-off-by: Chris Lalancette <clalance@redhat.com>
This commit is contained in:
+8
-6
@@ -16,13 +16,15 @@
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
if test "$VERBOSE" = yes; then
|
||||
set -x
|
||||
virsh --version
|
||||
fi
|
||||
|
||||
test -z "$srcdir" && srcdir=$(pwd)
|
||||
test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..
|
||||
test -z "$abs_top_builddir" && abs_top_builddir=$(pwd)/..
|
||||
|
||||
if test "$VERBOSE" = yes; then
|
||||
set -x
|
||||
$abs_top_builddir/tools/virsh --version
|
||||
fi
|
||||
|
||||
. "$srcdir/test-lib.sh"
|
||||
|
||||
fail=0
|
||||
@@ -30,7 +32,7 @@ fail=0
|
||||
test_url=test:///default
|
||||
|
||||
# expect this to fail
|
||||
virsh -c $test_url start test > out 2> err && fail=1
|
||||
$abs_top_builddir/tools/virsh -c $test_url start test > out 2> err && fail=1
|
||||
|
||||
# stdout gets a newline
|
||||
echo > exp || fail=1
|
||||
|
||||
Reference in New Issue
Block a user