From patchwork Thu Mar 14 14:44:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 160349 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp15595254jad; Thu, 14 Mar 2019 07:44:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqyd1jf2H/wKqfZkfcBjkz9f7Dj+O7rL1r5+p0NBA9DsOMo6g785fpgbED/hrCIndjTLsVc2 X-Received: by 2002:a0c:9e10:: with SMTP id p16mr38415226qve.176.1552574694779; Thu, 14 Mar 2019 07:44:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552574694; cv=none; d=google.com; s=arc-20160816; b=bUMLp2Bo5mHTbrrHZuklPoAZ6c8CAZlm8MgwDJ6BathI+oPsO/opT53CRJ4ZqNRPCr pjbssgMT9d4TkUCHIFa36J2jJizHxumez6gFSDqxOTkV/U7qocLr5tX503D1uFOiTgq8 LcRsyjVwlVplN9eIkHV0p+plgY2JAkcLnEGKG5HVdhwc2xZrAcBbav/PeSztFltsZKBE ai0C8zsi6h+eSL35Ia1WNsLh7HIuJCVAwAhiOHnH1YSErgkYp1V70KldS6Bmdz5kuXaa JbMF7JKwWBFsxOdx+7bX8Upov2qgZMXxzgrhlEFWMXz6QmZCjuCudvU+Sy6ZNGxgTYVT 1vgQ== 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 :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=JNiGFfx5v2M62V7d1t4xSEak+IthUaHXCUOUcw6Aqv8=; b=eJJadCr7+R0YNEgJKJTOmuU2fCKqRn4tn2hU3ts2r7KK/iVgkmPVjE5jqO1zpNgQTg nBd92NHmRfOHje9H02Laevi77CJFttUukwQwX0kRkyu0gaqiC6PxAFjffGmr7oMUsZcD 0X38pLRdD1Z/MwyV8kWK+r+dLf/x1HzWTF7+pPsAxmFSo0rFAkaYDLsQm1fL0WecHCYb UAa6FLbMO+Yi/e8EbVIaaE2du8YxN1D9bURIboca+NvlSVn9qMHM+WtKa3eif5EkATc+ luvGTgvWO14wwbq/+yowtJMOAh0NofvYt4tkw+lV+ugOlp+Sc7yfQSQy8V6s7nYlfTgz H6zg== 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 n34si128022qtn.318.2019.03.14.07.44.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 07:44:54 -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 07303301BEE7; Thu, 14 Mar 2019 14:44:53 +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 756745D75D; Thu, 14 Mar 2019 14:44:52 +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 0B03F181A264; Thu, 14 Mar 2019 14:44:52 +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 x2EEiXc0024572 for ; Thu, 14 Mar 2019 10:44:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id C49B260FE0; Thu, 14 Mar 2019 14:44:33 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-124-177.rdu2.redhat.com [10.10.124.177]) by smtp.corp.redhat.com (Postfix) with ESMTP id 607DB6107F; Thu, 14 Mar 2019 14:44:33 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Thu, 14 Mar 2019 10:44:03 -0400 Message-Id: <94c3d1c16de33499139b507becba68d904646f90.1552574299.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 Subject: [libvirt] [PATCH 10/21] tests: qemuxml2argv: remove DO_TEST_PARSE_FLAGS_ERROR 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.44]); Thu, 14 Mar 2019 14:44:54 +0000 (UTC) It only has one caller. Just use DO_TEST_FULL Signed-off-by: Cole Robinson --- tests/qemuxml2argvtest.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) -- 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list Reviewed-by: Andrea Bolognani diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 070f7f0a05..1ce8bade48 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -876,12 +876,6 @@ mymain(void) ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \ ARG_QEMU_CAPS, __VA_ARGS__) -# define DO_TEST_PARSE_FLAGS_ERROR(name, parseFlags, ...) \ - DO_TEST_FULL(name, \ - ARG_PARSEFLAGS, parseFlags, \ - ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, \ - ARG_QEMU_CAPS, __VA_ARGS__) - # define NONE QEMU_CAPS_LAST /* Unset or set all envvars here that are copied in qemudBuildCommandLine @@ -2887,9 +2881,10 @@ mymain(void) /* VM XML has invalid arch/ostype/virttype combo, but the SKIP flag * will avoid the error. Still, we expect qemu driver to complain about * missing machine error, and not crash */ - DO_TEST_PARSE_FLAGS_ERROR("missing-machine", - VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE, - NONE); + DO_TEST_FULL("missing-machine", + ARG_FLAGS, FLAG_EXPECT_PARSE_ERROR | FLAG_EXPECT_FAILURE, + ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE, + ARG_QEMU_CAPS, NONE); DO_TEST("name-escape", QEMU_CAPS_NAME_DEBUG_THREADS,