10:10 a.m.
There is no change, this just moves the test files.
---
.gitignore | 1 +
configure.ac | 2 +
p2v/test-virt-p2v.sh | 2 +-
test-data/Makefile.am | 1 +
test-data/fake-virt-tools/Makefile.am | 29 +++++++++++++
test-data/fake-virt-tools/rhev-apt.exe | 1 +
test-data/fake-virt-tools/rhsrvany.exe | 1 +
test-data/fake-virtio-win/Makefile.am | 49 ++++++++++++++++++++++
.../fake-virtio-win/drivers/i386/Win7/netkvm.cat | 1 +
.../fake-virtio-win/drivers/i386/Win7/netkvm.inf | 1 +
.../fake-virtio-win/drivers/i386/Win7/netkvm.sys | 1 +
.../fake-virtio-win/drivers/i386/Win7/qxl.cat | 1 +
.../fake-virtio-win/drivers/i386/Win7/qxl.inf | 1 +
.../fake-virtio-win/drivers/i386/Win7/qxl.sys | 1 +
.../fake-virtio-win/drivers/i386/Win7/vioscsi.cat | 1 +
.../fake-virtio-win/drivers/i386/Win7/vioscsi.inf | 1 +
.../fake-virtio-win/drivers/i386/Win7/vioscsi.sys | 1 +
.../fake-virtio-win/drivers/i386/Win7/viostor.cat | 1 +
.../fake-virtio-win/drivers/i386/Win7/viostor.inf | 1 +
.../fake-virtio-win/drivers/i386/Win7/viostor.sys | 1 +
v2v/Makefile.am | 17 --------
v2v/fake-virt-tools/rhev-apt.exe | 1 -
v2v/fake-virt-tools/rhsrvany.exe | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/netkvm.cat | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/netkvm.inf | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/netkvm.sys | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/qxl.cat | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/qxl.inf | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/qxl.sys | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.cat | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.inf | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.sys | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/viostor.cat | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/viostor.inf | 1 -
v2v/fake-virtio-win/drivers/i386/Win7/viostor.sys | 1 -
v2v/test-v2v-cdrom.sh | 4 +-
v2v/test-v2v-i-disk.sh | 2 +-
v2v/test-v2v-i-ova-formats.sh | 2 +-
v2v/test-v2v-i-ova-gz.sh | 2 +-
v2v/test-v2v-i-ova-two-disks.sh | 4 +-
v2v/test-v2v-i-ova.sh | 4 +-
v2v/test-v2v-in-place.sh | 4 +-
v2v/test-v2v-networks-and-bridges.sh | 2 +-
v2v/test-v2v-no-copy.sh | 2 +-
v2v/test-v2v-o-glance.sh | 2 +-
v2v/test-v2v-o-libvirt.sh | 2 +-
v2v/test-v2v-o-null.sh | 2 +-
v2v/test-v2v-o-qemu.sh | 2 +-
v2v/test-v2v-o-rhev.sh | 2 +-
v2v/test-v2v-o-vdsm-options.sh | 2 +-
v2v/test-v2v-oa-option.sh | 2 +-
v2v/test-v2v-of-option.sh | 2 +-
v2v/test-v2v-on-option.sh | 2 +-
v2v/test-v2v-sound.sh | 2 +-
v2v/test-v2v-virtio-win-iso.sh | 5 ++-
v2v/test-v2v-windows-conversion.sh | 4 +-
56 files changed, 125 insertions(+), 59 deletions(-)
create mode 100644 test-data/fake-virt-tools/Makefile.am
create mode 100644 test-data/fake-virt-tools/rhev-apt.exe
create mode 100644 test-data/fake-virt-tools/rhsrvany.exe
create mode 100644 test-data/fake-virtio-win/Makefile.am
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/netkvm.cat
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/netkvm.inf
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/netkvm.sys
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.cat
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.inf
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.sys
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/viostor.cat
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/viostor.inf
create mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/viostor.sys
delete mode 100644 v2v/fake-virt-tools/rhev-apt.exe
delete mode 100644 v2v/fake-virt-tools/rhsrvany.exe
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/netkvm.cat
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/netkvm.inf
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/netkvm.sys
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/qxl.cat
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/qxl.inf
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/qxl.sys
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.cat
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.inf
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.sys
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/viostor.cat
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/viostor.inf
delete mode 100644 v2v/fake-virtio-win/drivers/i386/Win7/viostor.sys
diff --git a/.gitignore b/.gitignore
index 8091608..ebccae7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -506,6 +506,7 @@ Makefile.in
/tests/syslinux/syslinux-guest.img
/test-data/test.iso
/test-data/blank-disks/blank-disk-*
+/test-data/fake-virtio-win/fake-virtio-win.iso
/test-data/files/100kallnewlines
/test-data/files/100kallspaces
/test-data/files/100kallzeroes
diff --git a/configure.ac b/configure.ac
index bd3e5e9..f1a31b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,6 +240,8 @@ AC_CONFIG_FILES([Makefile
test-data/Makefile
test-data/binaries/Makefile
test-data/blank-disks/Makefile
+ test-data/fake-virtio-win/Makefile
+ test-data/fake-virt-tools/Makefile
test-data/files/Makefile
test-data/phony-guests/Makefile
test-data/phony-guests/guests.xml
diff --git a/p2v/test-virt-p2v.sh b/p2v/test-virt-p2v.sh
index fa5ccc0..d6e9c5f 100755
--- a/p2v/test-virt-p2v.sh
+++ b/p2v/test-virt-p2v.sh
@@ -44,7 +44,7 @@ if ! test -f $f2 || ! test -s $f2; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="../v2v/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-virt-p2v.d
rm -rf $d
diff --git a/test-data/Makefile.am b/test-data/Makefile.am
index 3afbd71..1a0f09b 100644
--- a/test-data/Makefile.am
+++ b/test-data/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS += blank-disks
if ENABLE_APPLIANCE
SUBDIRS += phony-guests
endif
+SUBDIRS += fake-virtio-win fake-virt-tools
SUBDIRS += files
SUBDIRS += .
diff --git a/test-data/fake-virt-tools/Makefile.am
b/test-data/fake-virt-tools/Makefile.am
new file mode 100644
index 0000000..ff158d4
--- /dev/null
+++ b/test-data/fake-virt-tools/Makefile.am
@@ -0,0 +1,29 @@
+# libguestfs test images
+# Copyright (C) 2009-2015 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# Fake virt-tools.
+#
+# Tests in the v2v subdirectory can set VIRT_TOOLS_DATA_DIR to point
+# to this directory in order to test conversions.
+#
+# Note that the "binaries" are not real!
+
+include $(top_srcdir)/subdir-rules.mk
+
+EXTRA_DIST = \
+ rhev-apt.exe \
+ rhsrvany.exe
diff --git a/test-data/fake-virt-tools/rhev-apt.exe
b/test-data/fake-virt-tools/rhev-apt.exe
new file mode 100644
index 0000000..2f472e5
--- /dev/null
+++ b/test-data/fake-virt-tools/rhev-apt.exe
@@ -0,0 +1 @@
+This is a fake rhev-apt.exe, used for testing only
diff --git a/test-data/fake-virt-tools/rhsrvany.exe
b/test-data/fake-virt-tools/rhsrvany.exe
new file mode 100644
index 0000000..b474349
--- /dev/null
+++ b/test-data/fake-virt-tools/rhsrvany.exe
@@ -0,0 +1 @@
+This is a fake rhsrvany.exe, used for testing only
diff --git a/test-data/fake-virtio-win/Makefile.am
b/test-data/fake-virtio-win/Makefile.am
new file mode 100644
index 0000000..5b45b36
--- /dev/null
+++ b/test-data/fake-virtio-win/Makefile.am
@@ -0,0 +1,49 @@
+# libguestfs test images
+# Copyright (C) 2009-2015 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+# Fake virtio-win (Windows virtio) drivers.
+#
+# Tests in the v2v subdirectory can set VIRTIO_WIN to point to this
+# directory, or to the .iso file in this directory, in order to test
+# conversions.
+#
+# Note that the "drivers" are not real!
+
+include $(top_srcdir)/subdir-rules.mk
+
+drivers = \
+ drivers/i386/Win7/qxl.cat \
+ drivers/i386/Win7/qxl.inf \
+ drivers/i386/Win7/qxl.sys \
+ drivers/i386/Win7/netkvm.cat \
+ drivers/i386/Win7/netkvm.inf \
+ drivers/i386/Win7/netkvm.sys \
+ drivers/i386/Win7/vioscsi.cat \
+ drivers/i386/Win7/vioscsi.inf \
+ drivers/i386/Win7/vioscsi.sys \
+ drivers/i386/Win7/viostor.cat \
+ drivers/i386/Win7/viostor.inf \
+ drivers/i386/Win7/viostor.sys
+
+EXTRA_DIST = $(drivers)
+
+check_DATA = fake-virtio-win.iso
+
+CLEANFILES = fake-virtio-win.iso
+
+fake-virtio-win.iso: $(drivers)
+ $(GENISOIMAGE) -J -r -o $@ -graft-points drivers=drivers
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/netkvm.cat
b/test-data/fake-virtio-win/drivers/i386/Win7/netkvm.cat
new file mode 100644
index 0000000..be81e94
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/netkvm.cat
@@ -0,0 +1 @@
+This is a fake netkvm.cat, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/netkvm.inf
b/test-data/fake-virtio-win/drivers/i386/Win7/netkvm.inf
new file mode 100644
index 0000000..ab4a68f
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/netkvm.inf
@@ -0,0 +1 @@
+This is a fake netkvm.inf, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/netkvm.sys
b/test-data/fake-virtio-win/drivers/i386/Win7/netkvm.sys
new file mode 100644
index 0000000..3a2afae
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/netkvm.sys
@@ -0,0 +1 @@
+This is a fake netkvm.sys, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat
b/test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat
new file mode 100644
index 0000000..0af6a9a
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat
@@ -0,0 +1 @@
+This is a fake qxl.cat, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf
b/test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf
new file mode 100644
index 0000000..3fb759d
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf
@@ -0,0 +1 @@
+This is a fake qxl.inf, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys
b/test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys
new file mode 100644
index 0000000..118ede0
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys
@@ -0,0 +1 @@
+This is a fake qxl.sys, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.cat
b/test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.cat
new file mode 100644
index 0000000..056535f
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.cat
@@ -0,0 +1 @@
+This is a fake vioscsi.cat, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.inf
b/test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.inf
new file mode 100644
index 0000000..97b3884
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.inf
@@ -0,0 +1 @@
+This is a fake vioscsi.inf, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.sys
b/test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.sys
new file mode 100644
index 0000000..102a797
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/vioscsi.sys
@@ -0,0 +1 @@
+This is a fake vioscsi.sys, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/viostor.cat
b/test-data/fake-virtio-win/drivers/i386/Win7/viostor.cat
new file mode 100644
index 0000000..6c32f85
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/viostor.cat
@@ -0,0 +1 @@
+This is a fake viostor.cat, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/viostor.inf
b/test-data/fake-virtio-win/drivers/i386/Win7/viostor.inf
new file mode 100644
index 0000000..18f416d
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/viostor.inf
@@ -0,0 +1 @@
+This is a fake viostor.inf, used for testing only
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/viostor.sys
b/test-data/fake-virtio-win/drivers/i386/Win7/viostor.sys
new file mode 100644
index 0000000..3f9c147
--- /dev/null
+++ b/test-data/fake-virtio-win/drivers/i386/Win7/viostor.sys
@@ -0,0 +1 @@
+This is a fake viostor.sys, used for testing only
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index 5e02b83..49eeedc 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -21,8 +21,6 @@ EXTRA_DIST = \
$(SOURCES_MLI) $(SOURCES_ML) $(SOURCES_C) \
v2v_unit_tests.ml \
$(TESTS) $(SLOW_TESTS) \
- $(FAKE_VIRT_TOOLS) \
- $(FAKE_VIRTIO_WIN) \
HACKING \
test-v2v-cdrom.expected \
test-v2v-cdrom.xml \
@@ -112,21 +110,6 @@ SOURCES_C = \
utils-c.c \
xml-c.c
-fake_virt_tools_dir = fake-virt-tools
-FAKE_VIRT_TOOLS = \
- $(fake_virt_tools_dir)/rhsrvany.exe \
- $(fake_virt_tools_dir)/rhev-apt.exe
-
-fake_virtio_win_dir = fake-virtio-win
-FAKE_VIRTIO_WIN = $(wildcard $(fake_virtio_win_dir)/*/*/*/*)
-
-fake_virtio_win_iso = fake-virtio-win.iso
-check_DATA = $(fake_virtio_win_iso)
-CLEANFILES += $(fake_virtio_win_iso)
-
-$(fake_virtio_win_iso): $(FAKE_VIRTIO_WIN)
- $(GENISOIMAGE) -J -r -o $@ $(fake_virtio_win_dir)
-
if HAVE_OCAML
bin_PROGRAMS = virt-v2v
diff --git a/v2v/fake-virt-tools/rhev-apt.exe b/v2v/fake-virt-tools/rhev-apt.exe
deleted file mode 100644
index 2f472e5..0000000
--- a/v2v/fake-virt-tools/rhev-apt.exe
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake rhev-apt.exe, used for testing only
diff --git a/v2v/fake-virt-tools/rhsrvany.exe b/v2v/fake-virt-tools/rhsrvany.exe
deleted file mode 100644
index b474349..0000000
--- a/v2v/fake-virt-tools/rhsrvany.exe
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake rhsrvany.exe, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/netkvm.cat
b/v2v/fake-virtio-win/drivers/i386/Win7/netkvm.cat
deleted file mode 100644
index be81e94..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/netkvm.cat
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake netkvm.cat, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/netkvm.inf
b/v2v/fake-virtio-win/drivers/i386/Win7/netkvm.inf
deleted file mode 100644
index ab4a68f..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/netkvm.inf
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake netkvm.inf, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/netkvm.sys
b/v2v/fake-virtio-win/drivers/i386/Win7/netkvm.sys
deleted file mode 100644
index 3a2afae..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/netkvm.sys
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake netkvm.sys, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/qxl.cat
b/v2v/fake-virtio-win/drivers/i386/Win7/qxl.cat
deleted file mode 100644
index 0af6a9a..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/qxl.cat
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake qxl.cat, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/qxl.inf
b/v2v/fake-virtio-win/drivers/i386/Win7/qxl.inf
deleted file mode 100644
index 3fb759d..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/qxl.inf
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake qxl.inf, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/qxl.sys
b/v2v/fake-virtio-win/drivers/i386/Win7/qxl.sys
deleted file mode 100644
index 118ede0..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/qxl.sys
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake qxl.sys, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.cat
b/v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.cat
deleted file mode 100644
index 056535f..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.cat
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake vioscsi.cat, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.inf
b/v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.inf
deleted file mode 100644
index 97b3884..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.inf
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake vioscsi.inf, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.sys
b/v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.sys
deleted file mode 100644
index 102a797..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/vioscsi.sys
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake vioscsi.sys, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/viostor.cat
b/v2v/fake-virtio-win/drivers/i386/Win7/viostor.cat
deleted file mode 100644
index 6c32f85..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/viostor.cat
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake viostor.cat, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/viostor.inf
b/v2v/fake-virtio-win/drivers/i386/Win7/viostor.inf
deleted file mode 100644
index 18f416d..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/viostor.inf
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake viostor.inf, used for testing only
diff --git a/v2v/fake-virtio-win/drivers/i386/Win7/viostor.sys
b/v2v/fake-virtio-win/drivers/i386/Win7/viostor.sys
deleted file mode 100644
index 3f9c147..0000000
--- a/v2v/fake-virtio-win/drivers/i386/Win7/viostor.sys
+++ /dev/null
@@ -1 +0,0 @@
-This is a fake viostor.sys, used for testing only
diff --git a/v2v/test-v2v-cdrom.sh b/v2v/test-v2v-cdrom.sh
index a7679fa..0679923 100755
--- a/v2v/test-v2v-cdrom.sh
+++ b/v2v/test-v2v-cdrom.sh
@@ -48,8 +48,8 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
-export VIRTIO_WIN="$PWD/fake-virtio-win"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
+export VIRTIO_WIN="$srcdir/../test-data/fake-virtio-win"
d=test-v2v-cdrom.d
rm -rf $d
diff --git a/v2v/test-v2v-i-disk.sh b/v2v/test-v2v-i-disk.sh
index 8d99ce8..b806a44 100755
--- a/v2v/test-v2v-i-disk.sh
+++ b/v2v/test-v2v-i-disk.sh
@@ -38,7 +38,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-i-disk.d
rm -rf $d
diff --git a/v2v/test-v2v-i-ova-formats.sh b/v2v/test-v2v-i-ova-formats.sh
index 86ae5e0..bf04bdf 100755
--- a/v2v/test-v2v-i-ova-formats.sh
+++ b/v2v/test-v2v-i-ova-formats.sh
@@ -44,7 +44,7 @@ if [ "$(guestfish get-backend)" = "uml" ]; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-i-ova-formats.d
rm -rf $d
diff --git a/v2v/test-v2v-i-ova-gz.sh b/v2v/test-v2v-i-ova-gz.sh
index 57c2942..cffa972 100755
--- a/v2v/test-v2v-i-ova-gz.sh
+++ b/v2v/test-v2v-i-ova-gz.sh
@@ -32,7 +32,7 @@ if [ "$(guestfish get-backend)" = "uml" ]; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-i-ova-gz.d
rm -rf $d
diff --git a/v2v/test-v2v-i-ova-two-disks.sh b/v2v/test-v2v-i-ova-two-disks.sh
index fc7ace7..85b23f0 100755
--- a/v2v/test-v2v-i-ova-two-disks.sh
+++ b/v2v/test-v2v-i-ova-two-disks.sh
@@ -32,8 +32,8 @@ if [ "$(guestfish get-backend)" = "uml" ]; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
-export VIRTIO_WIN="$PWD/fake-virtio-win"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
+export VIRTIO_WIN="$srcdir/../test-data/fake-virtio-win"
d=test-v2v-i-ova-two-disks.d
rm -rf $d
diff --git a/v2v/test-v2v-i-ova.sh b/v2v/test-v2v-i-ova.sh
index 3589631..484e098 100755
--- a/v2v/test-v2v-i-ova.sh
+++ b/v2v/test-v2v-i-ova.sh
@@ -38,8 +38,8 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
-export VIRTIO_WIN="$PWD/fake-virtio-win"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
+export VIRTIO_WIN="$srcdir/../test-data/fake-virtio-win"
d=test-v2v-i-ova.d
rm -rf $d
diff --git a/v2v/test-v2v-in-place.sh b/v2v/test-v2v-in-place.sh
index 40f08cc..251e78c 100755
--- a/v2v/test-v2v-in-place.sh
+++ b/v2v/test-v2v-in-place.sh
@@ -41,8 +41,8 @@ if ! test -f $img_base || ! test -s $img_base; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
-export VIRTIO_WIN="$PWD/fake-virtio-win"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
+export VIRTIO_WIN="$srcdir/../test-data/fake-virtio-win"
d=$PWD/test-v2v-in-place.d
rm -rf $d
diff --git a/v2v/test-v2v-networks-and-bridges.sh b/v2v/test-v2v-networks-and-bridges.sh
index efef74c..5b3d6e0 100755
--- a/v2v/test-v2v-networks-and-bridges.sh
+++ b/v2v/test-v2v-networks-and-bridges.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-networks-and-bridges.d
rm -rf $d
diff --git a/v2v/test-v2v-no-copy.sh b/v2v/test-v2v-no-copy.sh
index 27d58ce..6309c92 100755
--- a/v2v/test-v2v-no-copy.sh
+++ b/v2v/test-v2v-no-copy.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-no-copy.d
rm -rf $d
diff --git a/v2v/test-v2v-o-glance.sh b/v2v/test-v2v-o-glance.sh
index fe4bdef..7620365 100755
--- a/v2v/test-v2v-o-glance.sh
+++ b/v2v/test-v2v-o-glance.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
# We don't want to upload to the real glance, so introduce a fake
# glance binary.
diff --git a/v2v/test-v2v-o-libvirt.sh b/v2v/test-v2v-o-libvirt.sh
index 972f05e..c409222 100755
--- a/v2v/test-v2v-o-libvirt.sh
+++ b/v2v/test-v2v-o-libvirt.sh
@@ -58,7 +58,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
# Generate a random guest name.
guestname=tmp-$(tr -cd 'a-f0-9' < /dev/urandom | head -c 8)
diff --git a/v2v/test-v2v-o-null.sh b/v2v/test-v2v-o-null.sh
index c21383e..657cd53 100755
--- a/v2v/test-v2v-o-null.sh
+++ b/v2v/test-v2v-o-null.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
$VG virt-v2v --debug-gc \
-i libvirt -ic "$libvirt_uri" windows \
diff --git a/v2v/test-v2v-o-qemu.sh b/v2v/test-v2v-o-qemu.sh
index 03fbe83..3a5618d 100755
--- a/v2v/test-v2v-o-qemu.sh
+++ b/v2v/test-v2v-o-qemu.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-o-qemu.d
rm -rf $d
diff --git a/v2v/test-v2v-o-rhev.sh b/v2v/test-v2v-o-rhev.sh
index 639b6a5..43e2d42 100755
--- a/v2v/test-v2v-o-rhev.sh
+++ b/v2v/test-v2v-o-rhev.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-o-rhev.d
rm -rf $d
diff --git a/v2v/test-v2v-o-vdsm-options.sh b/v2v/test-v2v-o-vdsm-options.sh
index 671f600..6ae5d56 100755
--- a/v2v/test-v2v-o-vdsm-options.sh
+++ b/v2v/test-v2v-o-vdsm-options.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-o-vdsm-options.d
rm -rf $d
diff --git a/v2v/test-v2v-oa-option.sh b/v2v/test-v2v-oa-option.sh
index f3ffed8..3649d6c 100755
--- a/v2v/test-v2v-oa-option.sh
+++ b/v2v/test-v2v-oa-option.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-oa-option.d
rm -rf $d
diff --git a/v2v/test-v2v-of-option.sh b/v2v/test-v2v-of-option.sh
index 16e2fd0..3a0525f 100755
--- a/v2v/test-v2v-of-option.sh
+++ b/v2v/test-v2v-of-option.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-of-option.d
rm -rf $d
diff --git a/v2v/test-v2v-on-option.sh b/v2v/test-v2v-on-option.sh
index da55fe3..1816fb4 100755
--- a/v2v/test-v2v-on-option.sh
+++ b/v2v/test-v2v-on-option.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-on-option.d
rm -rf $d
diff --git a/v2v/test-v2v-sound.sh b/v2v/test-v2v-sound.sh
index e5bcc8c..594bfff 100755
--- a/v2v/test-v2v-sound.sh
+++ b/v2v/test-v2v-sound.sh
@@ -41,7 +41,7 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
d=test-v2v-sound.d
rm -rf $d
diff --git a/v2v/test-v2v-virtio-win-iso.sh b/v2v/test-v2v-virtio-win-iso.sh
index 8a9182d..dbebbe7 100755
--- a/v2v/test-v2v-virtio-win-iso.sh
+++ b/v2v/test-v2v-virtio-win-iso.sh
@@ -42,8 +42,9 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
-export VIRTIO_WIN="$PWD/fake-virtio-win.iso"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
+# NB: This is located in the builddir:
+export VIRTIO_WIN="../test-data/fake-virtio-win/fake-virtio-win.iso"
if ! test -f "$VIRTIO_WIN"; then
echo "$0: test skipped because fake virtio-win iso image was not created"
diff --git a/v2v/test-v2v-windows-conversion.sh b/v2v/test-v2v-windows-conversion.sh
index 6d7d256..8406743 100755
--- a/v2v/test-v2v-windows-conversion.sh
+++ b/v2v/test-v2v-windows-conversion.sh
@@ -41,8 +41,8 @@ if ! test -f $f || ! test -s $f; then
exit 77
fi
-export VIRT_TOOLS_DATA_DIR="$PWD/fake-virt-tools"
-export VIRTIO_WIN="$PWD/fake-virtio-win"
+export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
+export VIRTIO_WIN="$srcdir/../test-data/fake-virtio-win"
# Return a random element from the array 'choices'.
function random_choice
--
2.5.0