Skip to content

Commit

Permalink
tests: remove the fake Windows guest drivers for the QXL device
Browse files Browse the repository at this point in the history 
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>
Message-Id: <20211202094637.8020-11-lersek@redhat.com>
  • Loading branch information
@lersek
lersek committed Dec 2, 2021
1 parent a1ce40b commit f6eca25
Show file tree
Hide file tree
Showing 20 changed files with 2 additions and 54 deletions.
16 changes: 0 additions & 16 deletions test-data/fake-virtio-win/Makefile.am
View file
Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.cat
View file

This file was deleted.

2 changes: 0 additions & 2 deletions test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.inf
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxl.sys
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/amd64/Win2008R2/qxldd.dll
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/amd64/Win7/qxl.cat
View file

This file was deleted.

2 changes: 0 additions & 2 deletions test-data/fake-virtio-win/drivers/amd64/Win7/qxl.inf
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/amd64/Win7/qxl.sys
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/amd64/Win7/qxldd.dll
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/i386/Win7/qxl.cat
View file

This file was deleted.

2 changes: 0 additions & 2 deletions test-data/fake-virtio-win/drivers/i386/Win7/qxl.inf
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/i386/Win7/qxl.sys
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/i386/Win7/qxldd.dll
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/i386/WinXP/qxl.cat
View file

This file was deleted.

2 changes: 0 additions & 2 deletions test-data/fake-virtio-win/drivers/i386/WinXP/qxl.inf
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/i386/WinXP/qxl.sys
View file

This file was deleted.

1 change: 0 additions & 1 deletion test-data/fake-virtio-win/drivers/i386/WinXP/qxldd.dll
View file

This file was deleted.

2 changes: 1 addition & 1 deletion tests/test-v2v-in-place.sh
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/test-v2v-windows-conversion.sh
View file
Expand Up @@ -82,7 +82,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
Expand Down
16 changes: 0 additions & 16 deletions v2v/v2v_unit_tests.ml
View file
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit f6eca25

Please sign in to comment.