From patchwork Thu Mar 21 19:55: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: 160817 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1192486jan; Thu, 21 Mar 2019 12:55:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1dVH+FUclhTZWktX1simm/2OM2r7R4X7LE782ERmx6z5Nja7R/himj0/bsd0xzSOVOxpZ X-Received: by 2002:a0c:87af:: with SMTP id 44mr4665740qvj.122.1553198123899; Thu, 21 Mar 2019 12:55:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553198123; cv=none; d=google.com; s=arc-20160816; b=cJFAPcwq3ecx5Ylr5fB4desdrTyhYozRZ2cwT1cEs6ERD3Zj96dho8Ya4YXaA+0md4 V79+79/nURcHgfeOJgDIPN8xnVMhPdqNEfDNNHB58oSsXNHBadFjCgY6Q8A2Ngz7q9iQ j1mOFrEiUgnvJFRKgD+PLBIPgR65yXJL1xJI2+DwZx9zE1wnbSVHpXmKDnW0dOyIEce1 xc8lOzPF76HNxrMdoGsnW6rDmSTbk9U+gJSeS9tl7pS3O8trBrz2jNc4YrTL6T6R51Fe P2+FaV91Ws6V9ar3/1r8Lk+VAoNV1WA6kPDJyFcyxBTvAR/YR/9FeXzhB+qB1+XlqmFd NUEA== 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=13yBKH44tyCDTCrtm+icdsjBNcb/1HfhpbTPbPCGFCI=; b=Adng2tyDg90B0Zsu5nVBc6UIuxJVnxFcYz2bSLoidRVzZTwIs5z42gDFT4K6f8awd1 l0LZKurwVSQ+Q7B+f7Pm7lLe2x49nJdapjvm+3dbAbB+JQ9sPk6WX3c/se0FqF2IU0Q4 pD/IPHmNZRKV6IXRTci+lluIUr1zR399VXmR9iCIWK0v4QZm/7gQ8Lty2DTJMJIf5iRC EKNHs719M/gqGSX7lOsCf1biUBZFJWbYIfw6hB7hes6N8oacFDQk5n39M7yS/6Xm3ZIN NUJ/9SiGDCZPeeZKAVA4nAicGaJA0zbsegJ8xjvvTJg0MUJkSUOHXxI76NTe+g/M0kx2 wOqA== 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 e91si811955qtb.96.2019.03.21.12.55.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Mar 2019 12:55:23 -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-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9CD7D30821A3; Thu, 21 Mar 2019 19:55:22 +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 72C7619C71; Thu, 21 Mar 2019 19:55:22 +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 2ED2038BE; Thu, 21 Mar 2019 19:55:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2LJtGQe020704 for ; Thu, 21 Mar 2019 15:55:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 71B531974C; Thu, 21 Mar 2019 19:55:16 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-121-55.rdu2.redhat.com [10.10.121.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15BF019C59; Thu, 21 Mar 2019 19:55:15 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Thu, 21 Mar 2019 15:55:03 -0400 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 1/4] tests: qemuxml2argv: Tweak TEST_CAPS_PATH 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 21 Mar 2019 19:55:23 +0000 (UTC) Make it an actual path and not a string prefix Signed-off-by: Cole Robinson --- tests/qemuxml2argvtest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 14d3df02a9..d982a497a9 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -819,7 +819,7 @@ mymain(void) * the test cases should be forked using DO_TEST_CAPS_VER with the appropriate * version. */ -# define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata/caps_" +# define TEST_CAPS_PATH abs_srcdir "/qemucapabilitiesdata" # define DO_TEST_CAPS_INTERNAL(_name, arch, ver, ...) \ do { \ @@ -827,7 +827,7 @@ mymain(void) .name = _name, \ .suffix = "." arch "-" ver, \ }; \ - static const char *capsfile = TEST_CAPS_PATH ver "." arch ".xml"; \ + static const char *capsfile = TEST_CAPS_PATH "/caps_" ver "." arch ".xml"; \ static bool stripmachinealiases; \ if (STREQ(ver, "latest")) { \ capsfile = virHashLookup(capslatest, arch); \