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);