Pino Toscano
2015-Oct-21 08:53 UTC
[Libguestfs] [PATCH] tests: use fake-virt-tools also in tests outside v2v
We have phony tools for v2v tests, introduced with
commit c1af1ba32f126b7be275bcc8cd4ea4e5af27a88e; make use of it also in
tests related to v2v outside the v2v directory.
---
p2v/test-virt-p2v.sh | 6 +-----
tests/regressions/rhbz1232192.sh | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/p2v/test-virt-p2v.sh b/p2v/test-virt-p2v.sh
index 8c3731c..540d2fd 100755
--- a/p2v/test-virt-p2v.sh
+++ b/p2v/test-virt-p2v.sh
@@ -44,11 +44,7 @@ if ! test -f $f2 || ! test -s $f2; then
exit 77
fi
-virt_tools_data_dir=${VIRT_TOOLS_DATA_DIR:-/usr/share/virt-tools}
-if ! test -r $virt_tools_data_dir/rhsrvany.exe; then
- echo "$0: test skipped because rhsrvany.exe is not installed"
- exit 77
-fi
+export VIRT_TOOLS_DATA_DIR="../v2v/fake-virt-tools"
d=test-virt-p2v.d
rm -rf $d
diff --git a/tests/regressions/rhbz1232192.sh b/tests/regressions/rhbz1232192.sh
index 5b4b31e..8cd6453 100755
--- a/tests/regressions/rhbz1232192.sh
+++ b/tests/regressions/rhbz1232192.sh
@@ -47,10 +47,6 @@ if [ ! -f ../guests/blank-disk.img ]; then
exit 77
fi
-virt_tools_data_dir=${VIRT_TOOLS_DATA_DIR:-/usr/share/virt-tools}
-if ! test -r $virt_tools_data_dir/rhsrvany.exe; then
- echo "$0: test skipped because rhsrvany.exe is not installed"
- exit 77
-fi
+export VIRT_TOOLS_DATA_DIR="../../v2v/fake-virt-tools"
../../v2v/virt-v2v -i libvirtxml rhbz1232192.xml -o null --no-copy
--
2.1.0
Richard W.M. Jones
2015-Oct-21 10:55 UTC
Re: [Libguestfs] [PATCH] tests: use fake-virt-tools also in tests outside v2v
On Wed, Oct 21, 2015 at 10:53:26AM +0200, Pino Toscano wrote:> We have phony tools for v2v tests, introduced with > commit c1af1ba32f126b7be275bcc8cd4ea4e5af27a88e; make use of it also in > tests related to v2v outside the v2v directory. > --- > p2v/test-virt-p2v.sh | 6 +----- > tests/regressions/rhbz1232192.sh | 6 +----- > 2 files changed, 2 insertions(+), 10 deletions(-) > > diff --git a/p2v/test-virt-p2v.sh b/p2v/test-virt-p2v.sh > index 8c3731c..540d2fd 100755 > --- a/p2v/test-virt-p2v.sh > +++ b/p2v/test-virt-p2v.sh > @@ -44,11 +44,7 @@ if ! test -f $f2 || ! test -s $f2; then > exit 77 > fi > > -virt_tools_data_dir=${VIRT_TOOLS_DATA_DIR:-/usr/share/virt-tools} > -if ! test -r $virt_tools_data_dir/rhsrvany.exe; then > - echo "$0: test skipped because rhsrvany.exe is not installed" > - exit 77 > -fi > +export VIRT_TOOLS_DATA_DIR="../v2v/fake-virt-tools" > > d=test-virt-p2v.d > rm -rf $d > diff --git a/tests/regressions/rhbz1232192.sh b/tests/regressions/rhbz1232192.sh > index 5b4b31e..8cd6453 100755 > --- a/tests/regressions/rhbz1232192.sh > +++ b/tests/regressions/rhbz1232192.sh > @@ -47,10 +47,6 @@ if [ ! -f ../guests/blank-disk.img ]; then > exit 77 > fi > > -virt_tools_data_dir=${VIRT_TOOLS_DATA_DIR:-/usr/share/virt-tools} > -if ! test -r $virt_tools_data_dir/rhsrvany.exe; then > - echo "$0: test skipped because rhsrvany.exe is not installed" > - exit 77 > -fi > +export VIRT_TOOLS_DATA_DIR="../../v2v/fake-virt-tools" > > ../../v2v/virt-v2v -i libvirtxml rhbz1232192.xml -o null --no-copy > -- > 2.1.0ACK. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org