Move the 'unsafe' cache test into 'disk-cache' and remove all the
individual cases for one cache mode each.
Signed-off-by: Peter Krempa
---
tests/qemuxml2argvdata/disk-cache-directsync.args | 30
tests/qemuxml2argvdata/disk-cache-directsync.xml | 37 ---
tests/qemuxml2argvdata/disk-cache-unsafe.args | 30
tests/qemuxml2argvdata/disk-cache-unsafe.xml | 37 ---
tests/qemuxml2argvdata/disk-cache-v2-none.args | 30
tests/qemuxml2argvdata/disk-cache-v2-none.xml | 37 ---
tests/qemuxml2argvdata/disk-cache-v2-wb.args | 30
tests/qemuxml2argvdata/disk-cache-v2-wb.xml| 37 ---
tests/qemuxml2argvdata/disk-cache-v2-wt.args | 30
tests/qemuxml2argvdata/disk-cache-v2-wt.xml| 37 ---
tests/qemuxml2argvdata/disk-cache.args | 3 ++
.../qemuxml2argvdata/disk-cache.x86_64-2.6.0.args | 3 ++
.../qemuxml2argvdata/disk-cache.x86_64-2.7.0.args | 4 +++
.../qemuxml2argvdata/disk-cache.x86_64-latest.args | 4 +++
tests/qemuxml2argvdata/disk-cache.xml | 6
tests/qemuxml2argvtest.c | 5 ---
tests/qemuxml2xmloutdata/disk-cache-directsync.xml | 41 --
tests/qemuxml2xmloutdata/disk-cache-unsafe.xml | 41 --
tests/qemuxml2xmloutdata/disk-cache-v2-none.xml| 41 --
tests/qemuxml2xmloutdata/disk-cache-v2-wb.xml | 41 --
tests/qemuxml2xmloutdata/disk-cache-v2-wt.xml | 41 --
tests/qemuxml2xmloutdata/disk-cache.xml| 6
tests/qemuxml2xmltest.c| 5 ---
23 files changed, 26 insertions(+), 550 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/disk-cache-directsync.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache-directsync.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cache-unsafe.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache-unsafe.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-none.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-none.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-wb.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-wb.xml
delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-wt.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache-v2-wt.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache-directsync.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache-unsafe.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache-v2-none.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache-v2-wb.xml
delete mode 100644 tests/qemuxml2xmloutdata/disk-cache-v2-wt.xml
diff --git a/tests/qemuxml2argvdata/disk-cache-directsync.args
b/tests/qemuxml2argvdata/disk-cache-directsync.args
deleted file mode 100644
index 82b2e1a218..00
--- a/tests/qemuxml2argvdata/disk-cache-directsync.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
--name QEMUGuest1 \
--S \
--machine pc,accel=tcg,usb=off,dump-guest-core=off \
--m 214 \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev
socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-server,nowait \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot c \
--usb \
--drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\
-cache=directsync \
--device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-1-0,\
-media=cdrom,readonly=on \
--device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0
diff --git a/tests/qemuxml2argvdata/disk-cache-directsync.xml
b/tests/qemuxml2argvdata/disk-cache-directsync.xml
deleted file mode 100644
index e5b2ad3182..00
--- a/tests/qemuxml2argvdata/disk-cache-directsync.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
- QEMUGuest1
- c7a5fdbd-edaf-9455-926a-d65c16db1809
- 219136
- 219136
- 1
-
-hvm
-
-
-
- destroy
- restart
- destroy
-
-/usr/bin/qemu-system-i686
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/qemuxml2argvdata/disk-cache-unsafe.args
b/tests/qemuxml2argvdata/disk-cache-unsafe.args
deleted file mode 100644
index 6759a02416..00
--- a/tests/qemuxml2argvdata/disk-cache-unsafe.args
+++ /dev/null
@@ -1,30 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/home/test \
-USER=test \
-LOGNAME=test \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i686 \
--name QEMUGuest1 \
--S \
--machine pc,accel=tcg,usb=off,dump
