mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-08 22:39:56 +00:00
db68d6b164
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>
36 lines
784 B
Bash
Executable File
36 lines
784 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test -z "$srcdir" && srcdir=$(pwd)
|
|
test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/..
|
|
test -z "$abs_top_builddir" && abs_top_builddir=$(pwd)/..
|
|
test -z "$abs_srcdir" && abs_srcdir=$(pwd)
|
|
test -z "$abs_builddir" && abs_builddir=$(pwd)
|
|
|
|
if test "$VERBOSE" = yes; then
|
|
set -x
|
|
$abs_top_builddir/tools/virsh --version
|
|
fi
|
|
|
|
. "$srcdir/test-lib.sh"
|
|
|
|
set -e
|
|
|
|
fail=0
|
|
i=1
|
|
data_dir=$abs_srcdir/confdata
|
|
for f in $(cd "$data_dir" && echo *.conf)
|
|
do
|
|
"$abs_builddir/conftest" "$data_dir/$f" > "$f-actual"
|
|
expected="$data_dir"/`echo "$f" | sed s+\.conf$+\.out+`
|
|
if compare "$expected" "$f-actual"; then
|
|
msg=OK
|
|
else
|
|
msg=FAILED
|
|
fail=1
|
|
fi
|
|
printf "%2d) %-60s ... %s\n" $i "$f" $msg
|
|
i=`expr $i + 1`
|
|
done
|
|
|
|
(exit $fail); exit $fail
|