61 lines
2.1 KiB
Diff
61 lines
2.1 KiB
Diff
|
From 64ca97e910cc086af70b8cf0968cf5039afcb108 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Mon, 20 Feb 2023 17:03:41 +0000
|
||
|
|
Subject: [PATCH] drivers: Swap the names of the tests
|
||
|
|
|
||
|
|
The names of the tests were reversed from what they actually did,
|
||
|
|
causing confusion.
|
||
|
|
|
||
|
|
Fixes: commit d38d2ee5a3d4b09277cd97bc6f63004b7b7e697c
|
||
|
|
(cherry picked from commit ecc562601b5f64778f5598d8663e3a052a0b6976)
|
||
|
|
---
|
||
|
|
drivers/test-virt-drivers-linux.sh | 10 +++++-----
|
||
|
|
drivers/test-virt-drivers-windows.sh | 10 +++++-----
|
||
|
|
2 files changed, 10 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/test-virt-drivers-linux.sh b/drivers/test-virt-drivers-linux.sh
|
||
|
|
index df3f36c64..5404db1e5 100755
|
||
|
|
--- a/drivers/test-virt-drivers-linux.sh
|
||
|
|
+++ b/drivers/test-virt-drivers-linux.sh
|
||
|
|
@@ -20,11 +20,11 @@ set -e
|
||
|
|
|
||
|
|
$TEST_FUNCTIONS
|
||
|
|
skip_if_skipped
|
||
|
|
-skip_unless_phony_guest windows.img
|
||
|
|
+skip_unless_phony_guest fedora.img
|
||
|
|
|
||
|
|
-rm -f actual-windows.xml
|
||
|
|
+rm -f actual-fedora.xml
|
||
|
|
|
||
|
|
-$VG virt-drivers --format=raw -a ../test-data/phony-guests/windows.img > actual-windows.xml
|
||
|
|
-diff -ur -I "generated by" expected-windows.xml actual-windows.xml
|
||
|
|
+$VG virt-drivers --format=raw -a ../test-data/phony-guests/fedora.img > actual-fedora.xml
|
||
|
|
+diff -ur -I "generated by" expected-fedora.xml actual-fedora.xml
|
||
|
|
|
||
|
|
-rm actual-windows.xml
|
||
|
|
+rm actual-fedora.xml
|
||
|
|
diff --git a/drivers/test-virt-drivers-windows.sh b/drivers/test-virt-drivers-windows.sh
|
||
|
|
index 5404db1e5..df3f36c64 100755
|
||
|
|
--- a/drivers/test-virt-drivers-windows.sh
|
||
|
|
+++ b/drivers/test-virt-drivers-windows.sh
|
||
|
|
@@ -20,11 +20,11 @@ set -e
|
||
|
|
|
||
|
|
$TEST_FUNCTIONS
|
||
|
|
skip_if_skipped
|
||
|
|
-skip_unless_phony_guest fedora.img
|
||
|
|
+skip_unless_phony_guest windows.img
|
||
|
|
|
||
|
|
-rm -f actual-fedora.xml
|
||
|
|
+rm -f actual-windows.xml
|
||
|
|
|
||
|
|
-$VG virt-drivers --format=raw -a ../test-data/phony-guests/fedora.img > actual-fedora.xml
|
||
|
|
-diff -ur -I "generated by" expected-fedora.xml actual-fedora.xml
|
||
|
|
+$VG virt-drivers --format=raw -a ../test-data/phony-guests/windows.img > actual-windows.xml
|
||
|
|
+diff -ur -I "generated by" expected-windows.xml actual-windows.xml
|
||
|
|
|
||
|
|
-rm actual-fedora.xml
|
||
|
|
+rm actual-windows.xml
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|