From patchwork Mon Apr 15 23:09:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 162285 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3508156jan; Mon, 15 Apr 2019 16:09:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqz4hJtaiUoaMPUmo08GOeCkny9v0CqBzY4QlgPvctJLROXn2FZZfXmEthPyP2qv1czr5CYz X-Received: by 2002:a37:9bd4:: with SMTP id d203mr59548567qke.58.1555369775170; Mon, 15 Apr 2019 16:09:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555369775; cv=none; d=google.com; s=arc-20160816; b=xnA1BRrcqWpYUejUBSprysnnhwJRfnqqLnBFwqiNXBrE3unbL7h3Pd4UKdWzU5tvnz CpcrMDJ/2+ebgohr9nkw+LYfoDnG9hDbmbKaSHCE+RtwCt0o3epYgX4H1TyMuR0rorrR zAAXZxv2gVXS8O8I/tLMYxFteUzmb1ph0bE9zC2eO9wDxwmCAufL9Ox6PUrrf2Z5jfNa lIngpOmdnmX1yH3RiPmMwr9YRXq6PtqA6Eovj8W9u2/AdZggbR7fhdj0MwlZCIZ6p0Xh C7Nthqv76s8LdzKRbVlc/j7FxSSpHJuBMXrqjH6Oxa8NmbOaJzazfQTRz6A/Ud5WsieD 5jSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=RfYp1gNJVYFEiFMeVdu6Qs7gNdNdk0e4U/H5RQb6riE=; b=iyVC4M8f3MPdXfJE4/WJYJH82kfvC5bIrdO7Sahh52GNSebhZCe9Ect0iOFjckcvpr WPkM0L7nS2nsP43rAiVmwZdq4IyLZz/gW6SzWBNt2Gi9UXcy59a6itvg03KYbsgbH0Wi k8cLHrYWkZ5v0FibDHoO3hjXIqtrkNGzPKCBgRaK9VCx+svosSA9oUt2Ge8mPWBqhQZE P+Qr5mjEuZLnin7UEI4BtQ30gIrKyt5wVVZKWPs/llRfoZICKJ5NW/owZzOoo/JUoyCz akZbNumvIaq7uEMM5G2gG1DRwlJF0qdlOjzQU2jiwwktBXI3QVOf//suPwr4Jhz7YsPi 1EOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id d44si4583864qvd.22.2019.04.15.16.09.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 16:09:35 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BC6A2882F2; Mon, 15 Apr 2019 23:09:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7879C1001E7C; Mon, 15 Apr 2019 23:09:32 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 61BC341F3E; Mon, 15 Apr 2019 23:09:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3FN9R7x019605 for ; Mon, 15 Apr 2019 19:09:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 683AC60C5F; Mon, 15 Apr 2019 23:09:27 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-124-108.rdu2.redhat.com [10.10.124.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id D459C60C05; Mon, 15 Apr 2019 23:09:26 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 15 Apr 2019 19:09:15 -0400 Message-Id: <3abd123ee44624f2a2da812b0764aae0d06b0906.1555369583.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: =?utf-8?q?J=C3=A1n_Tomko?= , Andrea Bolognani Subject: [libvirt] [PATCH v2 1/6] tests: qemuxml2xml: Set name in testQemuInfo 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 15 Apr 2019 23:09:34 +0000 (UTC) Use the same pattern that is used in qemuxml2argvtest, setting the name in a static testQemuInfo instance inside the test macros Signed-off-by: Cole Robinson --- tests/qemuxml2xmltest.c | 47 +++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 23 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 8a7a56f764..59c0c2c483 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -90,19 +90,18 @@ testCompareStatusXMLToXMLFiles(const void *opaque) static int testInfoSetPaths(struct testQemuInfo *info, - const char *name, int when) { VIR_FREE(info->infile); VIR_FREE(info->outfile); if (virAsprintf(&info->infile, "%s/qemuxml2argvdata/%s.xml", - abs_srcdir, name) < 0) + abs_srcdir, info->name) < 0) goto error; if (virAsprintf(&info->outfile, "%s/qemuxml2xmloutdata/%s-%s.xml", - abs_srcdir, name, + abs_srcdir, info->name, when == WHEN_ACTIVE ? "active" : "inactive") < 0) goto error; @@ -111,7 +110,7 @@ testInfoSetPaths(struct testQemuInfo *info, if (virAsprintf(&info->outfile, "%s/qemuxml2xmloutdata/%s.xml", - abs_srcdir, name) < 0) + abs_srcdir, info->name) < 0) goto error; } @@ -126,11 +125,10 @@ testInfoSetPaths(struct testQemuInfo *info, static const char *statusPath = abs_srcdir "/qemustatusxml2xmldata/"; static int -testInfoSetStatusPaths(struct testQemuInfo *info, - const char *name) +testInfoSetStatusPaths(struct testQemuInfo *info) { - if (virAsprintf(&info->infile, "%s%s-in.xml", statusPath, name) < 0 || - virAsprintf(&info->outfile, "%s%s-out.xml", statusPath, name) < 0) + if (virAsprintf(&info->infile, "%s%s-in.xml", statusPath, info->name) < 0 || + virAsprintf(&info->outfile, "%s%s-out.xml", statusPath, info->name) < 0) goto error; return 0; @@ -148,7 +146,6 @@ mymain(void) { int ret = 0; char *fakerootdir; - struct testQemuInfo info; virQEMUDriverConfigPtr cfg = NULL; virHashTablePtr capslatest = NULL; @@ -168,39 +165,40 @@ mymain(void) setenv("LIBVIRT_FAKE_ROOT_DIR", fakerootdir, 1); - memset(&info, 0, sizeof(info)); - if (qemuTestDriverInit(&driver) < 0) return EXIT_FAILURE; cfg = virQEMUDriverGetConfig(&driver); -# define DO_TEST_FULL(name, when, ...) \ +# define DO_TEST_FULL(_name, when, ...) \ do { \ + static struct testQemuInfo info = { \ + .name = _name, \ + }; \ if (testQemuInfoSetArgs(&info, capslatest, \ __VA_ARGS__, \ ARG_END) < 0 || \ qemuTestCapsCacheInsert(driver.qemuCapsCache, info.qemuCaps) < 0) { \ - VIR_TEST_DEBUG("Failed to generate test data for '%s'", name); \ + VIR_TEST_DEBUG("Failed to generate test data for '%s'", _name); \ return -1; \ } \ \ if (when & WHEN_INACTIVE) { \ - if (testInfoSetPaths(&info, name, WHEN_INACTIVE) < 0) { \ - VIR_TEST_DEBUG("Failed to generate inactive paths for '%s'", name); \ + if (testInfoSetPaths(&info, WHEN_INACTIVE) < 0) { \ + VIR_TEST_DEBUG("Failed to generate inactive paths for '%s'", _name); \ return -1; \ } \ - if (virTestRun("QEMU XML-2-XML-inactive " name, \ + if (virTestRun("QEMU XML-2-XML-inactive " _name, \ testXML2XMLInactive, &info) < 0) \ ret = -1; \ } \ \ if (when & WHEN_ACTIVE) { \ - if (testInfoSetPaths(&info, name, WHEN_ACTIVE) < 0) { \ - VIR_TEST_DEBUG("Failed to generate active paths for '%s'", name); \ + if (testInfoSetPaths(&info, WHEN_ACTIVE) < 0) { \ + VIR_TEST_DEBUG("Failed to generate active paths for '%s'", _name); \ return -1; \ } \ - if (virTestRun("QEMU XML-2-XML-active " name, \ + if (virTestRun("QEMU XML-2-XML-active " _name, \ testXML2XMLActive, &info) < 0) \ ret = -1; \ } \ @@ -1253,18 +1251,21 @@ mymain(void) QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_MCH_EXTENDED_TSEG_MBYTES); -# define DO_TEST_STATUS(name) \ +# define DO_TEST_STATUS(_name) \ do { \ + static struct testQemuInfo info = { \ + .name = _name, \ + }; \ if (testQemuInfoSetArgs(&info, capslatest, \ ARG_QEMU_CAPS, QEMU_CAPS_LAST, \ ARG_END) < 0 || \ qemuTestCapsCacheInsert(driver.qemuCapsCache, info.qemuCaps) < 0 || \ - testInfoSetStatusPaths(&info, name) < 0) { \ - VIR_TEST_DEBUG("Failed to generate status test data for '%s'", name); \ + testInfoSetStatusPaths(&info) < 0) { \ + VIR_TEST_DEBUG("Failed to generate status test data for '%s'", _name); \ return -1; \ } \ \ - if (virTestRun("QEMU status XML-2-XML " name, \ + if (virTestRun("QEMU status XML-2-XML " _name, \ testCompareStatusXMLToXMLFiles, &info) < 0) \ ret = -1; \ \ From patchwork Mon Apr 15 23:09:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 162288 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3508355jan; Mon, 15 Apr 2019 16:09:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqymzA4gW+jkic7lRs79eyrBGy2DshrNG/31MQVz5ybNqi/PVynySm1KQfTan6W4fEbnUvWG X-Received: by 2002:ac8:2949:: with SMTP id z9mr66070336qtz.302.1555369789362; Mon, 15 Apr 2019 16:09:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555369789; cv=none; d=google.com; s=arc-20160816; b=SiwuGSTtUJfCpznyP00oUGKb3VZt9JJcUPdIr1ZK2nLYrBuUzImXmxldsBTi+o7sTu Km0ETL8LOIK8Q+r1AF1IxJ3XwgJNMk+GZY95+ITWxhFOMDE2HPtfdbC3pbRpo08PmJ/T YM9pkPCfd/Ko1FrfIU6ywDG5UB2h1R/BkbFLbr23OoCFlFDU7jx6gjPLNAZvyg5LsBD/ J76V/K8K3rPpBRuR0Bw1lAHDEaPYivwqGhnnUgxu08ggTc7J4tjtnCmVg4RMfsO83GdI qi547e8hlS4urFCAx/Wuc8aPA3y1FxAzHVS9CKu6EKAracZwSgkStdNJvEHHI+8B6mMZ Fxaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=2+QBLx1a3cFqHlj4iybyVwn4jB8Mb+T3c26931zw5mk=; b=A/aCHEKo1ImLrOJcGpxv/IlBYolti78qaZLW1cjnpLLASKrc19BhZmKM/3hNTX4Dc5 mUCvpZ0RZA4kNf8j2DiRMxvldf7CsdkaNkBK1FZd9yAwqY3AC2E/DNaZfpC8u8d1rsVR gyWU05Tzqu/Z/MIP24qI+GzdrsQIzkPic8zSVTP8Qmvb87foXHyo7KdhiSJKil77Gf1G BGrDVM7Msk9+drwHKmdw2wwmo4/ut6GZBCA37m8l75V+lkLcAUwsCOmuVsKZ5oZRpYAo oqIfcQuDwTXDSCh2ao1al3F9QTdjxGFZ5ePcGJbJfscNUyZS80gpsZ66qbn9J7/gpuW7 w4GA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id m32si2618473qvg.172.2019.04.15.16.09.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 16:09:49 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D201030944B6; Mon, 15 Apr 2019 23:09:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ABD26608C2; Mon, 15 Apr 2019 23:09:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E9DFF181AC47; Mon, 15 Apr 2019 23:09:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3FN9SX4019612 for ; Mon, 15 Apr 2019 19:09:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2255E60C5F; Mon, 15 Apr 2019 23:09:28 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-124-108.rdu2.redhat.com [10.10.124.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9032560C05; Mon, 15 Apr 2019 23:09:27 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 15 Apr 2019 19:09:16 -0400 Message-Id: <3b518b72b71f0ff0151b39391d88baf176ac3e21.1555369583.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: =?utf-8?q?J=C3=A1n_Tomko?= , Andrea Bolognani Subject: [libvirt] [PATCH v2 2/6] tests: qemuxml2xml: Add DO_TEST_CAPS* 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 15 Apr 2019 23:09:48 +0000 (UTC) Add DO_TEST_CAPS* macros, lifted from qemuxml2argvtest. Signed-off-by: Cole Robinson --- tests/qemuxml2xmltest.c | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 59c0c2c483..aac050f559 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -90,6 +90,7 @@ testCompareStatusXMLToXMLFiles(const void *opaque) static int testInfoSetPaths(struct testQemuInfo *info, + const char *suffix, int when) { VIR_FREE(info->infile); @@ -100,17 +101,18 @@ testInfoSetPaths(struct testQemuInfo *info, goto error; if (virAsprintf(&info->outfile, - "%s/qemuxml2xmloutdata/%s-%s.xml", + "%s/qemuxml2xmloutdata/%s-%s%s.xml", abs_srcdir, info->name, - when == WHEN_ACTIVE ? "active" : "inactive") < 0) + when == WHEN_ACTIVE ? "active" : "inactive", + suffix) < 0) goto error; if (!virFileExists(info->outfile)) { VIR_FREE(info->outfile); if (virAsprintf(&info->outfile, - "%s/qemuxml2xmloutdata/%s.xml", - abs_srcdir, info->name) < 0) + "%s/qemuxml2xmloutdata/%s%s.xml", + abs_srcdir, info->name, suffix) < 0) goto error; } @@ -170,7 +172,7 @@ mymain(void) cfg = virQEMUDriverGetConfig(&driver); -# define DO_TEST_FULL(_name, when, ...) \ +# define DO_TEST_INTERNAL(_name, suffix, when, ...) \ do { \ static struct testQemuInfo info = { \ .name = _name, \ @@ -184,7 +186,7 @@ mymain(void) } \ \ if (when & WHEN_INACTIVE) { \ - if (testInfoSetPaths(&info, WHEN_INACTIVE) < 0) { \ + if (testInfoSetPaths(&info, suffix, WHEN_INACTIVE) < 0) { \ VIR_TEST_DEBUG("Failed to generate inactive paths for '%s'", _name); \ return -1; \ } \ @@ -194,7 +196,7 @@ mymain(void) } \ \ if (when & WHEN_ACTIVE) { \ - if (testInfoSetPaths(&info, WHEN_ACTIVE) < 0) { \ + if (testInfoSetPaths(&info, suffix, WHEN_ACTIVE) < 0) { \ VIR_TEST_DEBUG("Failed to generate active paths for '%s'", _name); \ return -1; \ } \ @@ -207,10 +209,33 @@ mymain(void) # define NONE QEMU_CAPS_LAST +# define DO_TEST_FULL(name, when, ...) \ + DO_TEST_INTERNAL(name, "", when, __VA_ARGS__) + # define DO_TEST(name, ...) \ DO_TEST_FULL(name, WHEN_BOTH, \ ARG_QEMU_CAPS, __VA_ARGS__, QEMU_CAPS_LAST) +# define DO_TEST_CAPS_INTERNAL(name, arch, ver, ...) \ + DO_TEST_INTERNAL(name, "." arch "-" ver, WHEN_BOTH, \ + ARG_CAPS_ARCH, arch, \ + ARG_CAPS_VER, ver, \ + __VA_ARGS__) + +# define DO_TEST_CAPS_ARCH_VER(name, arch, ver) \ + DO_TEST_CAPS_INTERNAL(name, arch, ver, ARG_END) + +# define DO_TEST_CAPS_VER(name, ver) \ + DO_TEST_CAPS_ARCH_VER(name, "x86_64", ver) + +# define DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ...) \ + DO_TEST_CAPS_INTERNAL(name, arch, "latest", __VA_ARGS__) + +# define DO_TEST_CAPS_ARCH_LATEST(name, arch) \ + DO_TEST_CAPS_ARCH_LATEST_FULL(name, arch, ARG_END) + +# define DO_TEST_CAPS_LATEST(name) \ + DO_TEST_CAPS_ARCH_LATEST(name, "x86_64") /* Unset or set all envvars here that are copied in qemudBuildCommandLine From patchwork Mon Apr 15 23:09:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 162287 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3508345jan; Mon, 15 Apr 2019 16:09:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqxXtbNVLAqLqpgT3Selju23Ul6s6+W+RVGC4dSECcCfO4OGAUUGhsE9HcPjmVToU7uem7Xa X-Received: by 2002:a0c:d27a:: with SMTP id o55mr62214019qvh.21.1555369789029; Mon, 15 Apr 2019 16:09:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555369789; cv=none; d=google.com; s=arc-20160816; b=JyCKMR6hnWJS6v336vF/BFD5YOTJIH31LKwKTZ2UsTa0wrq4hmH9SMynShh6Bx8zDW oqMYRkHmbOzHXBPWj7ze0j6eAf6MDtRpmlmFXaFsq8p9Q1xMai7EDvnYm00Y8kyE7zrB Zyj+yQsk812+fOUbCjh+iNJ5WHhsIRwyeLjH/F4ED6dT6p1bUaVN+GPLf34ovp00YM7d pl7vByM4NlwfECetV4115JcS/YhSy8HVKsmH6nISBOYOY0pGfsTxYTTP0vxila+6+l56 DSFgPfyrW7XF35cOv7Nf6tyfg+Vqj/S1N7ZAoRI4icpFjKdAP2VW+PVAJQgWrhinPxnJ wYWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=RCIMSl1dv7Ig351/vNzySiAmsEKV/haM0wHvpMabRBk=; b=YDB/wdStQHsTw7vyij1eQHHHu3X7cqds8lOZrVtH+OzwWa1/63LJVGDVzFervnKP2J 3C/skuUhCU9E9VipB5AcUxE5Y18QZz4euaP1gvNbmbn+evStHnHy99yP9KQ0dpoA6vO7 Xgoms15sYFWHLHy0jOVBOLbq2+/2p2cfKgCNI9XCtJ4SPAuD5YnRbJtWfYVwY9ryLL+r Hl1CvEh0e4tCwDRafErLClJteRkr9oreziQlegmCIFLLPNZIqE+sYjpHy3FtOjsr6bmW NAhJ/3K6wGLmx8e4jslgjqwBKGtTIddwnlJBO+GHNJarAY75MF7i7PqjWrYUu54bIMZ7 qZEQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id g22si7018771qtb.326.2019.04.15.16.09.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 16:09:49 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 897DF30ADBB5; Mon, 15 Apr 2019 23:09:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37DDF60139; Mon, 15 Apr 2019 23:09:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F08D2181AC48; Mon, 15 Apr 2019 23:09:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3FN9SHo019620 for ; Mon, 15 Apr 2019 19:09:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id D07C760C5F; Mon, 15 Apr 2019 23:09:28 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-124-108.rdu2.redhat.com [10.10.124.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4960260C05; Mon, 15 Apr 2019 23:09:28 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 15 Apr 2019 19:09:17 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: =?utf-8?q?J=C3=A1n_Tomko?= , Andrea Bolognani Subject: [libvirt] [PATCH v2 3/6] tests: qemuxml2xml: Convert virtio-*transitional to TEST_CAPS 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 15 Apr 2019 23:09:48 +0000 (UTC) Convert these test cases to use DO_TEST_CAPS_LATEST * virtio-transitional * virtio-non-transitional Signed-off-by: Cole Robinson --- ...virtio-non-transitional.x86_64-latest.xml} | 0 ... => virtio-transitional.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 20 ++----------------- 3 files changed, 2 insertions(+), 18 deletions(-) rename tests/qemuxml2xmloutdata/{virtio-non-transitional.xml => virtio-non-transitional.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{virtio-transitional.xml => virtio-transitional.x86_64-latest.xml} (100%) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/tests/qemuxml2xmloutdata/virtio-non-transitional.xml b/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/virtio-non-transitional.xml rename to tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml diff --git a/tests/qemuxml2xmloutdata/virtio-transitional.xml b/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml similarity index 100% rename from tests/qemuxml2xmloutdata/virtio-transitional.xml rename to tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index aac050f559..20aaa1b9f5 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1319,24 +1319,8 @@ mymain(void) DO_TEST("riscv64-virt-pci", QEMU_CAPS_OBJECT_GPEX); - DO_TEST("virtio-transitional", - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VHOST_VSOCK, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI); - DO_TEST("virtio-non-transitional", - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, - QEMU_CAPS_DEVICE_VHOST_VSOCK, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_VIRTIO_SCSI); + DO_TEST_CAPS_LATEST("virtio-transitional"); + DO_TEST_CAPS_LATEST("virtio-non-transitional"); if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL) virFileDeleteTree(fakerootdir); From patchwork Mon Apr 15 23:09:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 162290 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3508421jan; Mon, 15 Apr 2019 16:09:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqwIn6OspGgUhAg2dpujpBHn9Sy09P8Q5EVZISZZm824RPH8oaiZN4BFqNjYM5XJCoAZk0hg X-Received: by 2002:aed:3f51:: with SMTP id q17mr60167261qtf.346.1555369793300; Mon, 15 Apr 2019 16:09:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555369793; cv=none; d=google.com; s=arc-20160816; b=gpbgPTQQu9JtVytIj/eeG+w0IQXRdfIdR/hawoN93rMo0mq6MDShriz8S6IIqORuXv HF5kpN77ttuJ2eOSWPQh/sNl0AedKoacrvqmtYNGqsQqU4ruaKZc+/vIRwkk524TAYdy LV+0xvNxc2RhdfCwROxETbE0qXdvBtAj1Z4BQns/IOi5Tm0cnfbYfrhdDtF4kpjwE8ZS aBnurojt7w+rOipBhMdeoPkECao7ZzoOgpXf6MkZJwkUyRmShpRd3YwR2m+iknsIMN75 0q/FtLqzXy7CArkr/K1jjzv0m28PLECmL8c4QRxfKEZQtIWHqDG/MjfSkmMy733QAN14 PVAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=CurLf//DSgp57VjX4+/7mhxqHKiWw3vEmMbX+yFOPFM=; b=DiixRhBKBm8Vh5NVCm2z4HMVWcwM65PpMCMT67vOIoM8nEd6tbszOB2ruISubDhkjU A4gKd+67QP9+7yWQIMaH9wax76M7AWa3yOfhiCCbavvvY/aXWy2diAR68ye3lhMSIuc7 yHO11JrPiim6MLquFIu+DSbRFhJEyljsJoLztnyLzb/wKzyY3plw/G1LL2D+O8/SfYA2 gdK9RylI3nUb8RvRs8NMSyjw9/8LQHUtLq89mSbrAp/5hs6JHZ6Df4f6mpBjP9+DTDBr aGau3jvhfZ/H5QHEGG8m0/3VKJT03vUOFORjag7g5HH6fgpxlQgrSe6TklvZqM349UGu 6O3Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id o22si1337332qka.145.2019.04.15.16.09.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 16:09:53 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CB59D3082E21; Mon, 15 Apr 2019 23:09:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2712E60142; Mon, 15 Apr 2019 23:09:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E22993FB13; Mon, 15 Apr 2019 23:09:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3FN9Vsm019634 for ; Mon, 15 Apr 2019 19:09:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9B31760C5F; Mon, 15 Apr 2019 23:09:31 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-124-108.rdu2.redhat.com [10.10.124.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0432C60C05; Mon, 15 Apr 2019 23:09:28 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 15 Apr 2019 19:09:18 -0400 Message-Id: <30f7be610f989f7dfa1265ab2503333d07eb01e1.1555369583.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: =?utf-8?q?J=C3=A1n_Tomko?= , Andrea Bolognani Subject: [libvirt] [PATCH v2 4/6] tests: qemuxml2xml: Convert os-firmware* to TEST_CAPS 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 15 Apr 2019 23:09:52 +0000 (UTC) Convert these test cases to use DO_TEST_CAPS_LATEST * os-firmware-bios * os-firmware-efi * os-firmware-efi-secboot Signed-off-by: Cole Robinson --- .../os-firmware-bios.x86_64-latest.xml | 68 +++++++++++++++++++ tests/qemuxml2xmloutdata/os-firmware-bios.xml | 1 - .../os-firmware-efi-secboot.x86_64-latest.xml | 68 +++++++++++++++++++ .../os-firmware-efi-secboot.xml | 1 - .../os-firmware-efi.x86_64-latest.xml | 68 +++++++++++++++++++ tests/qemuxml2xmloutdata/os-firmware-efi.xml | 1 - tests/qemuxml2xmltest.c | 27 +------- 7 files changed, 207 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/os-firmware-bios.xml create mode 100644 tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/os-firmware-efi-secboot.xml create mode 100644 tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/os-firmware-efi.xml -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml new file mode 100644 index 0000000000..63886666dd --- /dev/null +++ b/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml @@ -0,0 +1,68 @@ + + fedora + 63840878-0deb-4095-97e6-fc444d9bc9fa + 8192 + 8192 + 1 + + hvm + + /var/lib/libvirt/qemu/nvram/fedora_VARS.fd + + + + + + + + + + destroy + restart + restart + + + + + + /usr/bin/qemu-system-x86_64 + +
+ + + +
+ + + +
+ + + +
+ + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/os-firmware-bios.xml b/tests/qemuxml2xmloutdata/os-firmware-bios.xml deleted file mode 120000 index 3d36d5df68..0000000000 --- a/tests/qemuxml2xmloutdata/os-firmware-bios.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/os-firmware-bios.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml new file mode 100644 index 0000000000..a285e06334 --- /dev/null +++ b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml @@ -0,0 +1,68 @@ + + fedora + 63840878-0deb-4095-97e6-fc444d9bc9fa + 8192 + 8192 + 1 + + hvm + + /var/lib/libvirt/qemu/nvram/fedora_VARS.fd + + + + + + + + + + destroy + restart + restart + + + + + + /usr/bin/qemu-system-x86_64 + +
+ + + +
+ + + +
+ + + +
+ + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.xml b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.xml deleted file mode 120000 index 93e184e2d2..0000000000 --- a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/os-firmware-efi-secboot.xml \ No newline at end of file diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml new file mode 100644 index 0000000000..46a7b1b780 --- /dev/null +++ b/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml @@ -0,0 +1,68 @@ + + fedora + 63840878-0deb-4095-97e6-fc444d9bc9fa + 8192 + 8192 + 1 + + hvm + + /var/lib/libvirt/qemu/nvram/fedora_VARS.fd + + + + + + + + + + destroy + restart + restart + + + + + + /usr/bin/qemu-system-x86_64 + +
+ + + +
+ + + +
+ + + +
+ + +
+ + + + +
+ + + + +
+ + + + +
+ + + + +
+ + + diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi.xml b/tests/qemuxml2xmloutdata/os-firmware-efi.xml deleted file mode 120000 index 15cfad1ea0..0000000000 --- a/tests/qemuxml2xmloutdata/os-firmware-efi.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/os-firmware-efi.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 20aaa1b9f5..1d232185ec 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1003,30 +1003,9 @@ mymain(void) DO_TEST("smbios", NONE); DO_TEST("smbios-multiple-type2", NONE); - DO_TEST("os-firmware-bios", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("os-firmware-efi", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL); - DO_TEST("os-firmware-efi-secboot", - QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, - QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_ICH9_USB_EHCI1, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_QXL); + DO_TEST_CAPS_LATEST("os-firmware-bios"); + DO_TEST_CAPS_LATEST("os-firmware-efi"); + DO_TEST_CAPS_LATEST("os-firmware-efi-secboot"); DO_TEST("aarch64-aavmf-virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO, From patchwork Mon Apr 15 23:09:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 162291 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3508452jan; Mon, 15 Apr 2019 16:09:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqxI8K/HvTBpmED1IuyMnJRZ7wfDhYuUg0/NAlpKz2Zfd8bN9T1VpJko3m4XWdMQ1X7FP8yW X-Received: by 2002:ac8:3376:: with SMTP id u51mr63176709qta.317.1555369796161; Mon, 15 Apr 2019 16:09:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555369796; cv=none; d=google.com; s=arc-20160816; b=ID+wQMtfzwZeDieVufzCbV0wSWluAY9SGx+zB16hZXq+flvPkwKY4zJ9VeiRZ7sfa2 9wqTiTHyQLpch4Z55glciKpgJ9mALaK49HQuLiHNV/+I2dVl68rnkFvwBDRGNGvvfPLR QILc1E2qlIIL+wx6H6qCC25Dyi5NMbEh8bYKzHQf1Nf4flf62UhX8u6jThYWCuQXln12 EgtRmKxjo9hXFwasI5apSX+D3xP4MT9Ry2OTD/30I2zg9RKChDDflUiFfeOto1wi2OO0 CwHEm3mduRrPkuMPYZzMk0en3S09nOCqmRv3s1H+msprzpmQR7hJTzH9ksz6P7yJKQIy 88Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=rcP9xcv1/rEuUqUZTKolbihsfS9UNCvKoWl/Vk/ui6A=; b=eZGqwjlraQhpNfHw3ZTmHKchGnXZ0wmQldvWCwew15amZm/uq74nVggfoPvCeYmQzx of4BLGtIZ/u15PKg7NKC9C3IqnmPn/2ewRTnwWmHOVHqQCHmUbArbpDlW3pUndBazuys eQnfSoBkkEaN/2dZqvg2neZQlnrmFRztmtuMnb6QdWVSZkNB1kTNV9ZYdNirloHpkBPP 1Zcot8enqneQpmGReX9z6EoAJ40FcC98VY8kk9MhtIxzuGhuhJFj48/JXlT83+KH/lYB fl69FXejFnFhjDHHgCIXsz/60wFEpJ6E6s8bqNuQy19hIWp03tQJTxSOkZD1GhD7sev7 oixQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id s28si2045508qtk.328.2019.04.15.16.09.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 16:09:56 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B32D430024B1; Mon, 15 Apr 2019 23:09:54 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8B3D95D71A; Mon, 15 Apr 2019 23:09:54 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 4EC603FB14; Mon, 15 Apr 2019 23:09:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3FN9WBs019644 for ; Mon, 15 Apr 2019 19:09:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5732660C62; Mon, 15 Apr 2019 23:09:32 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-124-108.rdu2.redhat.com [10.10.124.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id C252B60C05; Mon, 15 Apr 2019 23:09:31 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 15 Apr 2019 19:09:19 -0400 Message-Id: <8932382b89c789ff855528c086c147d34426336c.1555369583.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: =?utf-8?q?J=C3=A1n_Tomko?= , Andrea Bolognani Subject: [libvirt] [PATCH v2 5/6] tests: qemuxml2xml: Convert genid* to TEST_CAPS 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 15 Apr 2019 23:09:55 +0000 (UTC) Convert these test cases to use DO_TEST_CAPS_LATEST * genid * genid-auto This ensures the test infrastructure is working as expected for a test case with explicit -active and -inactive XML test data Signed-off-by: Cole Robinson --- .../{genid-active.xml => genid-active.x86_64-latest.xml} | 2 +- ...id-auto-active.xml => genid-auto-active.x86_64-latest.xml} | 2 +- ...uto-inactive.xml => genid-auto-inactive.x86_64-latest.xml} | 2 +- .../{genid-inactive.xml => genid-inactive.x86_64-latest.xml} | 2 +- tests/qemuxml2xmltest.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename tests/qemuxml2xmloutdata/{genid-active.xml => genid-active.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{genid-auto-active.xml => genid-auto-active.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{genid-auto-inactive.xml => genid-auto-inactive.x86_64-latest.xml} (94%) rename tests/qemuxml2xmloutdata/{genid-inactive.xml => genid-inactive.x86_64-latest.xml} (94%) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/tests/qemuxml2xmloutdata/genid-active.xml b/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml similarity index 94% rename from tests/qemuxml2xmloutdata/genid-active.xml rename to tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml index fc41f2dd28..28390e51a6 100644 --- a/tests/qemuxml2xmloutdata/genid-active.xml +++ b/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml @@ -18,7 +18,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
diff --git a/tests/qemuxml2xmloutdata/genid-auto-active.xml b/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml similarity index 94% rename from tests/qemuxml2xmloutdata/genid-auto-active.xml rename to tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml index aeca0d7fc0..e94846f453 100644 --- a/tests/qemuxml2xmloutdata/genid-auto-active.xml +++ b/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml @@ -18,7 +18,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
diff --git a/tests/qemuxml2xmloutdata/genid-auto-inactive.xml b/tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml similarity index 94% rename from tests/qemuxml2xmloutdata/genid-auto-inactive.xml rename to tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml index a7b711d469..f8ab86afa0 100644 --- a/tests/qemuxml2xmloutdata/genid-auto-inactive.xml +++ b/tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml @@ -18,7 +18,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
diff --git a/tests/qemuxml2xmloutdata/genid-inactive.xml b/tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml similarity index 94% rename from tests/qemuxml2xmloutdata/genid-inactive.xml rename to tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml index 8bd526a7a9..c0813aa1dc 100644 --- a/tests/qemuxml2xmloutdata/genid-inactive.xml +++ b/tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml @@ -18,7 +18,7 @@ destroy /usr/bin/qemu-system-x86_64 - +
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 1d232185ec..812f5c7ea0 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -244,8 +244,8 @@ mymain(void) setenv("PATH", "/bin", 1); DO_TEST("minimal", NONE); - DO_TEST("genid", NONE); - DO_TEST("genid-auto", NONE); + DO_TEST_CAPS_LATEST("genid"); + DO_TEST_CAPS_LATEST("genid-auto"); DO_TEST("machine-core-on", NONE); DO_TEST("machine-core-off", NONE); DO_TEST("machine-loadparm-multiple-disks-nets-s390", NONE); From patchwork Mon Apr 15 23:09:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 162289 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3508407jan; Mon, 15 Apr 2019 16:09:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqwuba7MsjMQz+BvRPCThTm/ayPDGI6u4/FAgLLVHEYmEDVWNWrCIBMXPfedxC+q1ta1ZH6a X-Received: by 2002:a0c:928a:: with SMTP id b10mr64854964qvb.4.1555369792253; Mon, 15 Apr 2019 16:09:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555369792; cv=none; d=google.com; s=arc-20160816; b=K1wBze8JMCAhnjcHydq4XvdcrH+C9zV9zkpIAcbSU3EVmkYGdWLIRrmAZLZryi0/11 RmhIZnigouA8eknkI9sYySYb55eWGP5SAcnsEvdUX0KVo1+tdkQ/7pd0Qb8pSCUZMSTu R/UEvszAaoqF9t0E+f21+gdEugT/iayoiJoWP8P9LGRnoRxkjcAFREE5WLGaEDdCXXIY gzV+VqUyZFvsVsxfnfk9X+Gur99eC44wxSyIHBJtFw98T02N0DxZucaOlEZ3vwWzCUJ9 IE4jdkWVruYK/ze/cHBpvhh6feXxpnIae2RU0AIjipgU+kkZLqOlqvS9Mr/JY2gnC5Iu xlaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=Vrzcz3HLvI9LQBvXzxRFZcvtDyW74IqbTCNw46PHl28=; b=faP+ZYhdpGshKPN7ILcvNdSpzV7QYQ4RyAAZqZKxtV1Fo5UrZoSymJTSZQ75YbOY3O xKx9iSR2Ydr2kG6KvP7WCGAWOG3zdmjXxnKWGgRmx5qadugXIIq3K+oAIjmbVJoVRnBp uliRQDIVEk414FL5+S2HyNGOi5gSuo6fw7/rXVSuAqbGnrXFNzv8uF2L0SGcpsyAv6P+ MJG5JjXjFoBLLQ1q33XMYxcpohJuUJlkElGDMfoS526H5efigkuH9wyy4URi7bgl0Rls et6ZdiuAlQ/zQMugo9f3J5W1IRTblTAZp0sGs72yOvaK2vPbwrWaVozuZi2FQ26cNFsc Vg1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id h23si17998153qkl.13.2019.04.15.16.09.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 16:09:52 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EB4A430ADBB3; Mon, 15 Apr 2019 23:09:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C18675C22D; Mon, 15 Apr 2019 23:09:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7B6993FB11; Mon, 15 Apr 2019 23:09:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3FN9Xvm019651 for ; Mon, 15 Apr 2019 19:09:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1198560C5F; Mon, 15 Apr 2019 23:09:33 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-124-108.rdu2.redhat.com [10.10.124.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7E1F860C05; Mon, 15 Apr 2019 23:09:32 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Mon, 15 Apr 2019 19:09:20 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: =?utf-8?q?J=C3=A1n_Tomko?= , Andrea Bolognani Subject: [libvirt] [PATCH v2 6/6] tests: qemuxml2xml: Convert aarch64-os-firmware-efi to TEST_CAPS 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Mon, 15 Apr 2019 23:09:51 +0000 (UTC) Demostrate DO_TEST_CAPS_ARCH_LATEST by converting the test case 'aarch64-os-firmware-efi' Signed-off-by: Cole Robinson --- ...aarch64-os-firmware-efi.aarch64-latest.xml | 31 +++++++++++++++++++ .../aarch64-os-firmware-efi.xml | 1 - tests/qemuxml2xmltest.c | 3 +- 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml delete mode 120000 tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml new file mode 100644 index 0000000000..529ce6f3c2 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml @@ -0,0 +1,31 @@ + + aarch64test + 496d7ea8-9739-544b-4ebd-ef08be936e8b + 1048576 + 1048576 + 1 + + hvm + /aarch64.kernel + /aarch64.initrd + earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait + /aarch64.dtb + + + + + + + + + cortex-a53 + + + destroy + restart + restart + + /usr/bin/qemu-system-aarch64 + + + diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml deleted file mode 120000 index beea6b2955..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.xml +++ /dev/null @@ -1 +0,0 @@ -../qemuxml2argvdata/aarch64-os-firmware-efi.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 812f5c7ea0..8e85710d45 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1010,8 +1010,7 @@ mymain(void) DO_TEST("aarch64-aavmf-virtio-mmio", QEMU_CAPS_DEVICE_VIRTIO_MMIO, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST("aarch64-os-firmware-efi", - QEMU_CAPS_DEVICE_VIRTIO_MMIO); + DO_TEST_CAPS_ARCH_LATEST("aarch64-os-firmware-efi", "aarch64"); DO_TEST("aarch64-virtio-pci-default", QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, QEMU_CAPS_DEVICE_VIRTIO_MMIO,