From e8784cd78f864c9d21eca6a3bccaa9d8cf8cefdf Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 30 Aug 2015 03:21:57 -0400 Subject: [PATCH] RHEL 7: Fix tests for libguestfs-winsupport 7.2. It doesn't let us use guestfish for arbitrary Windows edits. --- test-data/phony-guests/make-windows-img.sh | 1 + tests/charsets/test-charset-fidelity.c | 2 ++ v2v/test-v2v-virtio-win-iso.sh | 8 +++++++- v2v/test-v2v-windows-conversion.sh | 8 +++++++- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/test-data/phony-guests/make-windows-img.sh b/test-data/phony-guests/make-windows-img.sh index d5c4501..9255b25 100755 --- a/test-data/phony-guests/make-windows-img.sh +++ b/test-data/phony-guests/make-windows-img.sh @@ -37,6 +37,7 @@ fi # Create a disk image. guestfish < "$script" :> "$expected" +cat >> "$script" < "$response" +guestfish --ro -a "$d/windows-sda" < "$script" > "$response" diff -u "$expected" "$response" rm -r $d diff --git a/v2v/test-v2v-windows-conversion.sh b/v2v/test-v2v-windows-conversion.sh index 8406743..40f651e 100755 --- a/v2v/test-v2v-windows-conversion.sh +++ b/v2v/test-v2v-windows-conversion.sh @@ -86,6 +86,12 @@ mktest () :> "$script" :> "$expected" +cat >> "$script" < "$response" +guestfish --ro -a "$d/windows-sda" < "$script" > "$response" diff -u "$expected" "$response" # We also update the Registry several times, for firstboot, and (ONLY -- 1.8.3.1