310 lines
14 KiB
Diff
310 lines
14 KiB
Diff
From 3a24ebd59a5cba8caf92dcbb4345258e584e8dad Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Mon, 1 Nov 2021 17:08:17 +0100
|
|
Subject: [PATCH] tests: remove the fake Windows guest drivers for the QXL
|
|
device
|
|
|
|
The QXL drivers no longer matter when converting Windows guests; remove
|
|
the fake images and their references from the test suite.
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1961107
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
---
|
|
test-data/fake-virtio-win/Makefile.am | 16 ----------------
|
|
.../drivers/amd64/Win2008R2/qxl.inf | 2 --
|
|
.../fake-virtio-win/drivers/amd64/Win7/qxl.inf | 2 --
|
|
.../fake-virtio-win/drivers/i386/Win7/qxl.inf | 2 --
|
|
.../fake-virtio-win/drivers/i386/WinXP/qxl.inf | 2 --
|
|
v2v/v2v_unit_tests.ml | 16 ----------------
|
|
.../drivers/amd64/Win2008R2/qxl.cat | 1 -
|
|
.../drivers/amd64/Win2008R2/qxl.sys | 1 -
|
|
.../drivers/amd64/Win2008R2/qxldd.dll | 1 -
|
|
.../fake-virtio-win/drivers/amd64/Win7/qxl.cat | 1 -
|
|
.../fake-virtio-win/drivers/amd64/Win7/qxl.sys | 1 -
|
|
.../fake-virtio-win/drivers/amd64/Win7/qxldd.dll | 1 -
|
|
.../fake-virtio-win/drivers/i386/Win7/qxl.cat | 1 -
|
|
.../fake-virtio-win/drivers/i386/Win7/qxl.sys | 1 -
|
|
.../fake-virtio-win/drivers/i386/Win7/qxldd.dll | 1 -
|
|
.../fake-virtio-win/drivers/i386/WinXP/qxl.cat | 1 -
|
|
.../fake-virtio-win/drivers/i386/WinXP/qxl.sys | 1 -
|
|
.../fake-virtio-win/drivers/i386/WinXP/qxldd.dll | 1 -
|
|
tests/test-v2v-in-place.sh | 2 +-
|
|
tests/test-v2v-windows-conversion.sh | 2 +-
|
|
20 files changed, 2 insertions(+), 54 deletions(-)
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.inf
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win7/qxl.inf
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/i386/WinXP/qxl.inf
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.cat
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.sys
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxldd.dll
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win7/qxl.cat
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win7/qxl.sys
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/amd64/Win7/qxldd.dll
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/i386/Win7/qxldd.dll
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/i386/WinXP/qxl.cat
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/i386/WinXP/qxl.sys
|
|
delete mode 100644 test-data/fake-virtio-win/drivers/i386/WinXP/qxldd.dll
|
|
|
|
diff --git a/test-data/fake-virtio-win/Makefile.am b/test-data/fake-virtio-win/Makefile.am
|
|
index 55b91a95a5e5..60c2d8245db9 100644
|
|
--- a/test-data/fake-virtio-win/Makefile.am
|
|
+++ b/test-data/fake-virtio-win/Makefile.am
|
|
@@ -38,10 +38,6 @@ drivers = \
|
|
drivers/amd64/Win2008R2/netkvm.cat \
|
|
drivers/amd64/Win2008R2/netkvm.inf \
|
|
drivers/amd64/Win2008R2/netkvm.sys \
|
|
- drivers/amd64/Win2008R2/qxl.cat \
|
|
- drivers/amd64/Win2008R2/qxldd.dll \
|
|
- drivers/amd64/Win2008R2/qxl.inf \
|
|
- drivers/amd64/Win2008R2/qxl.sys \
|
|
drivers/amd64/Win2008R2/vioscsi.cat \
|
|
drivers/amd64/Win2008R2/vioscsi.inf \
|
|
drivers/amd64/Win2008R2/vioscsi.sys \
|
|
@@ -75,10 +71,6 @@ drivers = \
|
|
drivers/amd64/Win7/netkvm.cat \
|
|
drivers/amd64/Win7/netkvm.inf \
|
|
drivers/amd64/Win7/netkvm.sys \
|
|
- drivers/amd64/Win7/qxl.cat \
|
|
- drivers/amd64/Win7/qxldd.dll \
|
|
- drivers/amd64/Win7/qxl.inf \
|
|
- drivers/amd64/Win7/qxl.sys \
|
|
drivers/amd64/Win7/vioscsi.cat \
|
|
drivers/amd64/Win7/vioscsi.inf \
|
|
drivers/amd64/Win7/vioscsi.sys \
|
|
@@ -121,10 +113,6 @@ drivers = \
|
|
drivers/i386/Win7/netkvm.cat \
|
|
drivers/i386/Win7/netkvm.inf \
|
|
drivers/i386/Win7/netkvm.sys \
|
|
- drivers/i386/Win7/qxl.cat \
|
|
- drivers/i386/Win7/qxldd.dll \
|
|
- drivers/i386/Win7/qxl.inf \
|
|
- drivers/i386/Win7/qxl.sys \
|
|
drivers/i386/Win7/vioscsi.cat \
|
|
drivers/i386/Win7/vioscsi.inf \
|
|
drivers/i386/Win7/vioscsi.sys \
|
|
@@ -152,10 +140,6 @@ drivers = \
|
|
drivers/i386/WinXP/netkvm.cat \
|
|
drivers/i386/WinXP/netkvm.inf \
|
|
drivers/i386/WinXP/netkvm.sys \
|
|
- drivers/i386/WinXP/qxl.cat \
|
|
- drivers/i386/WinXP/qxldd.dll \
|
|
- drivers/i386/WinXP/qxl.inf \
|
|
- drivers/i386/WinXP/qxl.sys \
|
|
drivers/i386/WinXP/viostor.cat \
|
|
drivers/i386/WinXP/viostor.inf \
|
|
drivers/i386/WinXP/viostor.sys
|
|
diff --git a/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.inf b/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.inf
|
|
deleted file mode 100644
|
|
index 67e3fab0f3a7..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.inf
|
|
+++ /dev/null
|
|
@@ -1,2 +0,0 @@
|
|
-[Version]
|
|
-DriverVer = 10/29/2013,6.1.0.10020
|
|
diff --git a/test-data/fake-virtio-win/drivers/amd64/Win7/qxl.inf b/test-data/fake-virtio-win/drivers/amd64/Win7/qxl.inf
|
|
deleted file mode 100644
|
|
index 3310167e395f..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/amd64/Win7/qxl.inf
|
|
+++ /dev/null
|
|
@@ -1,2 +0,0 @@
|
|
-[Version]
|
|
-DriverVer = 07/17/2013,6.1.0.10018
|
|
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf b/test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf
|
|
deleted file mode 100644
|
|
index 3310167e395f..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf
|
|
+++ /dev/null
|
|
@@ -1,2 +0,0 @@
|
|
-[Version]
|
|
-DriverVer = 07/17/2013,6.1.0.10018
|
|
diff --git a/test-data/fake-virtio-win/drivers/i386/WinXP/qxl.inf b/test-data/fake-virtio-win/drivers/i386/WinXP/qxl.inf
|
|
deleted file mode 100644
|
|
index d1fe96b24e79..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/i386/WinXP/qxl.inf
|
|
+++ /dev/null
|
|
@@ -1,2 +0,0 @@
|
|
-[Version]
|
|
-DriverVer = 07/17/2013,5.1.0.10018
|
|
diff --git a/v2v/v2v_unit_tests.ml b/v2v/v2v_unit_tests.ml
|
|
index 584c5bb7b395..889f7998cf3b 100644
|
|
--- a/v2v/v2v_unit_tests.ml
|
|
+++ b/v2v/v2v_unit_tests.ml
|
|
@@ -603,15 +603,11 @@ let test_virtio_iso_path_matches_guest_os ctx =
|
|
"drivers/i386/Win2008/vioscsi.inf", Some win2k8_32;
|
|
"drivers/i386/Win7/viostor.inf", Some win7_32;
|
|
"drivers/i386/Win7/viostor.sys", Some win7_32;
|
|
- "drivers/i386/Win7/qxldd.dll", Some win7_32;
|
|
- "drivers/i386/Win7/qxl.sys", Some win7_32;
|
|
"drivers/i386/Win7/vioscsi.cat", Some win7_32;
|
|
"drivers/i386/Win7/netkvm.inf", Some win7_32;
|
|
"drivers/i386/Win7/netkvm.sys", Some win7_32;
|
|
"drivers/i386/Win7/viostor.cat", Some win7_32;
|
|
- "drivers/i386/Win7/qxl.inf", Some win7_32;
|
|
"drivers/i386/Win7/vioscsi.sys", Some win7_32;
|
|
- "drivers/i386/Win7/qxl.cat", Some win7_32;
|
|
"drivers/i386/Win7/netkvm.cat", Some win7_32;
|
|
"drivers/i386/Win7/vioscsi.inf", Some win7_32;
|
|
"drivers/i386/Win2003/viostor.inf", Some win2k3_32;
|
|
@@ -631,13 +627,9 @@ let test_virtio_iso_path_matches_guest_os ctx =
|
|
"drivers/i386/Win8/vioscsi.inf", Some win8_32;
|
|
"drivers/i386/WinXP/viostor.inf", Some winxp_32;
|
|
"drivers/i386/WinXP/viostor.sys", Some winxp_32;
|
|
- "drivers/i386/WinXP/qxldd.dll", Some winxp_32;
|
|
- "drivers/i386/WinXP/qxl.sys", Some winxp_32;
|
|
"drivers/i386/WinXP/netkvm.inf", Some winxp_32;
|
|
"drivers/i386/WinXP/netkvm.sys", Some winxp_32;
|
|
"drivers/i386/WinXP/viostor.cat", Some winxp_32;
|
|
- "drivers/i386/WinXP/qxl.inf", Some winxp_32;
|
|
- "drivers/i386/WinXP/qxl.cat", Some winxp_32;
|
|
"drivers/i386/WinXP/netkvm.cat", Some winxp_32;
|
|
"drivers/amd64/Win8.1/viostor.inf", Some win8_1_64;
|
|
"drivers/amd64/Win8.1/viostor.sys", Some win8_1_64;
|
|
@@ -659,15 +651,11 @@ let test_virtio_iso_path_matches_guest_os ctx =
|
|
"drivers/amd64/Win2008/vioscsi.inf", Some win2k8_64;
|
|
"drivers/amd64/Win7/viostor.inf", Some win7_64;
|
|
"drivers/amd64/Win7/viostor.sys", Some win7_64;
|
|
- "drivers/amd64/Win7/qxldd.dll", Some win7_64;
|
|
- "drivers/amd64/Win7/qxl.sys", Some win7_64;
|
|
"drivers/amd64/Win7/vioscsi.cat", Some win7_64;
|
|
"drivers/amd64/Win7/netkvm.inf", Some win7_64;
|
|
"drivers/amd64/Win7/netkvm.sys", Some win7_64;
|
|
"drivers/amd64/Win7/viostor.cat", Some win7_64;
|
|
- "drivers/amd64/Win7/qxl.inf", Some win7_64;
|
|
"drivers/amd64/Win7/vioscsi.sys", Some win7_64;
|
|
- "drivers/amd64/Win7/qxl.cat", Some win7_64;
|
|
"drivers/amd64/Win7/netkvm.cat", Some win7_64;
|
|
"drivers/amd64/Win7/vioscsi.inf", Some win7_64;
|
|
"drivers/amd64/Win2003/viostor.inf", Some win2k3_64;
|
|
@@ -696,15 +684,11 @@ let test_virtio_iso_path_matches_guest_os ctx =
|
|
"drivers/amd64/Win2012/vioscsi.inf", Some win2k12_64;
|
|
"drivers/amd64/Win2008R2/viostor.inf", Some win2k8r2_64;
|
|
"drivers/amd64/Win2008R2/viostor.sys", Some win2k8r2_64;
|
|
- "drivers/amd64/Win2008R2/qxldd.dll", Some win2k8r2_64;
|
|
- "drivers/amd64/Win2008R2/qxl.sys", Some win2k8r2_64;
|
|
"drivers/amd64/Win2008R2/vioscsi.cat", Some win2k8r2_64;
|
|
"drivers/amd64/Win2008R2/netkvm.inf", Some win2k8r2_64;
|
|
"drivers/amd64/Win2008R2/netkvm.sys", Some win2k8r2_64;
|
|
"drivers/amd64/Win2008R2/viostor.cat", Some win2k8r2_64;
|
|
- "drivers/amd64/Win2008R2/qxl.inf", Some win2k8r2_64;
|
|
"drivers/amd64/Win2008R2/vioscsi.sys", Some win2k8r2_64;
|
|
- "drivers/amd64/Win2008R2/qxl.cat", Some win2k8r2_64;
|
|
"drivers/amd64/Win2008R2/netkvm.cat", Some win2k8r2_64;
|
|
"drivers/amd64/Win2008R2/vioscsi.inf", Some win2k8r2_64;
|
|
"drivers/amd64/Win2012R2/viostor.inf", Some win2k12r2_64;
|
|
diff --git a/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.cat b/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.cat
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.cat
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.sys b/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.sys
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.sys
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxldd.dll b/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxldd.dll
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxldd.dll
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/amd64/Win7/qxl.cat b/test-data/fake-virtio-win/drivers/amd64/Win7/qxl.cat
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/amd64/Win7/qxl.cat
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/amd64/Win7/qxl.sys b/test-data/fake-virtio-win/drivers/amd64/Win7/qxl.sys
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/amd64/Win7/qxl.sys
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/amd64/Win7/qxldd.dll b/test-data/fake-virtio-win/drivers/amd64/Win7/qxldd.dll
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/amd64/Win7/qxldd.dll
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat b/test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys b/test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/i386/Win7/qxldd.dll b/test-data/fake-virtio-win/drivers/i386/Win7/qxldd.dll
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/i386/Win7/qxldd.dll
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/i386/WinXP/qxl.cat b/test-data/fake-virtio-win/drivers/i386/WinXP/qxl.cat
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/i386/WinXP/qxl.cat
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/i386/WinXP/qxl.sys b/test-data/fake-virtio-win/drivers/i386/WinXP/qxl.sys
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/i386/WinXP/qxl.sys
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/test-data/fake-virtio-win/drivers/i386/WinXP/qxldd.dll b/test-data/fake-virtio-win/drivers/i386/WinXP/qxldd.dll
|
|
deleted file mode 100644
|
|
index acbc962012bc..000000000000
|
|
--- a/test-data/fake-virtio-win/drivers/i386/WinXP/qxldd.dll
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-fake
|
|
diff --git a/tests/test-v2v-in-place.sh b/tests/test-v2v-in-place.sh
|
|
index 9da8fa63a99b..c5fee2f9f591 100755
|
|
--- a/tests/test-v2v-in-place.sh
|
|
+++ b/tests/test-v2v-in-place.sh
|
|
@@ -95,7 +95,7 @@ mktest "is-file \"$firstboot_dir/firstboot.bat\"" true
|
|
mktest "is-dir \"$firstboot_dir/scripts\"" true
|
|
virtio_dir="/Windows/Drivers/VirtIO"
|
|
mktest "is-dir \"$virtio_dir\"" true
|
|
-for drv in netkvm qxl vioscsi viostor; do
|
|
+for drv in netkvm vioscsi viostor; do
|
|
for sfx in cat inf sys; do
|
|
mktest "is-file \"$virtio_dir/$drv.$sfx\"" true
|
|
done
|
|
diff --git a/tests/test-v2v-windows-conversion.sh b/tests/test-v2v-windows-conversion.sh
|
|
index 4b422c5bc9d8..1ff41f6a7c89 100755
|
|
--- a/tests/test-v2v-windows-conversion.sh
|
|
+++ b/tests/test-v2v-windows-conversion.sh
|
|
@@ -88,7 +88,7 @@ mktest "is-file \"$firstboot_dir/firstboot.bat\"" true
|
|
mktest "is-dir \"$firstboot_dir/scripts\"" true
|
|
virtio_dir="/Windows/Drivers/VirtIO"
|
|
mktest "is-dir \"$virtio_dir\"" true
|
|
-for drv in netkvm qxl vioscsi viostor; do
|
|
+for drv in netkvm vioscsi viostor; do
|
|
for sfx in cat inf sys; do
|
|
mktest "is-file \"$virtio_dir/$drv.$sfx\"" true
|
|
done
|
|
--
|
|
2.19.1.3.g30247aa5d201
|
|
|