From patchwork Sat May 14 21:39:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 67812 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp873927qge; Sat, 14 May 2016 14:45:03 -0700 (PDT) X-Received: by 10.140.41.200 with SMTP id z66mr22002980qgz.20.1463262303959; Sat, 14 May 2016 14:45:03 -0700 (PDT) Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com. [209.132.183.25]) by mx.google.com with ESMTPS id a190si17123205qkg.37.2016.05.14.14.45.03 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 14 May 2016 14:45:03 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u4ELe7Tn027364; Sat, 14 May 2016 17:40:09 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u4ELe6HH021092 for ; Sat, 14 May 2016 17:40:06 -0400 Received: from colepc.redhat.com (ovpn-116-31.phx2.redhat.com [10.3.116.31]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u4ELe5f3004941; Sat, 14 May 2016 17:40:05 -0400 From: Cole Robinson To: libvirt-list@redhat.com Date: Sat, 14 May 2016 17:39:58 -0400 Message-Id: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Cc: Andrea Bolognani Subject: [libvirt] [PATCH 5/4] tests: qemuargv2xmltest: Drop disk for s390 aes tests X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com Upcoming patches are going to make the disk portion of these test cases fail. In order to make it work, we would need to extend the qemuargv2xml test infrastructure to handle qemuCaps. This is worthwhile to do at some point but isn't critical. Instead just drop the offending portion, which isn't even the target of the test cases anyways --- tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args | 4 +--- tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml | 5 ----- tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args | 4 +--- tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml | 5 ----- tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args | 4 +--- tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml | 5 ----- tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args | 4 +--- tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml | 5 ----- tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args | 4 +--- tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml | 5 ----- 10 files changed, 5 insertions(+), 40 deletions(-) -- 2.7.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args index c1609b1..ed88352 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.args @@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \ -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ --boot c \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\ -id=drive-virtio-disk0 +-boot c diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml index 7ccdc67..7c100a7 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-off-argv.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-s390x - - - - - diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args index 775b484..99f58f0 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.args @@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \ -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ --boot c \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\ -id=drive-virtio-disk0 +-boot c diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml index a02523d..94bb6b2 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-aeskeywrap-on-argv.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-s390x - - - - - diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args index e35ab0f..2ffd45e 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.args @@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \ -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ --boot c \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\ -id=drive-virtio-disk0 +-boot c diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml index 7f0c871..a707ce3 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-off-argv.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-s390x - - - - - diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args index 18dd415..c0102ed 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.args @@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \ -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ --boot c \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\ -id=drive-virtio-disk0 +-boot c diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml index d4721dc..41c464a 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-deakeywrap-on-argv.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-s390x - - - - - diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args b/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args index 283e9b3..0bf57fc 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.args @@ -15,6 +15,4 @@ QEMU_AUDIO_DRV=none \ -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait \ -no-acpi \ --boot c \ --drive file=/dev/HostVG/QEMUGuest1,format=raw,if=virtio,index=0,\ -id=drive-virtio-disk0 +-boot c diff --git a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml b/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml index 5483040..0b0ce70 100644 --- a/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml +++ b/tests/qemuargv2xmldata/qemuargv2xml-machine-keywrap-none-argv.xml @@ -14,11 +14,6 @@ destroy /usr/bin/qemu-system-s390x - - - - -